feat:time format

daifengyi
1 parent 22694b44
Showing 7 changed files with 68 additions and 22 deletions
HDFwear.xcodeproj/project.pbxproj
HDFwear/Setting/OtherSettingVC.swift
HDFwear/Tools/BleMessage+Function.swift
HDFwear/Tools/BleMessage.swift
HDFwear/Tools/Bluetooth+Types.swift
HDFwear/Tools/BluetoothManager+Function.swift
HDFwear/Tools/BluetoothManager.swift
@@ -289,6 +289,8 @@
 		B23AA1082A18F3F100BB3902 /* SortPageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B23AA1062A18F3F100BB3902 /* SortPageCell.swift */; };
 		B23AA1092A18F3F100BB3902 /* SortPageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B23AA1072A18F3F100BB3902 /* SortPageCell.xib */; };
 		B262F7C72A1BB71600B4DFD2 /* ZCStringPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B262F7C62A1BB71500B4DFD2 /* ZCStringPickerView.swift */; };
+		B279A37A2A4AC2F800A7C7B6 /* BluetoothManager+Function.swift in Sources */ = {isa = PBXBuildFile; fileRef = B279A3792A4AC2F800A7C7B6 /* BluetoothManager+Function.swift */; };
+		B279A37C2A4AC5B000A7C7B6 /* BleMessage+Function.swift in Sources */ = {isa = PBXBuildFile; fileRef = B279A37B2A4AC5B000A7C7B6 /* BleMessage+Function.swift */; };
 		B2AF58822A14C4BE0080B464 /* LaunchMyInfoSettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2AF58812A14C4BE0080B464 /* LaunchMyInfoSettingVC.swift */; };
 /* End PBXBuildFile section */
@@ -665,6 +667,8 @@
 		B23AA1062A18F3F100BB3902 /* SortPageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortPageCell.swift; sourceTree = "<group>"; };
 		B23AA1072A18F3F100BB3902 /* SortPageCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SortPageCell.xib; sourceTree = "<group>"; };
 		B262F7C62A1BB71500B4DFD2 /* ZCStringPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZCStringPickerView.swift; sourceTree = "<group>"; };
+		B279A3792A4AC2F800A7C7B6 /* BluetoothManager+Function.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BluetoothManager+Function.swift"; sourceTree = "<group>"; };
+		B279A37B2A4AC5B000A7C7B6 /* BleMessage+Function.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BleMessage+Function.swift"; sourceTree = "<group>"; };
 		B2AF58812A14C4BE0080B464 /* LaunchMyInfoSettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchMyInfoSettingVC.swift; sourceTree = "<group>"; };
 		C621CFD20D2BD60CF4F959C3 /* Pods-HDFwear.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HDFwear.release.xcconfig"; path = "Target Support Files/Pods-HDFwear/Pods-HDFwear.release.xcconfig"; sourceTree = "<group>"; };
 		E7F3880C37BC5F6DD15C709D /* Pods-HDFwear.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HDFwear.debug.xcconfig"; path = "Target Support Files/Pods-HDFwear/Pods-HDFwear.debug.xcconfig"; sourceTree = "<group>"; };
@@ -1102,8 +1106,10 @@
 			children = (
 				6C411EDE275DE737009B2E02 /* BluetoothManager.swift */,
 				6C1F987E279BF0AA00C0C3BA /* BluetoothManager+Set.swift */,
+				B279A3792A4AC2F800A7C7B6 /* BluetoothManager+Function.swift */,
 				6C411EE4275DFF37009B2E02 /* Bluetooth+Types.swift */,
 				6C6051B92760843F00286B37 /* BleMessage.swift */,
+				B279A37B2A4AC5B000A7C7B6 /* BleMessage+Function.swift */,
 				6C41D081275F2EC400747BE4 /* GCDTimer.swift */,
 				6C6051BB2760967100286B37 /* crc8.swift */,
 				6C6F406127434C5700F9473C /* UIColor+Extension.swift */,
@@ -1570,6 +1576,7 @@
 				6C34A242276D8FD100849087 /* MineCell.swift in Sources */,
 				6C80835B27F6DEA700C13EB2 /* BackgroundVC.swift in Sources */,
 				6C1B7E9827B794B300DB9D1C /* NFCCell.swift in Sources */,
+				B279A37C2A4AC5B000A7C7B6 /* BleMessage+Function.swift in Sources */,
 				6C34A24E276DE04000849087 /* AdminHelper.swift in Sources */,
 				B2AF58822A14C4BE0080B464 /* LaunchMyInfoSettingVC.swift in Sources */,
 				6C2EE98A278026460051413A /* HRReportCell.swift in Sources */,
@@ -1589,6 +1596,7 @@
 				6CBB0CAA27B7B6FA009B27C1 /* GenerateBlankVC.swift in Sources */,
 				6C2EE979277FF7120051413A /* HealthReportVC.swift in Sources */,
 				6CEA284D27EB1359006A44AB /* MedalDetailVC.swift in Sources */,
+				B279A37A2A4AC2F800A7C7B6 /* BluetoothManager+Function.swift in Sources */,
 				6C411EE1275DF6F3009B2E02 /* Data+Extension.swift in Sources */,
 				6C80835927F698B700C13EB2 /* BackgroundProtectionVC.swift in Sources */,
 				6C6F405C27434AC500F9473C /* ZCNavigationController.swift in Sources */,
@@ -184,14 +184,14 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource {
         let user = UserInfo
         switch settingDic[settingArray[indexPath.section]]![indexPath.row] {
         case "24小时":
-            BluetoothManager.shared.setTime(format: .hour_24) {[weak self] error in
+            BluetoothManager.shared.newSetTimeFormat(format: .hour_24) {[weak self] error in
                 if error == nil {
                     user.timeFormat = 0
                     self?.updateUI(indexPath, user: user)
                 }
             }
         case "12小时":
-            BluetoothManager.shared.setTime(format: .hour_12) {[weak self] error in
+            BluetoothManager.shared.newSetTimeFormat(format: .hour_24) {[weak self] error in
                 if error == nil {
                     user.timeFormat = 1
                     self?.updateUI(indexPath, user: user)
+//
+//  BleMessage+Function.swift
+//  HDFwear
+//
+//  Created by daifengyi on 2023/6/27.
+//
+
+import SwiftDate
+
+extension BleMessage {
+    func getTimeCmd() -> Data {
+        let date = DateInRegion().date
+        let timeBytes: [UInt8] = [UInt8(date.year%100), UInt8(date.month), UInt8(date.day), UInt8(date.hour), UInt8(date.minute), UInt8(date.second)]
+        //        return getSendData(cmd: .set, key: .time, bytes: timeBytes)
+//        let a = getPackData(key: .setTime, contentBytes: timeBytes)
+//        let b = createDataPacket(key: .setTime, bytes: timeBytes)
+        return createDataPacket(key: .setTime, bytes: timeBytes)
+    }
+    
+    func getTimeFormatCmd(format: TimeFormat) -> Data {
+        let bytes: [UInt8] = [format.rawValue]
+        return createDataPacket(key: .setTimeFormat, bytes: bytes)
+    }
+}
@@ -25,18 +25,6 @@ class BleMessage: NSObject {
         return getSendData(cmd: .set, key: .unit, bytes: [distance.rawValue, temperature.rawValue])
     }
-
-    
-    func getTimeCmd(format: TimeFormat) -> Data {
-        let date = DateInRegion().date
-        var timeBytes: [UInt8] = [UInt8(date.year%100), UInt8(date.month), UInt8(date.day), UInt8(date.hour), UInt8(date.minute), UInt8(date.second)]
-//        return getSendData(cmd: .set, key: .time, bytes: timeBytes)
-        let a = getPackData(key: .setTime, contentBytes: timeBytes)
-        let b = createDataPacket(key: .setTime, bytes: timeBytes)
-        print("ddd")
-        return createDataPacket(key: .setTime, bytes: timeBytes)
-    }
-    
     func getCameraCmd(_ open: Bool) -> Data {
         return getSendData(cmd: .device, key: open ? .openCamera : .exitCamera, bytes: [0x01])
     }
@@ -235,6 +223,7 @@ class BleMessage: NSObject {
     }
+    //MARK: - 组包
     func createDataPacket(key: NewCmd, bytes: [UInt8]) -> Data {
         let identifier: [UInt8] = [0xED, 0x7E] // 标识
         let version: [UInt8] = [0x00, 0x01] // 协议版本号
@@ -63,8 +63,8 @@ enum TemperatureUnit: UInt8 {
     case fahrenheit = 1
 }
 enum TimeFormat: UInt8 {
-    case hour_24 = 0
-    case hour_12 = 1
+    case hour_24 = 1
+    case hour_12 = 0
 }
 enum BleCmd: UInt8 {
@@ -116,6 +116,8 @@ enum SetCmd: UInt8 {
 enum NewCmd: UInt8 {
     case setTime = 0x09
+    case setTimeFormat = 0x10
+    
 }
 enum SyncCmd: UInt8 {
+//
+//  BluetoothManager+Function.swift
+//  HDFwear
+//
+//  Created by daifengyi on 2023/6/27.
+//
+
+import SwiftDate
+
+
+extension BluetoothManager {
+    // 设置时间
+    func newSetTime(completion: ((_ error: Int?) -> ())? = nil) {
+        let data = BleMessage.shared.getTimeCmd()
+        self.setCmdClosure = completion
+        sendData(data)
+    }
+    
+    // 设置时间格式
+    func newSetTimeFormat(format: TimeFormat, completion: ((_ error: Int?) -> ())? = nil) {
+        let data = BleMessage.shared.getTimeFormatCmd(format: format)
+        self.setCmdClosure = completion
+        sendData(data)
+    }
+}
@@ -312,9 +312,7 @@ class BluetoothManager: NSObject {
     }
     func setTime(format: TimeFormat, completion: ((_ error: Int?) -> ())? = nil) {
-        let data = BleMessage.shared.getTimeCmd(format: format)
-        self.setCmdClosure = completion
-        sendData(data)
+        newSetTime(completion: completion)
     }
     func setWeather(_ array: [WeatherModel], completion: ((_ error: Int?) -> ())? = nil) {
@@ -408,7 +406,7 @@ class BluetoothManager: NSObject {
     }
     func syncTime(format: TimeFormat) {
-        let data = BleMessage.shared.getTimeCmd(format: format)
+        let data = BleMessage.shared.getTimeCmd()
         sendData(data)
     }
@@ -1233,7 +1231,7 @@ class BluetoothManager: NSObject {
         }
         let newcmd = NewCmd(rawValue: bytes[13])
         switch newcmd {
-        case .setTime:
+        case .setTime, .setTimeFormat:
             if setCmdClosure != nil {
                 let success = bytes[14] == 0
                 if success {
@@ -1252,7 +1250,7 @@ class BluetoothManager: NSObject {
     //MARK: - 发送数据
-    private func sendData(_ data: Data) {
+    func sendData(_ data: Data) {
         if peripheral == nil {
             print("peripheral == nil")
             return