From 53fae286b37d6c64adcc9bbbd18e51ca642538d4 Mon Sep 17 00:00:00 2001 From: daifengyi Date: Fri, 16 Jun 2023 17:26:56 +0800 Subject: [PATCH] feat:remove platform type 816 818 --- HDFwear/Home/Model/HealthModel.swift | 2 +- HDFwear/Home/Model/WeatherModel.swift | 53 ++++++++++++++++++++++++++--------------------------- HDFwear/Mine/HealthDataVC.swift | 3 --- HDFwear/Mine/Model/UserInfo.swift | 11 +---------- HDFwear/Setting/DailSyncSubVC.swift | 4 ---- HDFwear/Setting/DailSyncViewController.swift | 66 +++++++++++++++++++++++++++++++----------------------------------- HDFwear/Setting/DialSyncLocalVC.swift | 30 ------------------------------ HDFwear/Setting/OtherSettingVC.swift | 2 -- HDFwear/Setting/RemindViewController.swift | 5 ----- HDFwear/Setting/SettingViewController.swift | 39 ++------------------------------------- HDFwear/Tools/BluetoothManager.swift | 38 ++++++++------------------------------ 11 files changed, 69 insertions(+), 184 deletions(-) diff --git a/HDFwear/Home/Model/HealthModel.swift b/HDFwear/Home/Model/HealthModel.swift index 286b101..6a65ab1 100644 --- a/HDFwear/Home/Model/HealthModel.swift +++ b/HDFwear/Home/Model/HealthModel.swift @@ -1211,7 +1211,7 @@ class SleepModel: Object { } else { endDate = DateInRegion(year: Int(bytes[0])+2000, month: Int(bytes[1]), day: Int(bytes[2]), hour: Int(sleepBytes[(i+1)*3+1]), minute: Int(sleepBytes[(i+1)*3+2])).date } - if platform == ._818 || platform == ._828 { + if platform == ._828 { if rawInt == 1 { rawInt = 2 } else if rawInt == 2 { diff --git a/HDFwear/Home/Model/WeatherModel.swift b/HDFwear/Home/Model/WeatherModel.swift index 3d8b6cc..7fddefa 100644 --- a/HDFwear/Home/Model/WeatherModel.swift +++ b/HDFwear/Home/Model/WeatherModel.swift @@ -148,35 +148,34 @@ class WeatherModel: NSObject, HandyJSON { if max < 0 { max = 256 + max } - let weatherBytes: [UInt8] = [UInt8(min), UInt8(max), UInt8(weatherType.rawValue)] return weatherBytes - case ._818: - var min = self.lowest - if min < 0 { - min = 128 - min - } - var max = self.highest - if max < 0 { - max = 128 - max - } - - let weatherBytes: [UInt8] = [UInt8(min), UInt8(max), UInt8(weatherType.rawValue)] - return weatherBytes - case ._816: - let cityData: Data = self.city.data(using: .utf8) ?? Data() - var min = self.lowest - if min < 0 { - min = 128 - min - } - var max = self.highest - if max < 0 { - max = 128 - max - } - var weatherBytes: [UInt8] = [UInt8(min), UInt8(max), UInt8(weatherType.rawValue), UInt8(cityData.count)] - weatherBytes.append(contentsOf: [UInt8](cityData)) - print(weatherBytes) - return weatherBytes +// case ._818: +// var min = self.lowest +// if min < 0 { +// min = 128 - min +// } +// var max = self.highest +// if max < 0 { +// max = 128 - max +// } +// +// let weatherBytes: [UInt8] = [UInt8(min), UInt8(max), UInt8(weatherType.rawValue)] +// return weatherBytes +// case ._816: +// let cityData: Data = self.city.data(using: .utf8) ?? Data() +// var min = self.lowest +// if min < 0 { +// min = 128 - min +// } +// var max = self.highest +// if max < 0 { +// max = 128 - max +// } +// var weatherBytes: [UInt8] = [UInt8(min), UInt8(max), UInt8(weatherType.rawValue), UInt8(cityData.count)] +// weatherBytes.append(contentsOf: [UInt8](cityData)) +// print(weatherBytes) +// return weatherBytes default: return [] } diff --git a/HDFwear/Mine/HealthDataVC.swift b/HDFwear/Mine/HealthDataVC.swift index d596d9d..fbb8fda 100644 --- a/HDFwear/Mine/HealthDataVC.swift +++ b/HDFwear/Mine/HealthDataVC.swift @@ -34,9 +34,6 @@ class HealthDataVC: UIViewController { // shareButton.setImage(UIImage(named: "share_btn"), for: .normal) // shareButton.addTarget(self, action: #selector(share), for: .touchUpInside) // navigationItem.rightBarButtonItem = UIBarButtonItem(customView: shareButton) - if device.platform == ._818 { - dataArray[1] = ["心率", "血压", "睡眠", "体重"] - } testDate() let stepArray = StepModel.getStepsByYear(Date()) let user = UserInfo diff --git a/HDFwear/Mine/Model/UserInfo.swift b/HDFwear/Mine/Model/UserInfo.swift index 0346585..5f9ea6c 100644 --- a/HDFwear/Mine/Model/UserInfo.swift +++ b/HDFwear/Mine/Model/UserInfo.swift @@ -17,8 +17,6 @@ class AdminModel: NSObject, HandyJSON { enum Platform: String, HandyJSONEnum { - case _816 = "816" - case _818 = "818" case _828 = "828" case other = "other" } @@ -281,7 +279,7 @@ class DeviceModel: NSObject, HandyJSON { if let i = array.firstIndex(of: "WomenHealth") { array.remove(at: i) } - if platform == ._818 || platform == ._828 { + if platform == ._828 { if let i = array.firstIndex(of: "BloodPressure") { array.remove(at: i) } @@ -303,13 +301,6 @@ class DeviceModel: NSObject, HandyJSON { self.platform = platform self.mac = mac switch platform { - case ._816: - self.allFunctions = ["BloodPressure", "BloodOxygen", "HeartRate", "Sleep", "Train", "MotionRecord"] - self.homePage = ["BloodPressure", "BloodOxygen", "HeartRate", "Sleep", "Train", "MotionRecord"] -// self.queryArray = ["BloodPressure", "BloodOxygen", "HeartRate", "Sleep", "Train", "Step", "Setting"] - case ._818: - self.allFunctions = ["BloodPressure", "HeartRate", "Sleep", "Train", "MotionRecord", "WomenHealth"] - self.homePage = ["BloodPressure", "HeartRate", "Sleep", "Train", "MotionRecord", "WomenHealth"] case ._828: self.allFunctions = ["BloodPressure", "BloodOxygen", "HeartRate", "Sleep", "Train", "MotionRecord", "WomenHealth"] self.homePage = ["BloodPressure", "BloodOxygen", "HeartRate", "Sleep", "Train", "MotionRecord", "WomenHealth"] diff --git a/HDFwear/Setting/DailSyncSubVC.swift b/HDFwear/Setting/DailSyncSubVC.swift index 6ed705a..9029c99 100644 --- a/HDFwear/Setting/DailSyncSubVC.swift +++ b/HDFwear/Setting/DailSyncSubVC.swift @@ -162,10 +162,6 @@ extension DailSyncSubVC: UICollectionViewDelegate, UICollectionViewDataSource { let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath) as! DailCell switch CurDevice.platform { - case ._816: - cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/\(indexPath.row)/preview_0\(indexPath.row)@2x") - case ._818: - cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/\(indexPath.row)/preview@2x") case ._828: cell.dailImageView.kf.setImage(with: URL(string: "http://www.hodafone.com.cn/hodafone/dial/rtl/\(dialWidth)x\(dialHeight)/\(styleIndex)/\(indexPath.row)/preview.png"), placeholder: UIImage(named: "dail_default_3"), options: [.transition(.fade(0.3))]) // cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/\(indexPath.row)/preview") diff --git a/HDFwear/Setting/DailSyncViewController.swift b/HDFwear/Setting/DailSyncViewController.swift index 1c45292..05f8ce3 100644 --- a/HDFwear/Setting/DailSyncViewController.swift +++ b/HDFwear/Setting/DailSyncViewController.swift @@ -239,37 +239,37 @@ class DailSyncViewController: UIViewController, XMLParserDelegate { if cell.progressView.label.text == LocString("已安装") { return } updateUserInteraction(true) cell.updateProgressView(0) - switch platform { - case ._816: - BluetoothManager.shared.syncDialWith(path: "\(Bundle.main.resourcePath!)/dial/Dialdata280/\(indexPath.row)") { progress in - cell.updateProgressView(progress) - } completion: {[weak self] error in - self?.updateUserInteraction(false) - if error == nil { - cell.syncComplete() - } else { - cell.initProgressView() - self?.showAlert(title: LocString("提示"), message: LocString("安装失败，请重试"), cancelText: nil) - } - } - - case ._818: - BluetoothManager.shared.syncFileWith(path: "\(Bundle.main.resourcePath!)/dial/DialDataRtk/\(indexPath.row)/dial.bin") { progress in - cell.updateProgressView(progress) - } completion: {[weak self] error in - self?.updateUserInteraction(false) - if error == nil { - self?.syncComplete(index: indexPath.row) - cell.syncComplete() - } else { - cell.initProgressView() - self?.showAlert(title: LocString("提示"), message: LocString("安装失败，请重试"), cancelText: nil) - } - } - - default: - break - } +// switch platform { +// case ._816: +// BluetoothManager.shared.syncDialWith(path: "\(Bundle.main.resourcePath!)/dial/Dialdata280/\(indexPath.row)") { progress in +// cell.updateProgressView(progress) +// } completion: {[weak self] error in +// self?.updateUserInteraction(false) +// if error == nil { +// cell.syncComplete() +// } else { +// cell.initProgressView() +// self?.showAlert(title: LocString("提示"), message: LocString("安装失败，请重试"), cancelText: nil) +// } +// } +// +// case ._818: +// BluetoothManager.shared.syncFileWith(path: "\(Bundle.main.resourcePath!)/dial/DialDataRtk/\(indexPath.row)/dial.bin") { progress in +// cell.updateProgressView(progress) +// } completion: {[weak self] error in +// self?.updateUserInteraction(false) +// if error == nil { +// self?.syncComplete(index: indexPath.row) +// cell.syncComplete() +// } else { +// cell.initProgressView() +// self?.showAlert(title: LocString("提示"), message: LocString("安装失败，请重试"), cancelText: nil) +// } +// } +// +// default: +// break +// } } } @@ -371,10 +371,6 @@ extension DailSyncViewController: UICollectionViewDelegate, UICollectionViewData let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath) as! DailCell switch platform { - case ._816: - cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/\(indexPath.row)/preview_0\(indexPath.row)@2x") - case ._818: - cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/\(indexPath.row)/preview@2x") case ._828: cell.dailImageView.kf.setImage(with: URL(string: "http://www.hodafone.com.cn/hodafone/dial/rtl/\(dialWidth)x\(dialHeight)/\(indexPath.section)/\(indexPath.row)/preview.png"), placeholder: UIImage(named: "dail_default_3"), options: [.transition(.fade(0.3))]) // cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/\(indexPath.row)/preview") diff --git a/HDFwear/Setting/DialSyncLocalVC.swift b/HDFwear/Setting/DialSyncLocalVC.swift index 9055ae9..b8a1468 100644 --- a/HDFwear/Setting/DialSyncLocalVC.swift +++ b/HDFwear/Setting/DialSyncLocalVC.swift @@ -48,32 +48,6 @@ class DialSyncLocalVC: UIViewController { updateUserInteraction(true) cell.updateProgressView(0) switch CurDevice.platform { - case ._816: - BluetoothManager.shared.syncDialWith(path: "\(Bundle.main.resourcePath!)/dial/Dialdata280/\(indexPath.row)") { progress in - cell.updateProgressView(progress) - } completion: {[weak self] error in - self?.updateUserInteraction(false) - if error == nil { - cell.syncComplete() - } else { - cell.initProgressView() - self?.showAlert(title: LocString("提示"), message: LocString("安装失败，请重试"), cancelText: nil) - } - } - - case ._818: - BluetoothManager.shared.syncFileWith(path: "\(Bundle.main.resourcePath!)/dial/DialDataRtk/\(indexPath.row)/dial.bin") { progress in - cell.updateProgressView(progress) - } completion: {[weak self] error in - self?.updateUserInteraction(false) - if error == nil { - self?.syncComplete(index: indexPath.row) - cell.syncComplete() - } else { - cell.initProgressView() - self?.showAlert(title: LocString("提示"), message: LocString("安装失败，请重试"), cancelText: nil) - } - } case ._828: BluetoothManager.shared.syncFileWith(path: "\(Bundle.main.resourcePath!)/dial/DialDataHQ7/\(indexPath.row)/dial.bin") { progress in cell.updateProgressView(progress) @@ -143,10 +117,6 @@ extension DialSyncLocalVC: UICollectionViewDelegate, UICollectionViewDataSource switch CurDevice.platform { - case ._816: - cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/\(indexPath.row)/preview_0\(indexPath.row)@2x") - case ._818: - cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/\(indexPath.row)/preview@2x") case ._828: cell.dailImageView.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/\(indexPath.row)/preview") default: diff --git a/HDFwear/Setting/OtherSettingVC.swift b/HDFwear/Setting/OtherSettingVC.swift index a353fbc..9538687 100644 --- a/HDFwear/Setting/OtherSettingVC.swift +++ b/HDFwear/Setting/OtherSettingVC.swift @@ -24,8 +24,6 @@ class OtherSettingVC: UIViewController { let settingDic: [String: [String]] = ["时间单位设置": ["24小时", "12小时"], "公英制单位设置": ["公制", "英制"], "温度单位": ["摄氏度(℃)", "华氏度(℉）"]] let settingArray: [String] = { switch CurDevice.platform { - case ._816: - return ["公英制单位设置", "温度单位"] case ._828: return ["时间单位设置", "公英制单位设置", "温度单位"] default: diff --git a/HDFwear/Setting/RemindViewController.swift b/HDFwear/Setting/RemindViewController.swift index deba938..dbc44e1 100644 --- a/HDFwear/Setting/RemindViewController.swift +++ b/HDFwear/Setting/RemindViewController.swift @@ -29,11 +29,6 @@ class RemindViewController: UIViewController { tableView.register(UINib.init(nibName: "SettingCell3", bundle: Bundle.main), forCellReuseIdentifier: "SettingCell3") tableView.tableFooterView = UIView(frame: CGRect.zero) - if device.platform == ._818 { - if let i = remindArray.firstIndex(of: "闹钟提醒") { - remindArray.remove(at: i) - } - } // Do any additional setup after loading the view. } diff --git a/HDFwear/Setting/SettingViewController.swift b/HDFwear/Setting/SettingViewController.swift index 7b8113b..5c8ecaf 100644 --- a/HDFwear/Setting/SettingViewController.swift +++ b/HDFwear/Setting/SettingViewController.swift @@ -76,11 +76,7 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate { self.navigationController?.setNavigationBarHidden(false, animated: true) let admin = AdminHelper.shared.loadLocalAdminData() if DeviceIsConnected { - if admin.device.platform == ._816 { - BluetoothManager.shared.queryBattery() - } else { - updateBattery(Battery) - } + updateBattery(Battery) } // updateTotalDataView(DistanceUnit(rawValue: UInt8(admin.userInfo.distanceUnit))!) let navController = navigationController as? ZCNavigationController @@ -177,34 +173,7 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate { return } - if curDevice.platform == ._816 { - settingArray = setting_816 - dialNum = 9 -// dailImageView1.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/0/preview_00@2x") -// dailImageView2.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/1/preview_01@2x") -// dailImageView3.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/2/preview_02@2x") - } else if curDevice.platform == ._818 { - settingArray = setting_818 - dialNum = 18 -// dailImageView1.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/0/preview@2x") -// dailImageView2.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/1/preview@2x") -// dailImageView3.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/2/preview@2x") -// let aimage = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/test2.bmp")! -// let imagea = removeAlpha(image: aimage)! -// dailImageView3.image = imagea -// -// let options: NSDictionary = [:] -// let convertToBmp = imagea.toData(options: options, type: .bmp) -// guard let bmpData = convertToBmp else { -// print("😡 ERROR: could not convert image to a bitmap bmpData var.") -// return -// } -// let b = [UInt8](aimage.rbg565Data()!) -// for i in 0..<100 { -// print("\(i)--\(String(format: "%02X", b[i]))") -// } -// print(b.count) - } else if curDevice.platform == ._828 { + if curDevice.platform == ._828 { settingArray = setting_828 dialWidth = 240 dialHeight = 280 @@ -575,10 +544,6 @@ extension SettingViewController: BluetoothManagerDelegate { func didConnect(_ peripheral: CBPeripheral) { print("已经连接") switch CurDevice.platform { - case ._816: - settingArray = setting_816 - case ._818, ._828: - settingArray = setting_818 default: settingArray = setting_all } diff --git a/HDFwear/Tools/BluetoothManager.swift b/HDFwear/Tools/BluetoothManager.swift index 0f39707..e472f0a 100644 --- a/HDFwear/Tools/BluetoothManager.swift +++ b/HDFwear/Tools/BluetoothManager.swift @@ -164,13 +164,8 @@ class BluetoothManager: NSObject { private func registerClientProfile() { switch platform { - case ._818, ._828: + case ._828: manger?.registerClientProfile(BLEConfig.ServerUUID, clientProfileDelegate: self) - case ._816: - manger?.registerClientProfile(BLEConfig.MTKServerUUID, clientProfileDelegate: self) - manger?.registerClientProfile(BLEConfig.MTKBasServerUUID, clientProfileDelegate: self) - manger?.registerClientProfile(BLEConfig.MTKDialServerUUID, clientProfileDelegate: self) - FmpGattClient.getInstance() default: break } @@ -221,13 +216,8 @@ class BluetoothManager: NSObject { func connect(peripheral: CBPeripheral) { // setupManger(peripheral) let name = peripheral.name - if (name?.range(of: "You 1_LE") != nil || name?.range(of: "Pro_LE") != nil) { - platform = ._816 - } else if (name?.range(of: "MTB025B") != nil || name?.range(of: "MTB033B") != nil) { - platform = ._818 - } else if name?.range(of: "hq7") != nil || name?.range(of: "D09") != nil || name?.range(of: "P8GT") != nil || name?.range(of: "hq8") != nil || name?.range(of: "Watch 8") != nil || name?.range(of: "D07") != nil || name?.range(of: "S7 NO.1") != nil || name?.range(of: "G7 Pro Max Gameboy") != nil { - platform = ._828 - } + // 这里是根据名字来判断其平台类型 + platform = ._828 registerClientProfile() manger?.connectPeripheral(peripheral) } @@ -429,10 +419,7 @@ class BluetoothManager: NSObject { func findDevice(_ status: Bool) { switch platform { - case ._816: - let fmp = FmpGattClient.getInstance() as! FmpGattClient - fmp.findTarget(status ? 2 : 0) - case ._818, ._828: + case ._828: if status { let data = BleMessage.shared.getFindCmd(status) sendData(data) @@ -617,7 +604,7 @@ class BluetoothManager: NSObject { func getSleepHistoryData(day: SyncDay = .today, closure: SleepClosure? = nil) { var sleepDay: SyncDay = day let curPlatform = CurDevice.platform - if curPlatform == ._818 || curPlatform == ._828 { + if curPlatform == ._828 { if day == .today { sleepDay = .yesterday } else if day == .yesterday { @@ -1248,10 +1235,7 @@ class BluetoothManager: NSObject { var serverUUID: String = "" var writeUUID: String = "" switch platform { - case ._816: - serverUUID = BLEConfig.MTKServerUUID - writeUUID = BLEConfig.MTKWriteUUID - case ._818, ._828: + case ._828: serverUUID = BLEConfig.ServerUUID writeUUID = BLEConfig.WriteUUID default: @@ -1266,7 +1250,7 @@ class BluetoothManager: NSObject { } for char in service.characteristics! { if char.uuid.uuidString == writeUUID { - if platform == ._818 || platform == ._828 { + if platform == ._828 { if data.count <= 20 { print("发送: \([UInt8](data))") peripheral?.writeValue(data, for: char, type: .withResponse) @@ -1497,16 +1481,10 @@ extension BluetoothManager: ClientProfileDelegate { } } - if platform == ._818 { - print("818连接") - OTAProfile = RTKOTAProfile(delegate: self) - startSync818(delayTime) - } else if platform == ._828 { + if platform == ._828 { print("828连接") OTAProfile = RTKOTAProfile(delegate: self) startSync828(delayTime) - } else if platform == ._816 { - startSync816(delayTime) } DeviceIsConnected = true -- libgit2 0.21.4