From fc3a80472612238afbbdb80e52ae3e436608ad08 Mon Sep 17 00:00:00 2001 From: daifengyi Date: Mon, 22 May 2023 22:14:28 +0800 Subject: [PATCH] feat:health data page UI --- HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@2x.png | Bin 0 -> 1377 bytes HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@3x.png | Bin 0 -> 1067 bytes HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@2x.png | Bin 1281 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@3x.png | Bin 2417 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@2x.png | Bin 0 -> 2108 bytes HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@3x.png | Bin 0 -> 1574 bytes HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@2x.png | Bin 736 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@3x.png | Bin 1431 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@2x.png | Bin 0 -> 1718 bytes HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@3x.png | Bin 0 -> 1430 bytes HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@2x.png | Bin 1503 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@3x.png | Bin 2807 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@2x.png | Bin 0 -> 1970 bytes HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@3x.png | Bin 0 -> 1539 bytes HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@2x.png | Bin 1311 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@3x.png | Bin 2476 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@2x.png | Bin 0 -> 1456 bytes HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@3x.png | Bin 0 -> 1119 bytes HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@2x.png | Bin 1242 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@3x.png | Bin 2253 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@2x.png | Bin 0 -> 1860 bytes HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@3x.png | Bin 0 -> 1454 bytes HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@2x.png | Bin 1247 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@3x.png | Bin 2354 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_step.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@2x.png | Bin 0 -> 1966 bytes HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@3x.png | Bin 0 -> 1546 bytes HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@2x.png | Bin 1093 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@3x.png | Bin 2094 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@2x.png | Bin 0 -> 1839 bytes HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@3x.png | Bin 0 -> 1443 bytes HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@2x.png | Bin 764 -> 0 bytes HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@3x.png | Bin 1328 -> 0 bytes HDFwear/Home/StepViewController.swift | 6 +++--- HDFwear/Mine/Base.lproj/Mine.storyboard | 36 ++++++++++++++++++------------------ HDFwear/Mine/HealthDataVC.swift | 33 ++++++++++++++++++++++++++++----- HDFwear/Mine/HealthReportVC.swift | 8 ++++---- 44 files changed, 69 insertions(+), 46 deletions(-) create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@3x.png diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/Contents.json index a4c0051..6e55948 100644 --- a/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "血氧@2x.png", + "filename" : "my_data_bo@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "血氧@3x.png", + "filename" : "my_data_bo@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@2x.png new file mode 100644 index 0000000..bb0703a Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@3x.png new file mode 100644 index 0000000..d9f13b8 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@2x.png deleted file mode 100644 index e16db52..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@3x.png deleted file mode 100644 index c62618b..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/Contents.json index da450e0..13dfd6d 100644 --- a/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "血压@2x.png", + "filename" : "my_data_bp@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "血压@3x.png", + "filename" : "my_data_bp@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@2x.png new file mode 100644 index 0000000..386040c Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@3x.png new file mode 100644 index 0000000..5dfa820 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@2x.png deleted file mode 100644 index 690e19e..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@3x.png deleted file mode 100644 index 81a8e2b..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/Contents.json index 17ef900..f22112a 100644 --- a/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "热量@2x.png", + "filename" : "my_data_calorie@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "热量@3x.png", + "filename" : "my_data_calorie@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@2x.png new file mode 100644 index 0000000..467ec17 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@3x.png new file mode 100644 index 0000000..1535777 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@2x.png deleted file mode 100644 index 2dba5a6..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@3x.png deleted file mode 100644 index ce0b083..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/Contents.json index 233523c..32b9434 100644 --- a/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "距离@2x.png", + "filename" : "my_data_distance@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "距离@3x.png", + "filename" : "my_data_distance@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@2x.png new file mode 100644 index 0000000..b650434 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@3x.png new file mode 100644 index 0000000..f34de67 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@2x.png deleted file mode 100644 index 256e6d9..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@3x.png deleted file mode 100644 index e7f1493..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/Contents.json index 005084c..bc2b233 100644 --- a/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "心率@2x.png", + "filename" : "my_data_hr@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "心率@3x.png", + "filename" : "my_data_hr@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@2x.png new file mode 100644 index 0000000..72f41ea Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@3x.png new file mode 100644 index 0000000..18eb046 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@2x.png deleted file mode 100644 index 5db643e..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@3x.png deleted file mode 100644 index c771b96..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/Contents.json index 33f83e6..7b8b27c 100644 --- a/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "睡眠@2x.png", + "filename" : "my_data_sleep@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "睡眠@3x.png", + "filename" : "my_data_sleep@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@2x.png new file mode 100644 index 0000000..ef93205 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@3x.png new file mode 100644 index 0000000..6cdc964 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@2x.png deleted file mode 100644 index a13f2bf..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@3x.png deleted file mode 100644 index 10aa2f4..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/Contents.json index a8d3741..4e06a61 100644 --- a/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "步数@2x.png", + "filename" : "my_data_step@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "步数@3x.png", + "filename" : "my_data_step@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@2x.png new file mode 100644 index 0000000..b171e03 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@3x.png new file mode 100644 index 0000000..239f1e5 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@2x.png deleted file mode 100644 index 5bcd0ee..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@3x.png deleted file mode 100644 index e9cb81c..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/Contents.json index 9d35f0e..1c0ef21 100644 --- a/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "体重@2x.png", + "filename" : "my_data_weight@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "体重@3x.png", + "filename" : "my_data_weight@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@2x.png new file mode 100644 index 0000000..4c7195f Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@3x.png new file mode 100644 index 0000000..898c0e1 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@2x.png b/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@2x.png deleted file mode 100644 index 4378fea..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@3x.png b/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@3x.png deleted file mode 100644 index aef40ac..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@3x.png and /dev/null differ diff --git a/HDFwear/Home/StepViewController.swift b/HDFwear/Home/StepViewController.swift index a58ab36..95bc5f4 100644 --- a/HDFwear/Home/StepViewController.swift +++ b/HDFwear/Home/StepViewController.swift @@ -18,7 +18,7 @@ class StepViewController: UIViewController, DateSegmentViewDelegate, RangeSlider @IBOutlet weak var stepLabel: UILabel! @IBOutlet weak var calorieLabel: UILabel! @IBOutlet weak var dayStepLabel: UILabel! - @IBOutlet weak var analysisLabel: UILabel! +// @IBOutlet weak var analysisLabel: UILabel! @IBOutlet weak var goButton: UIButton! @IBOutlet weak var stepsGoalLabel: UILabel! @@ -164,7 +164,7 @@ class StepViewController: UIViewController, DateSegmentViewDelegate, RangeSlider dayStepLabel.text = "--" calorieLabel.text = "--" updateProgressView(StepModel()) - analysisLabel.text = "\(LocString("亲，您已超过"))0%\(LocString("的同类用户"))" +// analysisLabel.text = "\(LocString("亲，您已超过"))0%\(LocString("的同类用户"))" } private func updateProgressView(_ step: StepModel) { @@ -231,7 +231,7 @@ class StepViewController: UIViewController, DateSegmentViewDelegate, RangeSlider per = "99.9" } - analysisLabel.text = "\(LocString("亲，您已超过"))\(per)%\(LocString("的同类用户"))" +// analysisLabel.text = "\(LocString("亲，您已超过"))\(per)%\(LocString("的同类用户"))" } private func updateChartView() { diff --git a/HDFwear/Mine/Base.lproj/Mine.storyboard b/HDFwear/Mine/Base.lproj/Mine.storyboard index 7686808..311370c 100644 --- a/HDFwear/Mine/Base.lproj/Mine.storyboard +++ b/HDFwear/Mine/Base.lproj/Mine.storyboard @@ -660,40 +660,40 @@ - + - + - + - - + - + - - + + @@ -704,8 +704,8 @@ - - + + @@ -728,8 +728,8 @@ - - + + diff --git a/HDFwear/Mine/HealthDataVC.swift b/HDFwear/Mine/HealthDataVC.swift index bff9ecb..d596d9d 100644 --- a/HDFwear/Mine/HealthDataVC.swift +++ b/HDFwear/Mine/HealthDataVC.swift @@ -30,10 +30,10 @@ class HealthDataVC: UIViewController { super.viewDidLoad() title = LocString("我的数据") - let shareButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28)) - shareButton.setImage(UIImage(named: "share_btn"), for: .normal) - shareButton.addTarget(self, action: #selector(share), for: .touchUpInside) - navigationItem.rightBarButtonItem = UIBarButtonItem(customView: shareButton) +// let shareButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28)) +// 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] = ["心率", "血压", "睡眠", "体重"] } @@ -126,9 +126,20 @@ extension HealthDataVC: UITableViewDataSource, UITableViewDelegate { func numberOfSections(in tableView: UITableView) -> Int { return dataArray.count } + func tableView(_ tableView: UITableView, estimatedHeightForHeaderInSection section: Int) -> CGFloat { + return 48 + } + + func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + if section == 0 { + return "活动统计" + }else { + return "健康状况" + } + } func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { - return 50 + return 55 } func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { return dataArray[section].count @@ -141,20 +152,32 @@ extension HealthDataVC: UITableViewDataSource, UITableViewDelegate { switch text { case "体重": cell.detailLabel.text = "\(weight)kg" + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10) + break case "距离": cell.detailLabel.text = totalDistance + break case "热量": cell.detailLabel.text = totalCalorie + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10) + break case "血氧": cell.detailLabel.text = bo + break case "血压": cell.detailLabel.text = bp + break case "心率": cell.detailLabel.text = hr + cell.setCorners(corners: [.topLeft, .topRight], radio: 10) + break case "睡眠": cell.detailLabel.text = sleep + break case "步数": cell.detailLabel.text = totalSteps + cell.setCorners(corners: [.topLeft, .topRight], radio: 10) + break default: break } diff --git a/HDFwear/Mine/HealthReportVC.swift b/HDFwear/Mine/HealthReportVC.swift index 8feeceb..3813129 100644 --- a/HDFwear/Mine/HealthReportVC.swift +++ b/HDFwear/Mine/HealthReportVC.swift @@ -25,10 +25,10 @@ class HealthReportVC: UIViewController { title = LocString("健康报告") - let shareButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28)) - shareButton.setImage(UIImage(named: "share_btn"), for: .normal) - shareButton.addTarget(self, action: #selector(share), for: .touchUpInside) - navigationItem.rightBarButtonItem = UIBarButtonItem(customView: shareButton) +// let shareButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28)) +// shareButton.setImage(UIImage(named: "share_btn"), for: .normal) +// shareButton.addTarget(self, action: #selector(share), for: .touchUpInside) +// navigationItem.rightBarButtonItem = UIBarButtonItem(customView: shareButton) if let i = collectArray.firstIndex(of: "MotionRecord") { collectArray.remove(at: i) -- libgit2 0.21.4