Commit 346a2a14db5e1420511da88728bbb1486f28ed42
1 parent
d6dfcaed
feat:replace setUnit
Showing
2 changed files
with
11 additions
and
10 deletions
HDFwear/Setting/OtherSettingVC.swift
@@ -198,7 +198,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { | @@ -198,7 +198,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { | ||
198 | } | 198 | } |
199 | } | 199 | } |
200 | case "公制": | 200 | case "公制": |
201 | - BluetoothManager.shared.setUnit(.meter, TemperatureUnit(rawValue: UInt8(user.temperatureUnit))!) {[weak self] error in | 201 | + BluetoothManager.shared.newSetDistanceUnit(unit: .meter) {[weak self] error in |
202 | if error == nil { | 202 | if error == nil { |
203 | user.distanceUnit = 0 | 203 | user.distanceUnit = 0 |
204 | self?.updateUI(indexPath, user: user) | 204 | self?.updateUI(indexPath, user: user) |
@@ -206,7 +206,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { | @@ -206,7 +206,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { | ||
206 | } | 206 | } |
207 | } | 207 | } |
208 | case "英制": | 208 | case "英制": |
209 | - BluetoothManager.shared.setUnit(.foot, TemperatureUnit(rawValue: UInt8(user.temperatureUnit))!) {[weak self] error in | 209 | + BluetoothManager.shared.newSetDistanceUnit(unit: .foot) {[weak self] error in |
210 | if error == nil { | 210 | if error == nil { |
211 | user.distanceUnit = 1 | 211 | user.distanceUnit = 1 |
212 | self?.updateUI(indexPath, user: user) | 212 | self?.updateUI(indexPath, user: user) |
@@ -214,14 +214,14 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { | @@ -214,14 +214,14 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { | ||
214 | } | 214 | } |
215 | } | 215 | } |
216 | case "摄氏度(℃)": | 216 | case "摄氏度(℃)": |
217 | - BluetoothManager.shared.setUnit(DistanceUnit(rawValue: UInt8(user.distanceUnit))!, .celsius) {[weak self] error in | 217 | + BluetoothManager.shared .newSetTemperatureUnit(unit: .celsius) {[weak self] error in |
218 | if error == nil { | 218 | if error == nil { |
219 | user.temperatureUnit = 0 | 219 | user.temperatureUnit = 0 |
220 | self?.updateUI(indexPath, user: user) | 220 | self?.updateUI(indexPath, user: user) |
221 | } | 221 | } |
222 | } | 222 | } |
223 | case "华氏度(℉)": | 223 | case "华氏度(℉)": |
224 | - BluetoothManager.shared.setUnit(DistanceUnit(rawValue: UInt8(user.distanceUnit))!, .fahrenheit) {[weak self] error in | 224 | + BluetoothManager.shared .newSetTemperatureUnit(unit: .fahrenheit) {[weak self] error in |
225 | if error == nil { | 225 | if error == nil { |
226 | user.temperatureUnit = 1 | 226 | user.temperatureUnit = 1 |
227 | self?.updateUI(indexPath, user: user) | 227 | self?.updateUI(indexPath, user: user) |
HDFwear/Tools/BluetoothManager.swift
@@ -299,11 +299,6 @@ class BluetoothManager: NSObject { | @@ -299,11 +299,6 @@ class BluetoothManager: NSObject { | ||
299 | newSetUserInfo(user, completion: completion) | 299 | newSetUserInfo(user, completion: completion) |
300 | } | 300 | } |
301 | 301 | ||
302 | - func setUnit(_ distance: DistanceUnit, _ temperature: TemperatureUnit, completion: ((_ error: Int?) -> ())? = nil) { | ||
303 | - let data = BleMessage.shared.getUnitCmd(distance, temperature) | ||
304 | - self.setCmdClosure = completion | ||
305 | - sendData(data) | ||
306 | - } | ||
307 | 302 | ||
308 | func setLanguage(_ language: AppSettings.Language, timeFormat: TimeFormat, screenOnTime: Int, pair: UInt8, completion: ((_ error: Int?) -> ())? = nil) { | 303 | func setLanguage(_ language: AppSettings.Language, timeFormat: TimeFormat, screenOnTime: Int, pair: UInt8, completion: ((_ error: Int?) -> ())? = nil) { |
309 | let lan: UInt8 = language == .Chinese ? 0x00 : 0x01 | 304 | let lan: UInt8 = language == .Chinese ? 0x00 : 0x01 |
@@ -1888,7 +1883,13 @@ extension BluetoothManager { | @@ -1888,7 +1883,13 @@ extension BluetoothManager { | ||
1888 | func syncUnit() { | 1883 | func syncUnit() { |
1889 | print("同步单位") | 1884 | print("同步单位") |
1890 | let user = UserInfo | 1885 | let user = UserInfo |
1891 | - self.setUnit(DistanceUnit(rawValue: UInt8(user.distanceUnit))!, TemperatureUnit(rawValue: UInt8(user.temperatureUnit))!, completion: nil) | 1886 | + newSetDistanceUnit(unit:DistanceUnit(rawValue: UInt8(user.distanceUnit))!) { [weak self] error in |
1887 | + if error == nil { | ||
1888 | + self?.newSetTemperatureUnit(unit: TemperatureUnit(rawValue: UInt8(user.temperatureUnit))!) { error in | ||
1889 | + | ||
1890 | + } | ||
1891 | + } | ||
1892 | + } | ||
1892 | self.isManagerSync = true | 1893 | self.isManagerSync = true |
1893 | } | 1894 | } |
1894 | 1895 |