feat:beidou card

jason
1 parent 36b76cd7
Showing 4 changed files with 55 additions and 0 deletions
HDFwear/20240126ReadMe.md
HDFwear/Mine/MineViewController.swift
HDFwear/Tools/BluetoothManager+Function.swift
HDFwear/Tools/BluetoothManager.swift
@@ -101,4 +101,10 @@ BluetoothManager+Function
     接收: [237, 126, 0, 1, 128, 40, 0, 2, 0, 28, 7, 232, 1, 9, 0, 0, 0, 0, 0, 0, 10, 10, 10, 20, 30, 52, 0, 24, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 164, 33]
     接收: [237, 126, 0, 1, 128, 40, 0, 2, 0, 1, 255, 190, 57]
  
+拉取北斗卡号数据
+    func newGetBeidouCardData(option: SyncOption = .now, closure: BeidouCardClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 12, 1, 99, 165]
+    接收: [237, 126, 0, 1, 128, 41, 0, 1, 0, 8, 49, 52, 52, 57, 51, 48, 55, 49, 16, 131]
+    
+    
 接受数据类
@@ -611,6 +611,16 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
             }
         }
  
+        let archiveAction103 = UIAlertAction(title: "newGetBeidouCardData", style: .default) {[weak self] action in
+            BluetoothManager.shared.newGetBeidouCardData() {card, error in
+                if error != nil {
+                    print("newGetBeidouCardData" + (error?.description ?? ""))
+                }else {
+                    self?.showDetailAlert(msg: card)
+                    print("newGetBeidouCardData success")
+                }
+            }
+        }
  
         alert.addAction(archiveAction9a)
         alert.addAction(archiveAction9b)
@@ -628,6 +638,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
         alert.addAction(archiveAction101b)
         alert.addAction(archiveAction102a)
         alert.addAction(archiveAction102b)
+        alert.addAction(archiveAction103)
  
         alert.addAction(UIAlertAction(title: "取消", style: .destructive, handler: nil))
         present(alert, animated: true, completion: nil)
@@ -244,6 +244,12 @@ extension BluetoothManager {
         newStartSyncHealthData(closure: closure, data: data, synType: .intensiveTime)
     }
  
+    // 拉取北斗卡号
+    func newGetBeidouCardData(option: SyncOption = .now, closure: BeidouCardClosure? = nil) {
+        let data = BleMessage.shared.getSyncCmd(.beidouCard, option)
+        newStartSyncHealthData(closure: closure, data: data, synType: .beidouCard)
+    }
+    
     //MARK: - old code
     // 拉取睡眠数据
     func getSleepData(option: SyncOption = .now, closure: SleepClosure? = nil) {
@@ -354,6 +360,12 @@ extension BluetoothManager {
                     intensiveTimeClosure?(nil, -1002)
                     intensiveTimeClosure = nil
                 }
+            case is BeidouCardClosure:
+                if beidouCardClosure == nil {
+                    beidouCardClosure = closure as? BeidouCardClosure
+                    beidouCardClosure?(nil, -1002)
+                    beidouCardClosure = nil
+                }
             default:
                 break
             }
@@ -556,6 +568,16 @@ extension BluetoothManager {
             }else {
                 parseIntensiveTimeData(content)
             }
+        case 0x8029://北斗卡号
+            print("北斗卡号")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8029)
+                }
+            }else {
+                parseBeidouCardData(content)
+            }
         default:
             break
         }
@@ -751,4 +773,15 @@ extension BluetoothManager {
         let gpsModel = NewIntensiveTimeModel.toIntensiveTimeModel(content)
         intensiveTimeClosure?(gpsModel, nil)
     }
+    
+    // 北斗卡号数据
+    func parseBeidouCardData(_ content: [UInt8]) {
+        guard content.count > 0 else {
+            print("无有效的信息")
+            intensiveTimeClosure?(nil, nil)
+            return
+        }
+        let card = String(bytes: content, encoding: .ascii)
+        beidouCardClosure?(card, nil)
+    }
 }
@@ -97,6 +97,8 @@ class BluetoothManager: NSObject {
     var gpsClosure: GpsClosure?
     typealias IntensiveTimeClosure = (_ intensiveTime:NewIntensiveTimeModel?, _ error: Int?) -> Void
     var intensiveTimeClosure: IntensiveTimeClosure?
+    typealias BeidouCardClosure = (_ card:String?, _ error: Int?) -> Void
+    var beidouCardClosure: BeidouCardClosure?
  
     typealias DialProgressClosure = (_ progress: Int) -> Void
     var dialProgressClosure: DialProgressClosure?
@@ -1295,6 +1297,7 @@ class BluetoothManager: NSObject {
         mettClosure = nil
         gpsClosure = nil
         intensiveTimeClosure = nil
+        beidouCardClosure = nil
         switch closure {
         case is BloodPressureClosure:
             bloodPressureClosure = closure as? BloodPressureClosure
@@ -1316,6 +1319,8 @@ class BluetoothManager: NSObject {
             gpsClosure = closure as? GpsClosure
         case is IntensiveTimeClosure:
             intensiveTimeClosure = closure as? IntensiveTimeClosure
+        case is BeidouCardClosure:
+            beidouCardClosure = closure as? BeidouCardClosure
         default:
             break
         }