From 66c02729d80fad9d03c517afa7f18944027962d0 Mon Sep 17 00:00:00 2001 From: daifengyi Date: Sun, 21 May 2023 21:12:22 +0800 Subject: [PATCH] feat:other setting page UI --- HDFwear/Setting/Base.lproj/Setting.storyboard | 88 +++++++++++++++++++++++----------------------------------------------------------------- HDFwear/Setting/OtherSettingVC.swift | 37 ++++++++++++++++++++++--------------- HDFwear/Setting/VIew/SettingCell2.xib | 10 +++++----- HDFwear/Setting/zh-Hans.lproj/Setting.strings | 2 +- 4 files changed, 51 insertions(+), 86 deletions(-) diff --git a/HDFwear/Setting/Base.lproj/Setting.storyboard b/HDFwear/Setting/Base.lproj/Setting.storyboard index f949397..e325fb1 100644 --- a/HDFwear/Setting/Base.lproj/Setting.storyboard +++ b/HDFwear/Setting/Base.lproj/Setting.storyboard @@ -3953,7 +3953,7 @@ - + @@ -5045,64 +5045,24 @@ Cg - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + - + - - - - - + + + - - + - + - - - - diff --git a/HDFwear/Setting/OtherSettingVC.swift b/HDFwear/Setting/OtherSettingVC.swift index a401a41..a353fbc 100644 --- a/HDFwear/Setting/OtherSettingVC.swift +++ b/HDFwear/Setting/OtherSettingVC.swift @@ -12,11 +12,11 @@ import MBProgressHUD class OtherSettingVC: UIViewController { @IBOutlet weak var tableView: UITableView! - @IBOutlet weak var autoSwitch: UISwitch! +// @IBOutlet weak var autoSwitch: UISwitch! - @IBOutlet weak var autoView: UIView! - @IBOutlet weak var autoTitleLabel: UILabel! - @IBOutlet weak var autoDetailLabel: UILabel! +// @IBOutlet weak var autoView: UIView! +// @IBOutlet weak var autoTitleLabel: UILabel! +// @IBOutlet weak var autoDetailLabel: UILabel! var unitSettingClosure: ((_ distanceUnit: DistanceUnit) -> ())? @@ -38,18 +38,18 @@ class OtherSettingVC: UIViewController { override func viewDidLoad() { super.viewDidLoad() title = LocString("其他设置") - autoSwitch.isOn = UserInfo.autoMasure +// autoSwitch.isOn = UserInfo.autoMasure tableView.register(UINib.init(nibName: "SettingCell2", bundle: Bundle.main), forCellReuseIdentifier: "SettingCell2") tableView.tableFooterView = UIView(frame: CGRect.zero) - autoTitleLabel.text = LocString("整点自动测量") - autoDetailLabel.text = LocString("开启此功能，手表每小时将自动测量健康数据") +// autoTitleLabel.text = LocString("整点自动测量") +// autoDetailLabel.text = LocString("开启此功能，手表每小时将自动测量健康数据") if device.name.contains("P8GT") || device.name.contains("S7 NO.1") { - autoTitleLabel.text = "" - autoDetailLabel.text = "" - autoView.isHidden = true +// autoTitleLabel.text = "" +// autoDetailLabel.text = "" +// autoView.isHidden = true } } @IBAction func syncTime(_ sender: Any) { @@ -80,20 +80,21 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { - return 30 + return 44 } func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { let view = UIView() - view.backgroundColor = UIColor.rgbColorFromHex(0xF2F2F2) + view.backgroundColor = UIColor.rgbColorFromHex(0xFAFAFA) let label = UILabel() - label.font = RegularFont(11) + label.font = UIFont.systemFont(ofSize: 13, weight: .medium) + label.textColor = UIColor.rgbColorFromHex(0x999999) label.text = LocString(settingArray[section]) view.addSubview(label) label.snp.makeConstraints { make in make.left.equalToSuperview().offset(12) - make.top.equalToSuperview().offset(7.5) + make.top.equalToSuperview().offset(10) } return view } @@ -103,7 +104,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { } func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { - return 50 + return 55 } func numberOfSections(in tableView: UITableView) -> Int { @@ -123,12 +124,15 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { switch settingArray[indexPath.section] { case "时间单位设置": if user.timeFormat == 0 && text == "24小时" { + cell.setCorners(corners: [.topLeft, .topRight], radio: 10) cell.selectImageView.image = UIImage(named: "setting_selected") } else if user.timeFormat == 1 && text == "12小时" { + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10) cell.selectImageView.image = UIImage(named: "setting_selected") } case "公英制单位设置": if text == "公制" { + cell.setCorners(corners: [.topLeft, .topRight], radio: 10) if user.distanceUnit == 0 { cell.selectImageView.image = UIImage(named: "setting_selected") } @@ -139,6 +143,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { str.addAttributes([.font: RegularFont(11)], range: NSMakeRange(str1.count, str2.count)) cell.label.attributedText = str } else if text == "英制" { + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10) if user.distanceUnit == 1 { cell.selectImageView.image = UIImage(named: "setting_selected") } @@ -152,8 +157,10 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { case "温度单位": if user.temperatureUnit == 0 && text == "摄氏度(℃)" { + cell.setCorners(corners: [.topLeft, .topRight], radio: 10) cell.selectImageView.image = UIImage(named: "setting_selected") } else if user.temperatureUnit == 1 && text == "华氏度(℉）" { + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10) cell.selectImageView.image = UIImage(named: "setting_selected") } default: diff --git a/HDFwear/Setting/VIew/SettingCell2.xib b/HDFwear/Setting/VIew/SettingCell2.xib index 35326df..3702653 100644 --- a/HDFwear/Setting/VIew/SettingCell2.xib +++ b/HDFwear/Setting/VIew/SettingCell2.xib @@ -1,9 +1,9 @@ - + - + @@ -25,9 +25,9 @@ diff --git a/HDFwear/Setting/zh-Hans.lproj/Setting.strings b/HDFwear/Setting/zh-Hans.lproj/Setting.strings index b71a5be..08154c9 100644 --- a/HDFwear/Setting/zh-Hans.lproj/Setting.strings +++ b/HDFwear/Setting/zh-Hans.lproj/Setting.strings @@ -409,7 +409,7 @@ //################################################################################## /* Class = "UIButton"; normalTitle = "同步"; ObjectID = "CUJ-35-ve5"; */ -"CUJ-35-ve5.normalTitle" = "同步"; +"CUJ-35-ve5.normalTitle" = "点击同步"; /* Class = "UIButton"; normalTitle = "重试"; ObjectID = "g8A-kR-at7"; */ "g8A-kR-at7.normalTitle" = "重试"; -- libgit2 0.21.4