diff --git a/HDFwear/Mine/MineViewController.swift b/HDFwear/Mine/MineViewController.swift index 95a88e9..2775b61 100644 --- a/HDFwear/Mine/MineViewController.swift +++ b/HDFwear/Mine/MineViewController.swift @@ -249,7 +249,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } } } - let archiveAction7 = UIAlertAction(title: "newSetBloodOxygenAutoDetect", style: .default) { action in + let archiveAction7a = UIAlertAction(title: "newSetBloodOxygenAutoDetect enable", style: .default) { action in BluetoothManager.shared.newSetBloodOxygenAutoDetect(bool: true) { error in if error != nil { print("newSetBloodOxygenAutoDetect" + (error?.description ?? "")) @@ -258,6 +258,15 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } } } + let archiveAction7b = UIAlertAction(title: "newSetBloodOxygenAutoDetect disable", style: .default) { action in + BluetoothManager.shared.newSetBloodOxygenAutoDetect(bool: false) { error in + if error != nil { + print("newSetBloodOxygenAutoDetect" + (error?.description ?? "")) + }else { + print("newSetBloodOxygenAutoDetect success") + } + } + } let archiveAction8 = UIAlertAction(title: "newSetUserInfo", style: .default) { action in BluetoothManager.shared.newSetUserInfo(AdminHelper.shared.loadLocalAdminData().userInfo) { error in if error != nil { @@ -445,7 +454,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } } - let archiveAction29 = UIAlertAction(title: "newSetWristSense", style: .default) { action in + let archiveAction29a = UIAlertAction(title: "newSetWristSense enable", style: .default) { action in BluetoothManager.shared.newSetWristSense(bool: true) { error in if error != nil { print("newSetWristSense" + (error?.description ?? "")) @@ -455,6 +464,16 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } } + let archiveAction29b = UIAlertAction(title: "newSetWristSense disable", style: .default) { action in + BluetoothManager.shared.newSetWristSense(bool: false) { error in + if error != nil { + print("newSetWristSense" + (error?.description ?? "")) + }else { + print("newSetWristSense success") + } + } + } + let archiveAction88 = UIAlertAction(title: "ota update", style: .default) { action in BluetoothManager.shared.startOtaUpdate() } @@ -466,7 +485,8 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { alert.addAction(archiveAction4) alert.addAction(archiveAction5) alert.addAction(archiveAction6) - alert.addAction(archiveAction7) + alert.addAction(archiveAction7a) + alert.addAction(archiveAction7b) alert.addAction(archiveAction8) alert.addAction(archiveAction11) @@ -487,7 +507,8 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { alert.addAction(archiveAction28d) alert.addAction(archiveAction28b) alert.addAction(archiveAction28c) - alert.addAction(archiveAction29) + alert.addAction(archiveAction29a) + alert.addAction(archiveAction29b) alert.addAction(archiveAction88) alert.addAction(UIAlertAction(title: "取消", style: .destructive, handler: nil)) diff --git a/HDFwear/Tools/BluetoothManager+Function.swift b/HDFwear/Tools/BluetoothManager+Function.swift index 53c75b6..c2ff19a 100644 --- a/HDFwear/Tools/BluetoothManager+Function.swift +++ b/HDFwear/Tools/BluetoothManager+Function.swift @@ -323,7 +323,7 @@ extension BluetoothManager { func newStartSyncHealthData(closure: Any?, data: Data, synType: SyncType) { // if !isSync { // GCDTimer.shared.scheduledDispatchTimerNotNow(WithTimerName: "SyncInterval", timeInterval: 0.1, queue: .main, repeats: false) { - self.clearClosures(closure: closure) + self.clearClosures(closure: closure, synType: synType) // self.startSyncTimer() // self.isNextSync = false // self.isSync = true diff --git a/HDFwear/Tools/BluetoothManager.swift b/HDFwear/Tools/BluetoothManager.swift index d8b7cd3..18ddd57 100644 --- a/HDFwear/Tools/BluetoothManager.swift +++ b/HDFwear/Tools/BluetoothManager.swift @@ -1327,7 +1327,7 @@ class BluetoothManager: NSObject { // mettClosure?([], -1001) // } - func clearClosures(closure: Any?) { + func clearClosures(closure: Any?, synType: SyncType) { // heartRateClosure = nil // bloodPressureClosure = nil // bloodOxygenClosure = nil @@ -1357,19 +1357,39 @@ class BluetoothManager: NSObject { pressureClosure = closure as? PressureClosure case is MettClosure: mettClosure = closure as? MettClosure - case is GpsClosure: +// case is GpsClosure: +// gpsClosure = closure as? GpsClosure +// case is IntensiveTimeClosure: +// intensiveTimeClosure = closure as? IntensiveTimeClosure +// case is BeidouCardClosure: +// beidouCardClosure = closure as? BeidouCardClosure +// case is NoDisturbClosure: +// noDisturbClosure = closure as? NoDisturbClosure +// case is BoAutoDetectClosure: +// boAutoDetectClosure = closure as? BoAutoDetectClosure +// case is WristSenseClosure: +// wristSenseClosure = closure as? WristSenseClosure +// case is FirmwareVersionClosure: +// firmwareVersionClosure = closure as? FirmwareVersionClosure + default: + break + } + + // 需要用synType来区分更为精准 + switch synType { + case .gps: gpsClosure = closure as? GpsClosure - case is IntensiveTimeClosure: + case .intensiveTime: intensiveTimeClosure = closure as? IntensiveTimeClosure - case is BeidouCardClosure: + case .beidouCard: beidouCardClosure = closure as? BeidouCardClosure - case is NoDisturbClosure: + case .noDisturb: noDisturbClosure = closure as? NoDisturbClosure - case is BoAutoDetectClosure: + case .boAutoDetect: boAutoDetectClosure = closure as? BoAutoDetectClosure - case is WristSenseClosure: + case .wristSense: wristSenseClosure = closure as? WristSenseClosure - case is FirmwareVersionClosure: + case .firmwareVersion: firmwareVersionClosure = closure as? FirmwareVersionClosure default: break