ios / ytwatch

Commit a21b612ea0a8e4182bd950a9692d35f95f86be3e

Authored by jason
1 parent 6adf1dc1

feat:closure setup

Inline Side-by-side
Showing 3 changed files with 54 additions and 13 deletions
HDFwear/Mine/MineViewController.swift
  View file @a21b612
... ... @@ -249,7 +249,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
249 249 }
250 250 }
251 251 }
252   - let archiveAction7 = UIAlertAction(title: "newSetBloodOxygenAutoDetect", style: .default) { action in
  252 + let archiveAction7a = UIAlertAction(title: "newSetBloodOxygenAutoDetect enable", style: .default) { action in
253 253 BluetoothManager.shared.newSetBloodOxygenAutoDetect(bool: true) { error in
254 254 if error != nil {
255 255 print("newSetBloodOxygenAutoDetect" + (error?.description ?? ""))
... ... @@ -258,6 +258,15 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
258 258 }
259 259 }
260 260 }
  261 + let archiveAction7b = UIAlertAction(title: "newSetBloodOxygenAutoDetect disable", style: .default) { action in
  262 + BluetoothManager.shared.newSetBloodOxygenAutoDetect(bool: false) { error in
  263 + if error != nil {
  264 + print("newSetBloodOxygenAutoDetect" + (error?.description ?? ""))
  265 + }else {
  266 + print("newSetBloodOxygenAutoDetect success")
  267 + }
  268 + }
  269 + }
261 270 let archiveAction8 = UIAlertAction(title: "newSetUserInfo", style: .default) { action in
262 271 BluetoothManager.shared.newSetUserInfo(AdminHelper.shared.loadLocalAdminData().userInfo) { error in
263 272 if error != nil {
... ... @@ -445,7 +454,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
445 454 }
446 455 }
447 456  
448   - let archiveAction29 = UIAlertAction(title: "newSetWristSense", style: .default) { action in
  457 + let archiveAction29a = UIAlertAction(title: "newSetWristSense enable", style: .default) { action in
449 458 BluetoothManager.shared.newSetWristSense(bool: true) { error in
450 459 if error != nil {
451 460 print("newSetWristSense" + (error?.description ?? ""))
... ... @@ -455,6 +464,16 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
455 464 }
456 465 }
457 466  
  467 + let archiveAction29b = UIAlertAction(title: "newSetWristSense disable", style: .default) { action in
  468 + BluetoothManager.shared.newSetWristSense(bool: false) { error in
  469 + if error != nil {
  470 + print("newSetWristSense" + (error?.description ?? ""))
  471 + }else {
  472 + print("newSetWristSense success")
  473 + }
  474 + }
  475 + }
  476 +
458 477 let archiveAction88 = UIAlertAction(title: "ota update", style: .default) { action in
459 478 BluetoothManager.shared.startOtaUpdate()
460 479 }
... ... @@ -466,7 +485,8 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
466 485 alert.addAction(archiveAction4)
467 486 alert.addAction(archiveAction5)
468 487 alert.addAction(archiveAction6)
469   - alert.addAction(archiveAction7)
  488 + alert.addAction(archiveAction7a)
  489 + alert.addAction(archiveAction7b)
470 490 alert.addAction(archiveAction8)
471 491  
472 492 alert.addAction(archiveAction11)
... ... @@ -487,7 +507,8 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
487 507 alert.addAction(archiveAction28d)
488 508 alert.addAction(archiveAction28b)
489 509 alert.addAction(archiveAction28c)
490   - alert.addAction(archiveAction29)
  510 + alert.addAction(archiveAction29a)
  511 + alert.addAction(archiveAction29b)
491 512 alert.addAction(archiveAction88)
492 513  
493 514 alert.addAction(UIAlertAction(title: "取消", style: .destructive, handler: nil))
... ...
HDFwear/Tools/BluetoothManager+Function.swift
  View file @a21b612
... ... @@ -323,7 +323,7 @@ extension BluetoothManager {
323 323 func newStartSyncHealthData(closure: Any?, data: Data, synType: SyncType) {
324 324 // if !isSync {
325 325 // GCDTimer.shared.scheduledDispatchTimerNotNow(WithTimerName: "SyncInterval", timeInterval: 0.1, queue: .main, repeats: false) {
326   - self.clearClosures(closure: closure)
  326 + self.clearClosures(closure: closure, synType: synType)
327 327 // self.startSyncTimer()
328 328 // self.isNextSync = false
329 329 // self.isSync = true
... ...
HDFwear/Tools/BluetoothManager.swift
  View file @a21b612
... ... @@ -1327,7 +1327,7 @@ class BluetoothManager: NSObject {
1327 1327 // mettClosure?([], -1001)
1328 1328 // }
1329 1329  
1330   - func clearClosures(closure: Any?) {
  1330 + func clearClosures(closure: Any?, synType: SyncType) {
1331 1331 // heartRateClosure = nil
1332 1332 // bloodPressureClosure = nil
1333 1333 // bloodOxygenClosure = nil
... ... @@ -1357,19 +1357,39 @@ class BluetoothManager: NSObject {
1357 1357 pressureClosure = closure as? PressureClosure
1358 1358 case is MettClosure:
1359 1359 mettClosure = closure as? MettClosure
1360   - case is GpsClosure:
  1360 +// case is GpsClosure:
  1361 +// gpsClosure = closure as? GpsClosure
  1362 +// case is IntensiveTimeClosure:
  1363 +// intensiveTimeClosure = closure as? IntensiveTimeClosure
  1364 +// case is BeidouCardClosure:
  1365 +// beidouCardClosure = closure as? BeidouCardClosure
  1366 +// case is NoDisturbClosure:
  1367 +// noDisturbClosure = closure as? NoDisturbClosure
  1368 +// case is BoAutoDetectClosure:
  1369 +// boAutoDetectClosure = closure as? BoAutoDetectClosure
  1370 +// case is WristSenseClosure:
  1371 +// wristSenseClosure = closure as? WristSenseClosure
  1372 +// case is FirmwareVersionClosure:
  1373 +// firmwareVersionClosure = closure as? FirmwareVersionClosure
  1374 + default:
  1375 + break
  1376 + }
  1377 +
  1378 + // 需要用synType来区分更为精准
  1379 + switch synType {
  1380 + case .gps:
1361 1381 gpsClosure = closure as? GpsClosure
1362   - case is IntensiveTimeClosure:
  1382 + case .intensiveTime:
1363 1383 intensiveTimeClosure = closure as? IntensiveTimeClosure
1364   - case is BeidouCardClosure:
  1384 + case .beidouCard:
1365 1385 beidouCardClosure = closure as? BeidouCardClosure
1366   - case is NoDisturbClosure:
  1386 + case .noDisturb:
1367 1387 noDisturbClosure = closure as? NoDisturbClosure
1368   - case is BoAutoDetectClosure:
  1388 + case .boAutoDetect:
1369 1389 boAutoDetectClosure = closure as? BoAutoDetectClosure
1370   - case is WristSenseClosure:
  1390 + case .wristSense:
1371 1391 wristSenseClosure = closure as? WristSenseClosure
1372   - case is FirmwareVersionClosure:
  1392 + case .firmwareVersion:
1373 1393 firmwareVersionClosure = closure as? FirmwareVersionClosure
1374 1394 default:
1375 1395 break
... ...