feat:firmware version

jason
1 parent 7a10e2ea
Showing 5 changed files with 56 additions and 1 deletions
HDFwear/20240126ReadMe.md
HDFwear/Mine/MineViewController.swift
HDFwear/Tools/Bluetooth+Types.swift
HDFwear/Tools/BluetoothManager+Function.swift
HDFwear/Tools/BluetoothManager.swift
@@ -141,6 +141,10 @@ BluetoothManager+Function
     接收: [237, 126, 0, 1, 128, 36, 0, 7, 0, 12, 0, 5, 0, 65, 0, 48, 0, 98, 0, 115, 0, 140, 194, 200]
     接收: [237, 126, 0, 1, 128, 36, 0, 1, 0, 1, 255, 46, 6]
  
+拉取固件版本号
+    func newGetfirmwareVersionData(option: SyncOption = .now, closure: FirmwareVersionClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 20, 1, 233, 127]
+    接收: [237, 126, 0, 1, 128, 55, 0, 1, 0, 2, 1, 4, 5, 79]
  
 接受数据类
  
@@ -671,6 +671,18 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
             }
         }
  
+        let archiveAction105 = UIAlertAction(title: "newGetfirmwareVersionData", style: .default) {[weak self] action in
+            BluetoothManager.shared.newGetfirmwareVersionData() {first, second, error in
+                if error != nil {
+                    print("newGetfirmwareVersionData" + (error?.description ?? ""))
+                }else {
+                    self?.showDetailAlert(msg: "first is" + String(first ?? 0) + "\nsecond is " + String(second ?? 0))
+                    print("newGetfirmwareVersionData success")
+                }
+            }
+        }
+        
+        
         alert.addAction(archiveAction9a)
         alert.addAction(archiveAction9b)
         alert.addAction(archiveAction10a)
@@ -689,6 +701,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
         alert.addAction(archiveAction103)
         alert.addAction(archiveAction104a)
         alert.addAction(archiveAction104b)
+        alert.addAction(archiveAction105)
  
         alert.addAction(UIAlertAction(title: "取消", style: .destructive, handler: nil))
         present(alert, animated: true, completion: nil)
@@ -178,6 +178,7 @@ enum SyncType: UInt8 {
     case gps = 0x0A
     case intensiveTime = 0x0B
     case beidouCard = 0x0C
+    case firmwareVersion = 0x14
     case other = 0xff
 }
  
@@ -259,6 +259,12 @@ extension BluetoothManager {
         newStartSyncHealthData(closure: closure, data: data, synType: .beidouCard)
     }
  
+    // 拉取固件版本号
+    func newGetfirmwareVersionData(option: SyncOption = .now, closure: FirmwareVersionClosure? = nil) {
+        let data = BleMessage.shared.getSyncCmd(.firmwareVersion, option)
+        newStartSyncHealthData(closure: closure, data: data, synType: .firmwareVersion)
+    }
+    
     //MARK: - old code
     // 拉取睡眠数据
     func getSleepData(option: SyncOption = .now, closure: SleepClosure? = nil) {
@@ -375,6 +381,12 @@ extension BluetoothManager {
                     beidouCardClosure?(nil, -1002)
                     beidouCardClosure = nil
                 }
+            case is FirmwareVersionClosure:
+                if firmwareVersionClosure == nil {
+                    firmwareVersionClosure = closure as? FirmwareVersionClosure
+                    firmwareVersionClosure?(nil, nil, -1002)
+                    firmwareVersionClosure = nil
+                }
             default:
                 break
             }
@@ -612,6 +624,16 @@ extension BluetoothManager {
             }else {
                 parseBeidouCardData(content)
             }
+        case 0x8037://固件版本号
+            print("固件版本号")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8029)
+                }
+            }else {
+                parseFirmwareVersionData(content)
+            }
         default:
             break
         }
@@ -812,7 +834,7 @@ extension BluetoothManager {
     func parseBeidouCardData(_ content: [UInt8]) {
         guard content.count > 0 else {
             print("无有效的信息")
-            intensiveTimeClosure?(nil, nil)
+            beidouCardClosure?(nil, nil)
             return
         }
         let card = String(bytes: content, encoding: .ascii)
@@ -835,4 +857,14 @@ extension BluetoothManager {
         }
  
     }
+    
+    // 固件版本号数据
+    func parseFirmwareVersionData(_ content: [UInt8]) {
+        guard content.count > 1 else {
+            print("无有效的信息")
+            firmwareVersionClosure?(nil, nil, nil)
+            return
+        }
+        firmwareVersionClosure?(Int(content[0]), Int(content[1]), nil)
+    }
 }
@@ -108,6 +108,8 @@ class BluetoothManager: NSObject {
     var intensiveTimeClosure: IntensiveTimeClosure?
     typealias BeidouCardClosure = (_ card:String?, _ error: Int?) -> Void
     var beidouCardClosure: BeidouCardClosure?
+    typealias FirmwareVersionClosure = (_ first:Int?, _ second:Int?, _ error: Int?) -> Void
+    var firmwareVersionClosure: FirmwareVersionClosure?
  
     typealias DialProgressClosure = (_ progress: Int) -> Void
     var dialProgressClosure: DialProgressClosure?
@@ -1331,6 +1333,7 @@ class BluetoothManager: NSObject {
         gpsClosure = nil
         intensiveTimeClosure = nil
         beidouCardClosure = nil
+        firmwareVersionClosure = nil
         switch closure {
         case is BloodPressureClosure:
             bloodPressureClosure = closure as? BloodPressureClosure
@@ -1354,6 +1357,8 @@ class BluetoothManager: NSObject {
             intensiveTimeClosure = closure as? IntensiveTimeClosure
         case is BeidouCardClosure:
             beidouCardClosure = closure as? BeidouCardClosure
+        case is FirmwareVersionClosure:
+            firmwareVersionClosure = closure as? FirmwareVersionClosure
         default:
             break
         }