refactor

daifengyi
1 parent cc38043f
Showing 2 changed files with 122 additions and 106 deletions
HDFwear/Tools/BluetoothManager+Function.swift
HDFwear/Tools/BluetoothManager.swift
@@ -126,4 +126,122 @@ extension BluetoothManager {
         self.setCmdClosure = completion
         sendData(data)
     }
+    
+    //MARK: - 发送数据
+    func sendData(_ data: Data) {
+        if peripheral == nil {
+            print("peripheral == nil")
+            return
+        }
+        
+        var serverUUID: String = ""
+        var writeUUID: String = ""
+        switch platform {
+        case ._828:
+            serverUUID = BLEConfig.ServerUUID
+            writeUUID = BLEConfig.WriteUUID
+        default:
+            break
+        }
+        
+        if let services = peripheral?.services {
+            for service in services {
+                if service.uuid.uuidString == serverUUID {
+                    if service.characteristics == nil {
+                        return
+                    }
+                    for char in service.characteristics! {
+                        if char.uuid.uuidString == writeUUID {
+                            if platform == ._828 {
+                                if data.count <= 20 {
+                                    print("发送: \([UInt8](data))")
+                                    peripheral?.writeValue(data, for: char, type: .withoutResponse)
+                                } else {
+                                    print("发送 拼: \([UInt8](data))")
+                                    let n = data.count/20 + (data.count%20 == 0 ? 0 : 1)
+                                    for i in 0..<n {
+                                        peripheral?.writeValue(data[i*20..<min(i*20+20, data.count)], for: char, type: .withoutResponse)
+                                    }
+                                }
+                            } else {
+                            print("发送: \([UInt8](data))")
+                                peripheral?.writeValue(data, for: char, type: .withResponse)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    //MARK: - 新解析数据
+    func parseData(_ bytes: [UInt8]) {
+        totalLength = 0
+        mergeLength = 0
+        totalBytes = []
+        guard bytes.count > 12 else { return }
+        let msgId = Int(UInt16(bytes[4]) << 8 | UInt16(bytes[5]))
+        let data = Data(bytes: bytes, count: bytes.count)
+        switch msgId {
+        case 0x8001:
+            parseDefaultResponseData(bytes)
+        case 0x8002:// 设备信息查询应答
+            print("设备信息查询应答")
+        case 0x8009:// 实时步数、卡路里、距离自动上报
+            print("实时步数、卡路里、距离自动上报")
+        case 0x8010:// 电量变化自动上报
+            print("电量变化自动上报")
+        case 0x8014:// 电话挂断
+            print("电话挂断")
+        case 0x8015:// 找手机
+            print("找手机")
+        case 0x8016:// 历史心率数据上报
+            print("历史心率数据上报")
+        case 0x8017:// 历史血氧数据上报
+            print("历史血氧数据上报")
+        case 0x8018:// 历史体温数据上报
+            print("历史体温数据上报")
+        case 0x8019:// 睡眠数据上报
+            print("睡眠数据上报")
+        case 0x8020:// 历史压力数据上报
+            print("历史压力数据上报")
+        default:
+            break
+        }
+//        switch cmd {
+//        case .set, .find, .device, .remind, .firmware:
+//            parseSetData(SetCmd(rawValue: bytes[10]), data: data)
+//        case .sync:
+//            let valueBytes = Array(bytes[13..<bytes.count])
+//            print(valueBytes)
+//            parseSyncData(SyncCmd(rawValue: bytes[10]), bytes: valueBytes)
+//        case .weather:
+//            if setCmdClosure != nil {
+//                setCmdClosure?(nil)
+//                setCmdClosure = nil
+//            }
+//        }
+    }
+    
+    private func parseDefaultResponseData(_ bytes: [UInt8]) {
+        guard bytes.count == 17, bytes[9] == 5 else {
+            return
+        }
+        let newcmd = NewCmd(rawValue: bytes[13])
+        switch newcmd {
+        case .setTime, .setTimeFormat, .setTemperatureUnit, .setDistanceUnit, .setWristSense, .setTouchSense, .setLowPowerRemind, .setLanguage:
+            if setCmdClosure != nil {
+                let success = bytes[14] == 0
+                if success {
+                    setCmdClosure?(nil)
+                }else {
+                    setCmdClosure?((Int)(bytes[14]))
+                }
+                setCmdClosure = nil
+            }
+        case .none:
+            break
+        default:
+            break
+        }
+    }
 }
@@ -113,7 +113,7 @@ class BluetoothManager: NSObject {
 //    weak var delegate: BluetoothManagerDelegate?
  
     var manger: MTKBleManager?
-    private var peripheral: CBPeripheral? = nil
+    var peripheral: CBPeripheral? = nil
 //    private var conPeripheral: CBPeripheral? = nil //已连接的
     var platform: Platform = .other
  
@@ -127,9 +127,9 @@ class BluetoothManager: NSObject {
  
  
     //mergeData
-    private var totalBytes: [UInt8] = []
-    private var totalLength: Int = 0
-    private var mergeLength: Int = 0
+    var totalBytes: [UInt8] = []
+    var totalLength: Int = 0
+    var mergeLength: Int = 0
  
     //sync
     private var isSyncReceived: Bool = false //是否收到同步data
@@ -1217,80 +1217,6 @@ class BluetoothManager: NSObject {
          AudioServicesPlaySystemSound(kSystemSoundID_Vibrate)
      }
  
-    //MARK: - 新解析数据
-    private func newParseDefaultResponseData(_ bytes: [UInt8]) {
-        guard bytes.count == 17, bytes[9] == 5 else {
-            return
-        }
-        let newcmd = NewCmd(rawValue: bytes[13])
-        switch newcmd {
-        case .setTime, .setTimeFormat, .setTemperatureUnit, .setDistanceUnit, .setWristSense, .setTouchSense, .setLowPowerRemind, .setLanguage:
-            if setCmdClosure != nil {
-                let success = bytes[14] == 0
-                if success {
-                    setCmdClosure?(nil)
-                }else {
-                    setCmdClosure?((Int)(bytes[14]))
-                }
-                setCmdClosure = nil
-            }
-        case .none:
-            break
-        default:
-            break
-        }
-        
-    }
-
-
-    //MARK: - 发送数据
-    
-    func sendData(_ data: Data) {
-        if peripheral == nil {
-            print("peripheral == nil")
-            return
-        }
-        
-        var serverUUID: String = ""
-        var writeUUID: String = ""
-        switch platform {
-        case ._828:
-            serverUUID = BLEConfig.ServerUUID
-            writeUUID = BLEConfig.WriteUUID
-        default:
-            break
-        }
-        
-        if let services = peripheral?.services {
-            for service in services {
-                if service.uuid.uuidString == serverUUID {
-                    if service.characteristics == nil {
-                        return
-                    }
-                    for char in service.characteristics! {
-                        if char.uuid.uuidString == writeUUID {
-                            if platform == ._828 {
-                                if data.count <= 20 {
-                                    print("发送: \([UInt8](data))")
-                                    peripheral?.writeValue(data, for: char, type: .withoutResponse)
-                                } else {
-                                    print("发送 拼: \([UInt8](data))")
-                                    let n = data.count/20 + (data.count%20 == 0 ? 0 : 1)
-                                    for i in 0..<n {
-                                        peripheral?.writeValue(data[i*20..<min(i*20+20, data.count)], for: char, type: .withoutResponse)
-                                    }
-                                }
-                            } else {
-                            print("发送: \([UInt8](data))")
-                                peripheral?.writeValue(data, for: char, type: .withResponse)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
     private func sendCustomDialData(_ data: Data) {
         if !isSyncDial { return }
         if peripheral == nil || data.count == 0 {
@@ -1620,34 +1546,6 @@ extension BluetoothManager: ClientProfileDelegate {
  
     }
  
-    func parseData(_ bytes: [UInt8]) {
-        totalLength = 0
-        mergeLength = 0
-        totalBytes = []
-        guard bytes.count > 12 else { return }
-        let msgId = Int(UInt16(bytes[4]) << 8 | UInt16(bytes[5]))
-        let data = Data(bytes: bytes, count: bytes.count)
-        switch msgId {
-        case 0x8001:
-            newParseDefaultResponseData(bytes)
-        default:
-            break
-        }
-//        switch cmd {
-//        case .set, .find, .device, .remind, .firmware:
-//            parseSetData(SetCmd(rawValue: bytes[10]), data: data)
-//        case .sync:
-//            let valueBytes = Array(bytes[13..<bytes.count])
-//            print(valueBytes)
-//            parseSyncData(SyncCmd(rawValue: bytes[10]), bytes: valueBytes)
-//        case .weather:
-//            if setCmdClosure != nil {
-//                setCmdClosure?(nil)
-//                setCmdClosure = nil
-//            }
-//        }
-    }
-    
  
     func onCharacteristicWrite() {
 //        print("已经连接5")