feat:0301 part1

jason
1 parent e3bf0573
Showing 9 changed files with 469 additions and 41 deletions
HDFwear.xcodeproj/project.pbxproj
HDFwear.xcodeproj/xcshareddata/xcschemes/HDFwear.xcscheme
HDFwear/20240126ReadMe.md
HDFwear/20240301ReadMe.md
HDFwear/Home/Model/NewBeiDouContactModel.swift
HDFwear/Mine/MineViewController.swift
HDFwear/Tools/Bluetooth+Types.swift
HDFwear/Tools/BluetoothManager+Function.swift
HDFwear/Tools/BluetoothManager.swift
@@ -297,6 +297,7 @@
 		847B88EF2B5780CA00851EE7 /* NewIntensiveTimeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847B88EE2B5780CA00851EE7 /* NewIntensiveTimeModel.swift */; };
 		847CA80F2B6147680051AEAF /* OTAUpdateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 847CA80D2B6147680051AEAF /* OTAUpdateViewController.m */; };
 		847CA8102B6147680051AEAF /* OTAUpdateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 847CA80E2B6147680051AEAF /* OTAUpdateViewController.xib */; };
+		848387332B93560300E94A9A /* 20240301ReadMe.md in Resources */ = {isa = PBXBuildFile; fileRef = 848387322B93560300E94A9A /* 20240301ReadMe.md */; };
 		84DA399D2B4D3A5B008D34A9 /* NewGpsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DA399C2B4D3A5B008D34A9 /* NewGpsModel.swift */; };
 		B212F1FD2A14CE0400781D59 /* LaunchSetting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B212F1FF2A14CE0400781D59 /* LaunchSetting.storyboard */; };
 		B212F2052A14D28E00781D59 /* LaunchMyBodySettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B212F2042A14D28E00781D59 /* LaunchMyBodySettingVC.swift */; };
@@ -695,6 +696,7 @@
 		847CA80E2B6147680051AEAF /* OTAUpdateViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OTAUpdateViewController.xib; sourceTree = "<group>"; };
 		847D1C4A2B009FAC0097A96E /* 20231111ReadMe.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = 20231111ReadMe.md; sourceTree = "<group>"; };
 		847D2DE42B3D575F001BA7EF /* 20240110ReadMe.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = 20240110ReadMe.md; sourceTree = "<group>"; };
+		848387322B93560300E94A9A /* 20240301ReadMe.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = 20240301ReadMe.md; sourceTree = "<group>"; };
 		84DA399C2B4D3A5B008D34A9 /* NewGpsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewGpsModel.swift; sourceTree = "<group>"; };
 		B0BDC40FAF3CBA7B780ED655 /* Pods_HDFwear.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HDFwear.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B212F1FE2A14CE0400781D59 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchSetting.storyboard; sourceTree = "<group>"; };
@@ -1110,6 +1112,7 @@
 				847D1C4A2B009FAC0097A96E /* 20231111ReadMe.md */,
 				847D2DE42B3D575F001BA7EF /* 20240110ReadMe.md */,
 				845ADE9F2B5507FA00C3AD73 /* 20240126ReadMe.md */,
+				848387322B93560300E94A9A /* 20240301ReadMe.md */,
 			);
 			path = HDFwear;
 			sourceTree = "<group>";
@@ -1531,6 +1534,7 @@
 				6C5B546027759D6B007F7901 /* SettingCell3.xib in Resources */,
 				6C0AE826279162FE0064D377 /* AppVersionView.xib in Resources */,
 				6CEA284B27EB0A82006A44AB /* MedalHeaderView.xib in Resources */,
+				848387332B93560300E94A9A /* 20240301ReadMe.md in Resources */,
 				6CA8623F2747473900139069 /* StepProgressView.xib in Resources */,
 				6C28F54527901A8D00E74EA5 /* StepReportCell.xib in Resources */,
 			);
@@ -74,7 +74,7 @@
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"
             value = "disable"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
@@ -170,16 +170,6 @@ BluetoothManager+Function
     func newGetBoLowRemindData(option: SyncOption = .now, closure: BoLowRemindClosure? = nil)    
     发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 15, 1, 54, 246]
     接收: [237, 126, 0, 1, 128, 50, 0, 1, 0, 1, 80, 253, 102]
-    
-拉取心率自动测量开关
-    func newGetHrAutoDetectData(option: SyncOption = .now, closure: BoAutoDetectClosure? = nil)
-    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 16, 1, 37, 187]
-    接收: [237, 126, 0, 1, 128, 51, 0, 1, 0, 1, 1, 242, 18]
-
-拉取运动心率预警开关
-    func newGetExerciseHrRemindData(option: SyncOption = .now, closure: ExerciseHrRemindClosure? = nil)
-    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 18, 1, 67, 217]
-    接收: [237, 126, 0, 1, 128, 53, 0, 1, 0, 1, 0, 111, 210]
  
 接受数据类
  
+接口说明：
+
+接口实现
+BluetoothManager+Function
+
+发送数据类
+拉取消息通知开关
+    func newGetMessageRemindData(option: SyncOption = .now, closure: MessageRemindClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 23, 1, 188, 44]
+    接收: [237, 126, 0, 1, 128, 57, 0, 1, 0, 1, 11, 213, 90]
+
+拉取紧急常用联系人    北斗联系人
+    func newGetBeiDouContactData(option: SyncOption = .now, closure: BeiDouContactClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 24, 1, 172, 18]
+    接收: [237, 126, 0, 1, 128, 64, 0, 1, 0, 90, 4, 9, 229, 145, 168, 230, 157, 176, 228, 188, 166, 11, 49, 56, 57, 55, 52, 57, 54, 48, 48, 48, 49, 1, 9, 230, 162, 129, 230, 156, 157, 228, 188, 159, 11, 49, 56, 57, 55, 52, 57, 54, 48, 48, 48, 50, 2, 9, 229, 144, 180, 229, 189, 166, 231, 165, 150, 11, 49, 56, 57, 55, 52, 57, 54, 48, 48, 48, 51, 1, 6, 230, 136, 144, 233, 190, 153, 11, 49, 56, 57, 55, 52, 57, 54, 48, 48, 48, 52, 2, 240, 77]
+
+拉取压力开关    压力检测开关
+    func newGetPressureAutoDetectData(option: SyncOption = .now, closure: PressureAutoDetectClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 25, 1, 159, 35]
+    接收: [237, 126, 0, 1, 128, 65, 0, 1, 0, 1, 1, 60, 206]
+
+拉取低电量提醒开关
+    func newGetLowPowerRemindData(option: SyncOption = .now, closure: LowPowerRemindClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 26, 1, 202, 112]
+    接收: [237, 126, 0, 1, 128, 66, 0, 1, 0, 1, 1, 242, 46]
+    
+拉取北斗消息回复  北斗消息自动回复
+    func newGetBeiDouQuickAnswerData(option: SyncOption = .now, closure: BeiDouQuickAnswerClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 27, 1, 249, 65]
+    接收: [237, 126, 0, 1, 128, 67, 0, 1, 0, 15, 2, 6, 229, 140, 151, 230, 150, 151, 6, 229, 141, 151, 230, 150, 151, 124, 127]
+
+拉取运动心率预警开关
+    func newGetExerciseHrRemindData(option: SyncOption = .now, closure: ExerciseHrRemindClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 28, 1, 96, 214]
+    接收: [237, 126, 0, 1, 128, 68, 0, 1, 0, 3, 1, 110, 150, 22, 246]
+    
+拉取心率自动测量开关  连续测量心率
+    func newGetHrAutoDetectData(option: SyncOption = .now, closure: HrAutoDetectClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 29, 1, 83, 231]
+    接收: [237, 126, 0, 1, 128, 69, 0, 1, 0, 3, 1, 18, 0, 255, 110]
+
+拉取安静心率提醒设置
+    func newGetRestHrRemindData(option: SyncOption = .now, closure: RestHrRemindClosure? = nil)
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 30, 1, 6, 180]
+    接收: [237, 126, 0, 1, 128, 70, 0, 1, 0, 3, 1, 60, 90, 233, 77]
@@ -20,10 +20,56 @@ class NewBeiDouContactModel: NSObject {
     var name: String = ""
     var phone: String = ""
     var type: NewBeiDouContactType = .general
+    
+    override var description: String {
+         return "Name: \(name), Phone: \(phone), Type: \(type.rawValue)"
+     }
  
     init(name: String, phone: String, type: NewBeiDouContactType) {
         self.name = name
         self.phone = phone
         self.type = type
     }
+    
+    class func getNewBeiDouContact(from data: [UInt8]) -> [NewBeiDouContactModel]? {
+        var index = 0
+        var contacts: [NewBeiDouContactModel] = []
+
+        guard data.count >= 1 else { return nil }
+
+        let contactsCount = Int(data[index])
+        index += 1
+
+        for _ in 0..<contactsCount {
+            guard index + 2 < data.count else { return nil }
+
+            let nameLength = Int(data[index])
+            index += 1
+
+            let nameData = Array(data[index..<(index + nameLength)])
+            guard let name = String(bytes: nameData, encoding: .utf8) else { return nil }
+            index += nameLength
+
+            let phoneLength = Int(data[index])
+            index += 1
+
+            let phoneData = Array(data[index..<(index + phoneLength)])
+            guard let phone = String(bytes: phoneData, encoding: .ascii) else { return nil }
+            index += phoneLength
+
+            let typeRawValue = data[index]
+            index += 1
+
+            if let type = NewBeiDouContactType(rawValue: Int(typeRawValue)) {
+                let contact = NewBeiDouContactModel(name: name, phone: phone, type: type)
+                contacts.append(contact)
+            } else {
+                return nil
+            }
+        }
+
+        return contacts
+    }
+
+
 }
@@ -355,7 +355,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
             }
  
             let archiveAction21 = UIAlertAction(title: "newSetBeiDouQuickAnswer", style: .default) { action in
-                BluetoothManager.shared.newSetBeiDouQuickAnswer(answers: ["北斗"]) { error in
+                BluetoothManager.shared.newSetBeiDouQuickAnswer(answers: ["北斗","南斗"]) { error in
                     if error != nil {
                         print("newSetBeiDouQuickAnswer" + (error?.description ?? ""))
                     }else {
@@ -809,27 +809,101 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
         }
  
         let archiveAction110 = UIAlertAction(title: "newGetHrAutoDetectData", style: .default) {[weak self] action in
-            BluetoothManager.shared.newGetHrAutoDetectData() {enable, error in
+            BluetoothManager.shared.newGetHrAutoDetectData() {enable, interval, error in
                 if error != nil {
                     print("newGetHrAutoDetectData" + (error?.description ?? ""))
                 }else {
-                    self?.showDetailAlert(msg: String(enable))
+                    self?.showDetailAlert(msg: String("enable: \(enable), interval: \(interval)"))
                     print("newGetHrAutoDetectData success")
                 }
             }
         }
  
         let archiveAction111 = UIAlertAction(title: "newGetExerciseHrRemindData", style: .default) {[weak self] action in
-            BluetoothManager.shared.newGetExerciseHrRemindData() {enable, error in
+            BluetoothManager.shared.newGetExerciseHrRemindData() {enable, min, max, error in
                 if error != nil {
                     print("newGetExerciseHrRemindData" + (error?.description ?? ""))
                 }else {
-                    self?.showDetailAlert(msg: String(enable))
+                    self?.showDetailAlert(msg: String("enable: \(enable), min: \(min), max: \(max)"))
                     print("newGetExerciseHrRemindData success")
                 }
             }
         }
  
+        let archiveAction111a = UIAlertAction(title: "newGetRestHrRemindData", style: .default) {[weak self] action in
+            BluetoothManager.shared.newGetRestHrRemindData() {enable, min, max, error in
+                if error != nil {
+                    print("newGetRestHrRemindData" + (error?.description ?? ""))
+                }else {
+                    self?.showDetailAlert(msg: String("enable: \(enable), min: \(min), max: \(max)"))
+                    print("newGetRestHrRemindData success")
+                }
+            }
+        }
+        
+        let archiveAction112 = UIAlertAction(title: "newGetMessageRemindData", style: .default) {[weak self] action in
+            BluetoothManager.shared.newGetMessageRemindData() {enable, system, wechat, qq, error in
+                if error != nil {
+                    print("newGetMessageRemindData" + (error?.description ?? ""))
+                }else {
+                    self?.showDetailAlert(msg: String("enable: \(enable), system: \(system), wechat: \(wechat), qq: \(qq)"))
+                    print("newGetMessageRemindData success")
+                }
+            }
+        }
+        
+        let archiveAction113 = UIAlertAction(title: "newGetBeiDouContactData", style: .default) {[weak self] action in
+            BluetoothManager.shared.newGetBeiDouContactData() {contact, error in
+                if error != nil {
+                    print("newGetBeiDouContactData" + (error?.description ?? ""))
+                }else {
+                    if let c = contact {
+                        let contactsDescription = c.map { "\($0)" }.joined(separator: "\n")
+                        self?.showDetailAlert(msg: contactsDescription)
+                        print("newGetBeiDouContactData success")
+                    }
+                }
+            }
+        }
+        
+        let archiveAction114 = UIAlertAction(title: "newGetPressureAutoDetectData", style: .default) {[weak self] action in
+            BluetoothManager.shared.newGetPressureAutoDetectData() {enable, error in
+                if error != nil {
+                    print("newGetPressureAutoDetectData" + (error?.description ?? ""))
+                }else {
+                    self?.showDetailAlert(msg: String(enable))
+                    print("newGetPressureAutoDetectData success")
+                }
+            }
+        }
+        
+        let archiveAction115 = UIAlertAction(title: "newGetLowPowerRemindData", style: .default) {[weak self] action in
+            BluetoothManager.shared.newGetLowPowerRemindData() {enable, error in
+                if error != nil {
+                    print("newGetLowPowerRemindData" + (error?.description ?? ""))
+                }else {
+                    self?.showDetailAlert(msg: String(enable))
+                    print("newGetLowPowerRemindData success")
+                }
+            }
+        }
+        
+        let archiveAction116 = UIAlertAction(title: "newGetBeiDouQuickAnswerData", style: .default) {[weak self] action in
+            BluetoothManager.shared.newGetBeiDouQuickAnswerData() {answers, error in
+                if error != nil {
+                    print("newGetBeiDouQuickAnswerData" + (error?.description ?? ""))
+                }else {
+                    if let a = answers {
+                        let contactsDescription = a.map { "\($0)" }.joined(separator: "\n")
+                        self?.showDetailAlert(msg: contactsDescription)
+                        print("newGetBeiDouQuickAnswerData success")
+                    }
+                }
+            }
+        }
+        
+        
+        
  
         alert.addAction(archiveAction9a)
         alert.addAction(archiveAction9b)
@@ -856,6 +930,12 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
         alert.addAction(archiveAction109)
         alert.addAction(archiveAction110)
         alert.addAction(archiveAction111)
+        alert.addAction(archiveAction111a)
+        alert.addAction(archiveAction112)
+        alert.addAction(archiveAction113)
+        alert.addAction(archiveAction114)
+        alert.addAction(archiveAction115)
+        alert.addAction(archiveAction116)
  
         alert.addAction(UIAlertAction(title: "取消", style: .destructive, handler: nil))
         present(alert, animated: true, completion: nil)
@@ -128,8 +128,8 @@ enum NewCmd: UInt8 {
     case setRestore = 0x17
     case setHeartRateHighRemind = 0x90// deprecated
     case setHeartRateLowRemind = 0x91// deprecated
-    case setRestHeartRateRemind = 0x18
-    case setExerciseHeartRateRemind = 0x19
+    case setRestHeartRateRemind = 0x18//安静心率预警
+    case setExerciseHeartRateRemind = 0x19//运动心率预警
     case setFindWatch = 0x0020
 //    case setMessage = 0x0021
 //    case setPhoneCall = 0x0022
@@ -181,10 +181,18 @@ enum SyncType: UInt8 {
     case noDisturb = 0x0D
     case boAutoDetect = 0x0E
     case boLowRemind = 0x0F
-    case hrAutoDetect = 0x10
-    case exerciseHrRemind = 0x12
+//    case hrAutoDetect = 0x10
+//    case exerciseHrRemind = 0x12
     case firmwareVersion = 0x14
     case wristSense = 0x15
+    case messageRemind = 0x0017
+    case beiDouContact = 0x0018
+    case pressureAutoDetect = 0x19
+    case lowPowerRemind = 0x1A
+    case beiDouQuickAnswer = 0x001B
+    case exerciseHrRemind = 0x1C//运动心率预警
+    case hrAutoDetect = 0x1D//心率测量间隔设置
+    case restHrRemind = 0x1E//安静心率预警
     case other = 0xff
 }
  
@@ -300,6 +300,42 @@ extension BluetoothManager {
         newStartSyncHealthData(closure: closure, data: data, synType: .firmwareVersion)
     }
  
+    // 拉取消息通知开关
+    func newGetMessageRemindData(option: SyncOption = .now, closure: MessageRemindClosure? = nil) {
+        let data = BleMessage.shared.getSyncCmd(.messageRemind, option)
+        newStartSyncHealthData(closure: closure, data: data, synType: .messageRemind)
+    }
+    
+    // 拉取紧急常用联系人    北斗联系人
+    func newGetBeiDouContactData(option: SyncOption = .now, closure: BeiDouContactClosure? = nil) {
+        let data = BleMessage.shared.getSyncCmd(.beiDouContact, option)
+        newStartSyncHealthData(closure: closure, data: data, synType: .beiDouContact)
+    }
+    
+    // 拉取压力开关    压力检测开关
+    func newGetPressureAutoDetectData(option: SyncOption = .now, closure: PressureAutoDetectClosure? = nil) {
+        let data = BleMessage.shared.getSyncCmd(.pressureAutoDetect, option)
+        newStartSyncHealthData(closure: closure, data: data, synType: .pressureAutoDetect)
+    }
+    
+    // 拉取低电量提醒开关
+    func newGetLowPowerRemindData(option: SyncOption = .now, closure: LowPowerRemindClosure? = nil) {
+        let data = BleMessage.shared.getSyncCmd(.lowPowerRemind, option)
+        newStartSyncHealthData(closure: closure, data: data, synType: .lowPowerRemind)
+    }
+    
+    // 拉取北斗消息回复  北斗消息自动回复
+    func newGetBeiDouQuickAnswerData(option: SyncOption = .now, closure: BeiDouQuickAnswerClosure? = nil) {
+        let data = BleMessage.shared.getSyncCmd(.beiDouQuickAnswer, option)
+        newStartSyncHealthData(closure: closure, data: data, synType: .beiDouQuickAnswer)
+    }
+    
+    // 拉取安静心率提醒设置
+    func newGetRestHrRemindData(option: SyncOption = .now, closure: RestHrRemindClosure? = nil) {
+        let data = BleMessage.shared.getSyncCmd(.restHrRemind, option)
+        newStartSyncHealthData(closure: closure, data: data, synType: .restHrRemind)
+    }
+    
     //MARK: - old code
     // 拉取睡眠数据
     func getSleepData(option: SyncOption = .now, closure: SleepClosure? = nil) {
@@ -690,44 +726,128 @@ extension BluetoothManager {
                 parseBoLowRemindData(content)
             }
         case 0x8033://心率自动测量开关
-            print("心率自动测量开关")
+            newGetHrAutoDetectData(option: .now, closure: hrAutoDetectClosure)
+//            print("心率自动测量开关")
+//            let content = parseContentFromBytes(bytes)
+//            if (content.count == 1 && content.first == 0xff) {
+//                for delegate in syncDelegateList {
+//                    delegate.didReceiveFinishCommand(0x8033)
+//                }
+//            }else {
+//                parseHrAutoDetectData(content)
+//            }
+        case 0x8034://安静心率预警开关
+            newGetRestHrRemindData(option: .now, closure: restHrRemindClosure)
+        case 0x8035://运动心率预警开关
+            newGetExerciseHrRemindData(option: .now, closure: exerciseHrRemindClosure)
+//            print("运动心率预警开关")
+//            let content = parseContentFromBytes(bytes)
+//            if (content.count == 1 && content.first == 0xff) {
+//                for delegate in syncDelegateList {
+//                    delegate.didReceiveFinishCommand(0x8035)
+//                }
+//            }else {
+//                parseExerciseHrRemindData(content)
+//            }
+        case 0x8037://固件版本号
+            print("固件版本号")
             let content = parseContentFromBytes(bytes)
             if (content.count == 1 && content.first == 0xff) {
                 for delegate in syncDelegateList {
-                    delegate.didReceiveFinishCommand(0x8033)
+                    delegate.didReceiveFinishCommand(0x8037)
                 }
             }else {
-                parseHrAutoDetectData(content)
+                parseFirmwareVersionData(content)
             }
-        case 0x8035://运动心率预警开关
+        case 0x8038://抬腕提醒开关
+            print("抬腕提醒开关")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8038)
+                }
+            }else {
+                parseWristSenseData(content)
+            }
+        case 0x8039://消息通知开关
+            print("消息通知开关")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8039)
+                }
+            }else {
+                parseMessageRemindData(content)
+            }
+        case 0x8040://紧急常用联系人
+            print("紧急常用联系人")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8040)
+                }
+            }else {
+                parseBeiDouContactData(content)
+            }
+        case 0x8041://压力检测开关
+            print("压力检测开关")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8041)
+                }
+            }else {
+                parsePressureAutoDetectData(content)
+            }
+        case 0x8042://低电量提醒开关
+            print("低电量提醒开关")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8042)
+                }
+            }else {
+                parseLowPowerRemindData(content)
+            }
+        case 0x8043://北斗消息自动回复
+            print("北斗消息自动回复")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8043)
+                }
+            }else {
+                parseBeiDouQuickAnswerData(content)
+            }
+        case 0x8044://运动心率预警开关
             print("运动心率预警开关")
             let content = parseContentFromBytes(bytes)
             if (content.count == 1 && content.first == 0xff) {
                 for delegate in syncDelegateList {
-                    delegate.didReceiveFinishCommand(0x8035)
+                    delegate.didReceiveFinishCommand(0x8044)
                 }
             }else {
                 parseExerciseHrRemindData(content)
             }
-        case 0x8037://固件版本号
-            print("固件版本号")
+        case 0x8045://心率自动测量开关 连续测量心率
+            print("心率自动测量开关")
             let content = parseContentFromBytes(bytes)
             if (content.count == 1 && content.first == 0xff) {
                 for delegate in syncDelegateList {
-                    delegate.didReceiveFinishCommand(0x8037)
+                    delegate.didReceiveFinishCommand(0x8045)
                 }
             }else {
-                parseFirmwareVersionData(content)
+                parseHrAutoDetectData(content)
             }
-        case 0x8038://抬腕提醒开关
-            print("抬腕提醒开关")
+        case 0x8046://安静心率提醒设置
+            print("心率自动测量开关")
             let content = parseContentFromBytes(bytes)
             if (content.count == 1 && content.first == 0xff) {
                 for delegate in syncDelegateList {
-                    delegate.didReceiveFinishCommand(0x8038)
+                    delegate.didReceiveFinishCommand(0x8046)
                 }
             }else {
-                parseWristSenseData(content)
+                parseRestHrRemindData(content)
             }
         default:
             break
@@ -980,24 +1100,40 @@ extension BluetoothManager {
  
     // 心率自动测量开关
     func parseHrAutoDetectData(_ content: [UInt8]) {
-        guard content.count > 0 else {
+        guard content.count > 1 else {
             print("无有效的信息")
-            hrAutoDetectClosure?(false, nil)
+//            hrAutoDetectClosure?(false, nil)
             return
         }
         let enable = (content[0] == 0x01)
-        hrAutoDetectClosure?(enable, nil)
+        let interval = Int(content[1])
+        hrAutoDetectClosure?(enable, interval, nil)
     }
  
     // 运动心率预警开关
     func parseExerciseHrRemindData(_ content: [UInt8]) {
-        guard content.count > 0 else {
+        guard content.count > 2 else {
             print("无有效的信息")
-            exerciseHrRemindClosure?(false, nil)
+//            exerciseHrRemindClosure?(false, nil)
             return
         }
         let enable = (content[0] == 0x01)
-        exerciseHrRemindClosure?(enable, nil)
+        let min = Int(content[1])
+        let max = Int(content[2])
+        exerciseHrRemindClosure?(enable, min, max, nil)
+    }
+    
+    // 安静心率预警开关
+    func parseRestHrRemindData(_ content: [UInt8]) {
+        guard content.count > 2 else {
+            print("无有效的信息")
+//            exerciseHrRemindClosure?(false, nil)
+            return
+        }
+        let enable = (content[0] == 0x01)
+        let min = Int(content[1])
+        let max = Int(content[2])
+        restHrRemindClosure?(enable, min, max, nil)
     }
  
     // 运动数据
@@ -1037,4 +1173,97 @@ extension BluetoothManager {
         let enable = (content[0] == 0x01)
         wristSenseClosure?(enable, nil)
     }
+    
+    // 消息通知开关
+    func parseMessageRemindData(_ content: [UInt8]) {
+        guard content.count > 0 else {
+            print("无有效的信息")
+            return
+        }
+        let byte = content[0] // 获取第一个字节
+        let enable = byte & 0b00000001 != 0
+        let system = byte & 0b00000010 != 0
+        let wechat = byte & 0b00000100 != 0
+        let qq = byte & 0b00001000 != 0
+
+        messageRemindClosure?(enable, system, wechat, qq, nil)
+    }
+    
+    
+    // 紧急常用联系人
+    func parseBeiDouContactData(_ content: [UInt8]) {
+        guard content.count > 0 else {
+            print("无有效的信息")
+            return
+        }
+        let contact = NewBeiDouContactModel.getNewBeiDouContact(from: content)
+        beiDouContactClosure?(contact, nil)
+    }
+    
+    // 压力检测开关
+    func parsePressureAutoDetectData(_ content: [UInt8]) {
+        guard content.count > 0 else {
+            print("无有效的信息")
+            return
+        }
+        let enable = (content[0] == 0x01)
+        pressureAutoDetectClosure?(enable, nil)
+    }
+    
+    // 低电量提醒开关
+    func parseLowPowerRemindData(_ content: [UInt8]) {
+        guard content.count > 0 else {
+            print("无有效的信息")
+            return
+        }
+        let enable = (content[0] == 0x01)
+        lowPowerRemindClosure?(enable, nil)
+    }
+    
+    // 北斗消息自动回复
+    func parseBeiDouQuickAnswerData(_ content: [UInt8]) {
+        guard content.count > 0 else {
+            print("无有效的信息")
+            return
+        }
+        let answers = extractNewBeiDouQuickAnswers(from: content)
+        beiDouQuickAnswerClosure?(answers, nil)
+    }
+    
+    func extractNewBeiDouQuickAnswers(from data: [UInt8]) -> [String]? {
+        var index = 0
+        guard data.count >= 1 else { return nil }
+
+        let answersCount = Int(data[index])
+        index += 1
+
+        var answers: [String] = []
+
+        for _ in 0..<answersCount {
+            guard index + 2 < data.count else { return nil }
+
+            let utf8Length = Int(data[index])
+            index += 1
+
+            let utf8Data = Array(data[index..<(index + utf8Length)])
+            guard let utf8String = String(bytes: utf8Data, encoding: .utf8) else { return nil }
+            index += utf8Length
+
+//            guard index + 2 < data.count else { return nil }
+//
+//            let gbkLength = Int(data[index])
+//            index += 1
+//
+//            let gbkData = Array(data[index..<(index + gbkLength)])
+//            let cfEncoding = CFStringEncodings(rawValue: CFStringEncodings.GB_18030_2000.rawValue)
+//            let encoding = CFStringConvertEncodingToNSStringEncoding(CFStringEncoding(cfEncoding!.rawValue))
+//            guard let gbkString = String(bytes: gbkData, encoding: String.Encoding(rawValue: encoding)) else { return nil }
+//            index += gbkLength
+
+            answers.append(utf8String)
+        }
+
+        return answers
+    }
+
 }
@@ -115,14 +115,28 @@ class BluetoothManager: NSObject {
     var boAutoDetectClosure: BoAutoDetectClosure?
     typealias BoLowRemindClosure = (_ value:Int, _ error: Int?) -> Void
     var boLowRemindClosure: BoLowRemindClosure?
-    typealias HrAutoDetectClosure = (_ enable:Bool, _ error: Int?) -> Void
+    typealias HrAutoDetectClosure = (_ enable:Bool, _ interval: Int, _ error: Int?) -> Void
     var hrAutoDetectClosure: HrAutoDetectClosure?
-    typealias ExerciseHrRemindClosure = (_ enable:Bool, _ error: Int?) -> Void
+    typealias ExerciseHrRemindClosure = (_ enable:Bool, _ min: Int, _ max: Int, _ error: Int?) -> Void
     var exerciseHrRemindClosure: ExerciseHrRemindClosure?
+    typealias RestHrRemindClosure = (_ enable:Bool, _ min: Int, _ max: Int, _ error: Int?) -> Void
+    var restHrRemindClosure: RestHrRemindClosure?
     typealias WristSenseClosure = (_ enable:Bool, _ error: Int?) -> Void
     var wristSenseClosure: WristSenseClosure?
     typealias FirmwareVersionClosure = (_ first:Int?, _ second:Int?, _ error: Int?) -> Void
     var firmwareVersionClosure: FirmwareVersionClosure?
+    typealias MessageRemindClosure = (_ enable:Bool, _ system: Bool, _ wechat: Bool, _ qq: Bool, _ error: Int?) -> Void
+    var messageRemindClosure: MessageRemindClosure?
+    typealias BeiDouContactClosure = (_ contacts: [NewBeiDouContactModel]?, _ error: Int?) -> Void
+    var beiDouContactClosure: BeiDouContactClosure?
+    typealias PressureAutoDetectClosure = (_ enable:Bool, _ error: Int?) -> Void
+    var pressureAutoDetectClosure: PressureAutoDetectClosure?
+    typealias LowPowerRemindClosure = (_ enable:Bool, _ error: Int?) -> Void
+    var lowPowerRemindClosure: LowPowerRemindClosure?
+    typealias BeiDouQuickAnswerClosure = (_ answers:[String]?, _ error: Int?) -> Void
+    var beiDouQuickAnswerClosure: BeiDouQuickAnswerClosure?
+    
+    
  
     typealias DialProgressClosure = (_ progress: Int) -> Void
     var dialProgressClosure: DialProgressClosure?
@@ -1403,10 +1417,22 @@ class BluetoothManager: NSObject {
             hrAutoDetectClosure = closure as? HrAutoDetectClosure
         case .exerciseHrRemind:
             exerciseHrRemindClosure = closure as? ExerciseHrRemindClosure
+        case .restHrRemind:
+            restHrRemindClosure = closure as? RestHrRemindClosure
         case .wristSense:
             wristSenseClosure = closure as? WristSenseClosure
         case .firmwareVersion:
             firmwareVersionClosure = closure as? FirmwareVersionClosure
+        case .messageRemind:
+            messageRemindClosure = closure as? MessageRemindClosure
+        case .beiDouContact:
+            beiDouContactClosure = closure as? BeiDouContactClosure
+        case .pressureAutoDetect:
+            pressureAutoDetectClosure = closure as? PressureAutoDetectClosure
+        case .lowPowerRemind:
+            lowPowerRemindClosure = closure as? LowPowerRemindClosure
+        case .beiDouQuickAnswer:
+            beiDouQuickAnswerClosure = closure as? BeiDouQuickAnswerClosure
         default:
             break
         }