feat:no disturb

daifengyi
1 parent 2b8a1881
Showing 5 changed files with 18 additions and 9 deletions
HDFwear/Tools/BleMessage+Function.swift
HDFwear/Tools/BleMessage.swift
HDFwear/Tools/Bluetooth+Types.swift
HDFwear/Tools/BluetoothManager+Function.swift
HDFwear/Tools/BluetoothManager.swift
@@ -86,4 +86,10 @@ extension BleMessage {
         let bytes = [0x00, UInt8(user.weight), 0x00, UInt8(user.height), UInt8(user.gender)]
         return createDataPacket(key: .setUserInfo, bytes: bytes)
     }
+    
+    func getNotDisturbCmd(_ remind: RemindModel) -> Data {
+        //jtd!
+        let bytes: [UInt8] = [remind.isOn ? 0x01 : 0x00, UInt8(remind.startDate.hour), UInt8(remind.startDate.minute), UInt8(remind.endDate.hour), UInt8(remind.endDate.minute)]
+        return createDataPacket(key: .setNoDisturb, bytes: bytes)
+    }
 }
@@ -68,11 +68,6 @@ class BleMessage: NSObject {
         return getSendData(cmd: .set, key: .sedentary, bytes: bytes)
     }
-    func getNotDisturbCmd(_ remind: RemindModel) -> Data {
-        let bytes: [UInt8] = [remind.isOn ? 0x01 : 0x00, UInt8(remind.startDate.hour), UInt8(remind.startDate.minute), UInt8(remind.endDate.hour), UInt8(remind.endDate.minute)]
-        return getSendData(cmd: .remind, key: .disturb, bytes: bytes)
-    }
-    
     func getAutoMeasureCmd(_ bool: Bool) -> Data {
         let bytes: [UInt8] = bool ? [0x01] : [0x00]
         return getSendData(cmd: .device, key: .autoMeasure, bytes: bytes)
@@ -132,9 +132,9 @@ enum NewCmd: UInt8 {
 //                      0x0023
     case setPressureAutoDetect = 0x0024
     case setbloodOxygenAutoDetect = 0x0025
-    //jtd!
     case setUserInfo = 0x0026
     case setNoDisturb = 0x0027
+    //jtd!
     case setFetchWatchData = 0x0028
     case setBeiDouContact = 0x0029
     case setBeiDouQuickAnswer = 0x0030
@@ -119,4 +119,11 @@ extension BluetoothManager {
         self.setCmdClosure = completion
         sendData(data)
     }
+    
+    // 设置勿扰模式
+    func newSetNotDisturb(remind: RemindModel, completion: @escaping(_ error: Int?) -> ()) {
+        let data = BleMessage.shared.getNotDisturbCmd(remind)
+        self.setCmdClosure = completion
+        sendData(data)
+    }
 }
@@ -372,9 +372,10 @@ class BluetoothManager: NSObject {
     }
     func setNotDisturb(remind: RemindModel, completion: @escaping(_ error: Int?) -> ()) {
-        let data = BleMessage.shared.getNotDisturbCmd(remind)
-        self.setCmdClosure = completion
-        sendData(data)
+//        let data = BleMessage.shared.getNotDisturbCmd(remind)
+//        self.setCmdClosure = completion
+//        sendData(data)
+        newSetNotDisturb(remind: remind, completion: completion)
     }
     func setWristSense(_ bool: Bool, completion: ((_ error: Int?) -> ())? = nil) {