diff --git a/HDFwear/Home/Base.lproj/Home.storyboard b/HDFwear/Home/Base.lproj/Home.storyboard
index 7faf93d..95d8691 100644
--- a/HDFwear/Home/Base.lproj/Home.storyboard
+++ b/HDFwear/Home/Base.lproj/Home.storyboard
@@ -294,20 +294,8 @@
-
-
-
@@ -787,9 +729,8 @@
-
-
+
@@ -850,82 +791,78 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
-
+
+
-
+
-
-
+
+
@@ -999,7 +936,7 @@
-
@@ -1029,12 +954,10 @@
-
-
-
+
@@ -1098,113 +1021,105 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
+
+
@@ -1223,13 +1138,13 @@
-
-
+
+
-
+
@@ -1295,7 +1210,7 @@
-
-
-
-
+
@@ -1394,118 +1295,131 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
@@ -1523,13 +1437,14 @@
-
-
+
+
-
+
+
@@ -2894,7 +2809,7 @@
-
@@ -2930,11 +2833,9 @@
-
-
-
+
@@ -2985,209 +2886,82 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
-
+
+
@@ -3205,15 +2979,12 @@
-
-
-
+
-
-
+
@@ -3261,7 +3032,7 @@
-
+
@@ -3291,12 +3051,9 @@
-
-
-
@@ -4015,55 +3772,60 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
+
@@ -4071,153 +3833,86 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
@@ -4232,10 +3927,8 @@
-
-
+
-
@@ -5063,10 +4756,6 @@
-
-
-
-
diff --git a/HDFwear/Home/BloodOxygenVC.swift b/HDFwear/Home/BloodOxygenVC.swift
index 3fa3a3f..53676c7 100644
--- a/HDFwear/Home/BloodOxygenVC.swift
+++ b/HDFwear/Home/BloodOxygenVC.swift
@@ -17,7 +17,9 @@ class BloodOxygenVC: UIViewController, DateSegmentViewDelegate, RangeSliderDeleg
@IBOutlet weak var dateLabel: UILabel!
@IBOutlet weak var boLabel: UILabel!
@IBOutlet weak var averageLabel: UILabel!
- @IBOutlet weak var rangeLabel: UILabel!
+ @IBOutlet weak var hightLabel: UILabel!
+ @IBOutlet weak var lowLabel: UILabel!
+// @IBOutlet weak var rangeLabel: UILabel!
@IBOutlet weak var analysisLabel: UILabel!
private var dateType: DateType = .day
@@ -120,7 +122,9 @@ class BloodOxygenVC: UIViewController, DateSegmentViewDelegate, RangeSliderDeleg
private func resetLabel() {
boLabel.text = "--"
averageLabel.text = "--"
- rangeLabel.text = "--"
+// rangeLabel.text = "--"
+ hightLabel.text = "__"
+ lowLabel.text = "__"
analysisLabel.text = "\(LocString("亲，您已超过"))0%\(LocString("的同类用户"))"
}
@@ -133,10 +137,14 @@ class BloodOxygenVC: UIViewController, DateSegmentViewDelegate, RangeSliderDeleg
if dateType == .day {
let boResult = BloodOxygenModel.getAverageByDay(selectedDate)
averageLabel.text = boResult.bo.value == -1 ? "--" : "\(boResult.bo.value)"
- rangeLabel.text = "\(boResult.maxBo)-\(boResult.minBo)"
+// rangeLabel.text = "\(boResult.maxBo)-\(boResult.minBo)"
+ hightLabel.text = "\(boResult.maxBo)"
+ lowLabel.text = "\(boResult.minBo)"
} else {
averageLabel.text = boArray[index].value == -1 ? "--" : "\(boArray[index].value)"
- rangeLabel.text = "\(maxArray[index])-\(minArray[index])"
+// rangeLabel.text = "\(maxArray[index])-\(minArray[index])"
+ hightLabel.text = "\(maxArray[index])"
+ lowLabel.text = "\(minArray[index])"
}
diff --git a/HDFwear/Home/HeartRateVC.swift b/HDFwear/Home/HeartRateVC.swift
index a68a893..4f6d9fb 100644
--- a/HDFwear/Home/HeartRateVC.swift
+++ b/HDFwear/Home/HeartRateVC.swift
@@ -18,8 +18,9 @@ class HeartRateVC: UIViewController, DateSegmentViewDelegate, RangeSliderDelegat
@IBOutlet weak var dateLabel: UILabel!
@IBOutlet weak var hrLabel: UILabel!
@IBOutlet weak var averageLabel: UILabel!
- @IBOutlet weak var rangeLabel: UILabel!
- @IBOutlet weak var analysisLabel: UILabel!
+ @IBOutlet weak var quietAverageLabel: UILabel!
+ @IBOutlet weak var highLabel: UILabel!
+ @IBOutlet weak var lowLabel: UILabel!
private var dateType: DateType = .day
private var selectedDate = Date()
@@ -125,8 +126,9 @@ class HeartRateVC: UIViewController, DateSegmentViewDelegate, RangeSliderDelegat
private func resetLabel() {
hrLabel.text = "--"
averageLabel.text = "--"
- rangeLabel.text = "--"
- analysisLabel.text = "\(LocString("亲，您已超过"))0%\(LocString("的同类用户"))"
+ highLabel.text = "__"
+ lowLabel.text = "__"
+ quietAverageLabel.text = "__"
}
private func updateLable(_ index: Int) {
@@ -143,12 +145,16 @@ class HeartRateVC: UIViewController, DateSegmentViewDelegate, RangeSliderDelegat
let hrResult = HeartRateModel.getAverageByDay(self.selectedDate)
DispatchQueue.main.async {
self.averageLabel.text = hrResult.hr.value == -1 ? "--" : "\(hrResult.hr.value)"
- self.rangeLabel.text = "\(hrResult.minHr)-\(hrResult.maxHr)"
+ self.highLabel.text = "\(hrResult.maxHr)"
+ self.lowLabel.text = "\(hrResult.minHr)"
+ self.quietAverageLabel.text = "__"
}
}
} else {
averageLabel.text = hrArray[index].value == -1 ? "--" : "\(hrArray[index].value)"
- rangeLabel.text = "\(minArray[index])-\(maxArray[index])"
+ self.highLabel.text = "\(maxArray[index])"
+ self.lowLabel.text = "\(minArray[index])"
+ self.quietAverageLabel.text = "__"
}
hrLabel.text = "\(hrArray[index].value)"
@@ -196,7 +202,6 @@ class HeartRateVC: UIViewController, DateSegmentViewDelegate, RangeSliderDelegat
default:
break
}
- analysisLabel.text = "\(LocString("亲，您已超过"))\(per)%\(LocString("的同类用户"))"
}
diff --git a/HDFwear/Home/SleepViewController.swift b/HDFwear/Home/SleepViewController.swift
index 69eb1fe..bd3d05c 100644
--- a/HDFwear/Home/SleepViewController.swift
+++ b/HDFwear/Home/SleepViewController.swift
@@ -18,10 +18,9 @@ class SleepViewController: UIViewController, DateSegmentViewDelegate, RangeSlide
@IBOutlet weak var dateLabel: UILabel!
@IBOutlet weak var lengthLabel: UILabel!
@IBOutlet weak var deepLabel: UILabel!
- @IBOutlet weak var awakeLabel: UILabel!
+// @IBOutlet weak var awakeLabel: UILabel!
@IBOutlet weak var lightLabel: UILabel!
- @IBOutlet weak var sleepLabel: UILabel!
- @IBOutlet weak var analysisLabel: UILabel!
+// @IBOutlet weak var sleepLabel: UILabel!
private var dateType: DateType = .day
@@ -126,11 +125,10 @@ class SleepViewController: UIViewController, DateSegmentViewDelegate, RangeSlide
private func resetLabel() {
lengthLabel.toTimeType1(length: -1)
deepLabel.text = "--"
- awakeLabel.text = "--"
+// awakeLabel.text = "--"
deepLabel.text = "--"
lightLabel.text = "--"
- sleepLabel.toTimeType2(length: -1)
- analysisLabel.text = LocString("亲，您的睡眠健康指数已击败全国") + "0%" + LocString("的同龄人")
+// sleepLabel.toTimeType2(length: -1)
}
private func updateLable(_ index: Int) {
@@ -151,10 +149,10 @@ class SleepViewController: UIViewController, DateSegmentViewDelegate, RangeSlide
lengthLabel.toTimeType1(length: points[index].length)
let sleep = SleepModel.querySleepPercentage(sleepArray)
- awakeLabel.text = "\(sleep.awake_pct)"
+// awakeLabel.text = "\(sleep.awake_pct)"
deepLabel.text = "\(sleep.deep_pct)"
lightLabel.text = "\(sleep.light_pct)"
- sleepLabel.toTimeType2(length: sleep.length)
+// sleepLabel.toTimeType2(length: sleep.length)
tLength = sleep.length
} else {
if sleepSummaryArray.count == 0 {
@@ -176,8 +174,8 @@ class SleepViewController: UIViewController, DateSegmentViewDelegate, RangeSlide
lengthLabel.toTimeType1(length: sleep.sleepLength)
deepLabel.text = "\(sleep.deep_pct)"
lightLabel.text = "\(sleep.light_pct)"
- awakeLabel.text = "\(sleep.awake_pct)"
- sleepLabel.toTimeType2(length: sleep.sleepLength)
+// awakeLabel.text = "\(sleep.awake_pct)"
+// sleepLabel.toTimeType2(length: sleep.sleepLength)
// if dateType == .year {
// lengthLabel.toTimeType1(length: sleep.totalLength)
// }
@@ -205,7 +203,6 @@ class SleepViewController: UIViewController, DateSegmentViewDelegate, RangeSlide
default:
break
}
- analysisLabel.text = LocString("亲，您的睡眠健康指数已击败全国") + "\(per)%" + LocString("的同龄人")
}
private func updateChartView() {
diff --git a/HDFwear/Home/WomenHealthVC.swift b/HDFwear/Home/WomenHealthVC.swift
index 6971e0f..281dec8 100644
--- a/HDFwear/Home/WomenHealthVC.swift
+++ b/HDFwear/Home/WomenHealthVC.swift
@@ -14,7 +14,7 @@ class WomenHealthVC: UIViewController {
let menstrual = UserInfo.menstrual
- @IBOutlet weak var dateLabel: UILabel!
+// @IBOutlet weak var dateLabel: UILabel!
@IBOutlet weak var cycleLabel: UILabel!
@IBOutlet weak var daysLabel: UILabel!
@@ -23,7 +23,7 @@ class WomenHealthVC: UIViewController {
var isFirst: Bool = false
- @IBOutlet weak var firstView: UIView!
+// @IBOutlet weak var firstView: UIView!
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
navigationController?.setNavigationBarHidden(false, animated: true)
@@ -31,21 +31,21 @@ class WomenHealthVC: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
- title = LocString("经期设置")
+ title = LocString("生理周期设置")
if menstrual.days == 0 {
daysLabel.text = "--\(LocString("天"))"
cycleLabel.text = "--\(LocString("天"))"
- dateLabel.text = LocString("未选择")
+// dateLabel.text = LocString("未选择")
} else {
daysLabel.text = "\(menstrual.days)\(LocString("天"))"
cycleLabel.text = "\(menstrual.cycle)\(LocString("天"))"
- dateLabel.text = menstrual.lastDate!.toString(.custom("yyyy-MM-dd"))
+// dateLabel.text = menstrual.lastDate!.toString(.custom("yyyy-MM-dd"))
}
if isFirst {
- firstView.isHidden = false
+// firstView.isHidden = false
}
@@ -68,10 +68,10 @@ class WomenHealthVC: UIViewController {
MBProgressHUD.showh(LocString("周期长度没有填哟"))
return
}
- if dateLabel.text == LocString("未选择") {
- MBProgressHUD.showh(LocString("最近一次月经没有填哟"))
- return
- }
+// if dateLabel.text == LocString("未选择") {
+// MBProgressHUD.showh(LocString("最近一次月经没有填哟"))
+// return
+// }
var lastDate = menstrual.lastDate!
lastDate = lastDate - (menstrual.days - 1).days //wypwyp20220305改
menstrual.lastDate = lastDate
@@ -141,17 +141,17 @@ class WomenHealthVC: UIViewController {
}
- @IBAction func setLastMenstrual(_ sender: Any) {
- let pickerView = DatePickerView(title: LocString("最近一次月经"))
- pickerView.datePicker.datePickerMode = .date
- pickerView.datePicker.date = Date()
- pickerView.datePicker.maximumDate = Date()
- pickerView.show()
- pickerView.clickClosure = {[weak self] date in
- self?.dateLabel.text = date.toString(.custom("yyyy-MM-dd"))
- self?.menstrual.lastDate = date
- }
- }
+// @IBAction func setLastMenstrual(_ sender: Any) {
+// let pickerView = DatePickerView(title: LocString("最近一次月经"))
+// pickerView.datePicker.datePickerMode = .date
+// pickerView.datePicker.date = Date()
+// pickerView.datePicker.maximumDate = Date()
+// pickerView.show()
+// pickerView.clickClosure = {[weak self] date in
+// self?.dateLabel.text = date.toString(.custom("yyyy-MM-dd"))
+// self?.menstrual.lastDate = date
+// }
+// }