diff --git a/HDFwear/Home/HomeViewController.swift b/HDFwear/Home/HomeViewController.swift index 968b42f..7b85513 100644 --- a/HDFwear/Home/HomeViewController.swift +++ b/HDFwear/Home/HomeViewController.swift @@ -718,7 +718,7 @@ extension HomeViewController: XMLParserDelegate { } print("\(queryArray)---同步步数---\(day)") if queryArray.contains("Step"), let index = queryArray.firstIndex(of: "Step") { - BluetoothManager.shared.getStepHistoryData(day: day) {[weak self] stepArray, error in + BluetoothManager.shared.getStepHistoryData() {[weak self] stepArray, error in self?.queryArray.remove(at: index) if error == nil { @@ -736,7 +736,7 @@ extension HomeViewController: XMLParserDelegate { func syncBloodOxygen(_ day: SyncDay) { print("\(queryArray)---同步血氧---\(day)") if queryArray.contains("BloodOxygen"), let index = queryArray.firstIndex(of: "BloodOxygen") { - BluetoothManager.shared.getBloodOxygenHistoryData(day: day) {[weak self] boArray, error in + BluetoothManager.shared.getBloodOxygenHistoryData() {[weak self] boArray, error in self?.queryArray.remove(at: index) if error == nil { BloodOxygenModel.addArray(boArray) @@ -751,7 +751,7 @@ extension HomeViewController: XMLParserDelegate { func syncBloodPressure(_ day: SyncDay) { print("\(queryArray)---同步血压---\(day)") if queryArray.contains("BloodPressure"), let index = queryArray.firstIndex(of: "BloodPressure") { - BluetoothManager.shared.getBloodPressureHistoryData(day: day) {[weak self] bpArray, error in + BluetoothManager.shared.getBloodPressureHistoryData() {[weak self] bpArray, error in self?.queryArray.remove(at: index) if error == nil { BloodPressureModel.addArray(bpArray) @@ -766,7 +766,7 @@ extension HomeViewController: XMLParserDelegate { func syncHeartRate(_ day: SyncDay) { print("\(queryArray)---同步心率---\(day)") if queryArray.contains("HeartRate"), let index = queryArray.firstIndex(of: "HeartRate") { - BluetoothManager.shared.getHeartRateHistoryData(day: day) {[weak self] hrArray, error in + BluetoothManager.shared.getHeartRateHistoryData() {[weak self] hrArray, error in self?.queryArray.remove(at: index) if error == nil { HeartRateModel.addArray(hrArray) @@ -782,7 +782,7 @@ extension HomeViewController: XMLParserDelegate { func syncSleep(_ day: SyncDay) { print("\(queryArray)---同步睡眠---\(day)") if queryArray.contains("Sleep"), let index = queryArray.firstIndex(of: "Sleep") { - BluetoothManager.shared.getSleepHistoryData(day: day) {[weak self] sleepArray, error in + BluetoothManager.shared.getSleepHistoryData() {[weak self] sleepArray, error in self?.queryArray.remove(at: index) if error == nil { SleepModel.addArray(sleepArray) @@ -797,7 +797,7 @@ extension HomeViewController: XMLParserDelegate { func syncPressure(_ day: SyncDay) { print("\(queryArray)---同步压力---\(day)") if queryArray.contains("Pressure"), let index = queryArray.firstIndex(of: "Pressure") { - BluetoothManager.shared.getPressureHistoryData(day: day) {[weak self] pressureArray, error in + BluetoothManager.shared.getPressureHistoryData() {[weak self] pressureArray, error in self?.queryArray.remove(at: index) if error == nil { PressureModel.addArray(pressureArray) @@ -812,13 +812,13 @@ extension HomeViewController: XMLParserDelegate { func syncTrain(_ day: SyncDay) { print("\(queryArray)---同步训练---\(day)") if queryArray.contains("Train"), let index = queryArray.firstIndex(of: "Train") { - BluetoothManager.shared.getTrainHistoryData(day: day) {[weak self] train, error in + BluetoothManager.shared.getTrainHistoryData() {[weak self] train, error in if error == nil || error == 2000 || error == -1001 { self?.queryArray.remove(at: index) if day == .today { self?.syncStep(.yesterday) } else { - self?.syncMett() + self?.getSettingData() } } @@ -827,7 +827,7 @@ extension HomeViewController: XMLParserDelegate { if day == .today { syncStep(.yesterday) } else { - syncMett() + getSettingData() } } } @@ -835,7 +835,7 @@ extension HomeViewController: XMLParserDelegate { func syncMett() { print("\(queryArray)---同步梅脱---") if queryArray.contains("Mett"), let index = queryArray.firstIndex(of: "Mett") { - BluetoothManager.shared.getMettHistoryData(day: .today) {[weak self] mettArray, error in + BluetoothManager.shared.getMettHistoryData() {[weak self] mettArray, error in self?.queryArray.remove(at: index) if error == nil { MettModel.addArray(mettArray) diff --git a/HDFwear/Home/TrainViewController.swift b/HDFwear/Home/TrainViewController.swift index 1389d1e..2a43245 100644 --- a/HDFwear/Home/TrainViewController.swift +++ b/HDFwear/Home/TrainViewController.swift @@ -52,7 +52,7 @@ class TrainViewController: UIViewController, DateSegmentViewDelegate, RangeSlide } override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - BluetoothManager.shared.getTrainHistoryData(day: .today) {[weak self] train, error in + BluetoothManager.shared.getTrainHistoryData() {[weak self] train, error in if error == 2000 || error == nil { self?.updateTodayData() // self?.didSelectedDate(date: DateInRegion((self?.selectedDate)!, region: .current), dateType: .day) diff --git a/HDFwear/Mine/MineViewController.swift b/HDFwear/Mine/MineViewController.swift index d50770b..16b93a3 100644 --- a/HDFwear/Mine/MineViewController.swift +++ b/HDFwear/Mine/MineViewController.swift @@ -262,7 +262,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } } let archiveAction9 = UIAlertAction(title: "getSleepHistoryData", style: .default) { action in - BluetoothManager.shared.getSleepHistoryData(day: .today) { sleepArray, error in + BluetoothManager.shared.getSleepHistoryData() { sleepArray, error in if error != nil { print("getSleepHistoryData" + (error?.description ?? "")) }else { @@ -272,7 +272,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } } let archiveAction10 = UIAlertAction(title: "getBloodOxygenHistoryData", style: .default) { action in - BluetoothManager.shared.getBloodOxygenHistoryData(day: .today) { boArray, error in + BluetoothManager.shared.getBloodOxygenHistoryData() { boArray, error in if error != nil { print("getBloodOxygenHistoryData" + (error?.description ?? "")) }else { @@ -312,7 +312,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } let archiveAction14 = UIAlertAction(title: "getHeartRateHistoryData", style: .default) { action in - BluetoothManager.shared.getHeartRateHistoryData(day: .today) { boArray, error in + BluetoothManager.shared.getHeartRateHistoryData() { boArray, error in if error != nil { print("getHeartRateHistoryData" + (error?.description ?? "")) }else { @@ -322,7 +322,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } let archiveAction15 = UIAlertAction(title: "getStepHistoryData", style: .default) { action in - BluetoothManager.shared.getStepHistoryData(day: .today) { boArray, error in + BluetoothManager.shared.getStepHistoryData() { boArray, error in if error != nil { print("getStepHistoryData" + (error?.description ?? "")) }else { @@ -332,7 +332,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } let archiveAction16 = UIAlertAction(title: "getTrainHistoryData", style: .default) { action in - BluetoothManager.shared.getTrainHistoryData(day: .today) { boArray, error in + BluetoothManager.shared.getTrainHistoryData() { boArray, error in if error != nil { print("getTrainHistoryData" + (error?.description ?? "")) }else { @@ -342,7 +342,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { } let archiveAction17 = UIAlertAction(title: "getPressureHistoryData", style: .default) { action in - BluetoothManager.shared.getPressureHistoryData(day: .today) { boArray, error in + BluetoothManager.shared.getPressureHistoryData() { boArray, error in if error != nil { print("getPressureHistoryData" + (error?.description ?? "")) }else { diff --git a/HDFwear/ReadMe b/HDFwear/ReadMe.txt index be14758..df29097 100644 --- a/HDFwear/ReadMe +++ b/HDFwear/ReadMe.txt @@ -86,27 +86,27 @@ BluetoothManager+Function 发送: [237, 126, 0, 1, 0, 39, 0, 1, 0, 7, 0, 1, 33, 22, 0, 22, 0, 159, 5] 19. 拉取睡眠数据 - func getSleepHistoryData(day: SyncDay = .today, closure: SleepClosure? = nil) + func getSleepHistoryData(closure: SleepClosure? = nil) 发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 1, 6, 240, 42] 20. 拉取血氧数据 - func getBloodOxygenHistoryData(day: SyncDay = .today, closure: BloodOxygenClosure? = nil) + func getBloodOxygenHistoryData(closure: BloodOxygenClosure? = nil) 发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 1, 2, 176, 174] 21. 拉取心跳数据 - func getHeartRateHistoryData(day: SyncDay = .today, closure: HeartRateClosure? = nil) + func getHeartRateHistoryData(closure: HeartRateClosure? = nil) 发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 1, 1, 128, 205] 22. 拉取计步数据 - func getStepHistoryData(day: SyncDay = .today, closure: StepClosure? = nil) + func getStepHistoryData(closure: StepClosure? = nil) 发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 1, 3, 160, 143] 23. 拉取训练数据 - func getTrainHistoryData(day: SyncDay = .today, closure: TrainClosure? = nil) + func getTrainHistoryData(closure: TrainClosure? = nil) 发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 1, 7, 224, 11] 24. 拉取压力数据 - func getPressureHistoryData(day: SyncDay = .today, closure: PressureClosure? = nil) + func getPressureHistoryData(closure: PressureClosure? = nil) 发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 1, 5, 192, 73] 接受数据类 diff --git a/HDFwear/Tools/BluetoothManager+Function.swift b/HDFwear/Tools/BluetoothManager+Function.swift index 7ad60b6..f098783 100644 --- a/HDFwear/Tools/BluetoothManager+Function.swift +++ b/HDFwear/Tools/BluetoothManager+Function.swift @@ -149,47 +149,47 @@ extension BluetoothManager { //MARK: - 同步健康数据 // 拉取睡眠数据 - func getSleepHistoryData(day: SyncDay = .today, closure: SleepClosure? = nil) { + func getSleepHistoryData( closure: SleepClosure? = nil) { let data = BleMessage.shared.getSyncCmd(.sleep) newStartSyncHealthData(closure: closure, data: data, synType: .sleep) } - func getBloodPressureHistoryData(day: SyncDay = .today, closure: BloodPressureClosure? = nil) { + func getBloodPressureHistoryData( closure: BloodPressureClosure? = nil) { // let data = BleMessage.shared.getSyncCmd(.bloodOxygen) // newStartSyncHealthData(closure: closure, data: data, synType: .pressure) } // 拉取血氧数据 - func getBloodOxygenHistoryData(day: SyncDay = .today, closure: BloodOxygenClosure? = nil) { + func getBloodOxygenHistoryData( closure: BloodOxygenClosure? = nil) { let data = BleMessage.shared.getSyncCmd(.bloodOxygen) newStartSyncHealthData(closure: closure, data: data, synType: .bloodOxygen) } // 拉取心跳数据 - func getHeartRateHistoryData(day: SyncDay = .today, closure: HeartRateClosure? = nil) { + func getHeartRateHistoryData( closure: HeartRateClosure? = nil) { let data = BleMessage.shared.getSyncCmd(.heartRate) newStartSyncHealthData(closure: closure, data: data, synType: .heartRate) } // 拉取计步数据 - func getStepHistoryData(day: SyncDay = .today, closure: StepClosure? = nil) { + func getStepHistoryData( closure: StepClosure? = nil) { let data = BleMessage.shared.getSyncCmd(.step) newStartSyncHealthData(closure: closure, data: data, synType: .step) } // 拉取训练数据 - func getTrainHistoryData(day: SyncDay = .today, closure: TrainClosure? = nil) { + func getTrainHistoryData( closure: TrainClosure? = nil) { let data = BleMessage.shared.getSyncCmd(.train) newStartSyncHealthData(closure: closure, data: data, synType: .train) } // 拉取压力数据 - func getPressureHistoryData(day: SyncDay = .today, closure: PressureClosure? = nil) { + func getPressureHistoryData( closure: PressureClosure? = nil) { let data = BleMessage.shared.getSyncCmd(.pressure) newStartSyncHealthData(closure: closure, data: data, synType: .pressure) } - func getMettHistoryData(day: SyncDay = .today, closure: MettClosure? = nil) { + func getMettHistoryData( closure: MettClosure? = nil) { // startSyncHealthData(closure: closure, data: BleMessage.shared.getSyncCmd(.mett, day: day), cmd: .mett) }