From 346a2a14db5e1420511da88728bbb1486f28ed42 Mon Sep 17 00:00:00 2001
From: daifengyi <daifengyi@mgtv.com>
Date: Thu, 29 Jun 2023 11:08:30 +0800
Subject: [PATCH] feat:replace setUnit

---
 HDFwear/Setting/OtherSettingVC.swift |  8 ++++----
 HDFwear/Tools/BluetoothManager.swift | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/HDFwear/Setting/OtherSettingVC.swift b/HDFwear/Setting/OtherSettingVC.swift
index 6b87d12..c8f8d4e 100644
--- a/HDFwear/Setting/OtherSettingVC.swift
+++ b/HDFwear/Setting/OtherSettingVC.swift
@@ -198,7 +198,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource {
                 }
             }
         case "公制":
-            BluetoothManager.shared.setUnit(.meter, TemperatureUnit(rawValue: UInt8(user.temperatureUnit))!) {[weak self] error in
+            BluetoothManager.shared.newSetDistanceUnit(unit: .meter) {[weak self] error in
                 if error == nil {
                     user.distanceUnit = 0
                     self?.updateUI(indexPath, user: user)
@@ -206,7 +206,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource {
                 }
             }
         case "英制":
-            BluetoothManager.shared.setUnit(.foot, TemperatureUnit(rawValue: UInt8(user.temperatureUnit))!) {[weak self] error in
+            BluetoothManager.shared.newSetDistanceUnit(unit: .foot) {[weak self] error in
                 if error == nil {
                     user.distanceUnit = 1
                     self?.updateUI(indexPath, user: user)
@@ -214,14 +214,14 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource {
                 }
             }
         case "摄氏度(℃)":
-            BluetoothManager.shared.setUnit(DistanceUnit(rawValue: UInt8(user.distanceUnit))!, .celsius) {[weak self] error in
+            BluetoothManager.shared .newSetTemperatureUnit(unit: .celsius) {[weak self] error in
                 if error == nil {
                     user.temperatureUnit = 0
                     self?.updateUI(indexPath, user: user)
                 }
             }
         case "华氏度(℉）":
-            BluetoothManager.shared.setUnit(DistanceUnit(rawValue: UInt8(user.distanceUnit))!, .fahrenheit) {[weak self] error in
+            BluetoothManager.shared .newSetTemperatureUnit(unit: .fahrenheit) {[weak self] error in
                 if error == nil {
                     user.temperatureUnit = 1
                     self?.updateUI(indexPath, user: user)
diff --git a/HDFwear/Tools/BluetoothManager.swift b/HDFwear/Tools/BluetoothManager.swift
index 0f450d5..71cc96f 100644
--- a/HDFwear/Tools/BluetoothManager.swift
+++ b/HDFwear/Tools/BluetoothManager.swift
@@ -299,11 +299,6 @@ class BluetoothManager: NSObject {
         newSetUserInfo(user, completion: completion)
     }
     
-    func setUnit(_ distance: DistanceUnit, _ temperature: TemperatureUnit, completion: ((_ error: Int?) -> ())? = nil) {
-        let data = BleMessage.shared.getUnitCmd(distance, temperature)
-        self.setCmdClosure = completion
-        sendData(data)
-    }
     
     func setLanguage(_ language: AppSettings.Language, timeFormat: TimeFormat, screenOnTime: Int, pair: UInt8, completion: ((_ error: Int?) -> ())? = nil) {
         let lan: UInt8 = language == .Chinese ? 0x00 : 0x01
@@ -1888,7 +1883,13 @@ extension BluetoothManager {
     func syncUnit() {
         print("同步单位")
         let user = UserInfo
-        self.setUnit(DistanceUnit(rawValue: UInt8(user.distanceUnit))!, TemperatureUnit(rawValue: UInt8(user.temperatureUnit))!, completion: nil)
+        newSetDistanceUnit(unit:DistanceUnit(rawValue: UInt8(user.distanceUnit))!) { [weak self] error in
+            if error == nil {
+                self?.newSetTemperatureUnit(unit: TemperatureUnit(rawValue: UInt8(user.temperatureUnit))!) { error in
+                    
+                }
+            }
+        }
         self.isManagerSync = true
     }
     
--
libgit2 0.21.4