From 875b68b4011a58aa97e0cae2803848e036385267 Mon Sep 17 00:00:00 2001 From: daifengyi Date: Mon, 22 May 2023 21:50:54 +0800 Subject: [PATCH] feat:mine page UI --- HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@2x.png | Bin 1248 -> 0 bytes HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@3x.png | Bin 2330 -> 0 bytes HDFwear/Assets.xcassets/Mine/app_update.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@2x.png | Bin 0 -> 2410 bytes HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@3x.png | Bin 0 -> 3394 bytes HDFwear/Assets.xcassets/Mine/health_report.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@2x.png | Bin 0 -> 2530 bytes HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@3x.png | Bin 0 -> 2036 bytes HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@2x.png | Bin 949 -> 0 bytes HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@3x.png | Bin 1640 -> 0 bytes HDFwear/Assets.xcassets/Mine/mine_about.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@2x.png | Bin 0 -> 2909 bytes HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@3x.png | Bin 0 -> 4217 bytes HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@2x.png | Bin 856 -> 0 bytes HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@3x.png | Bin 1627 -> 0 bytes HDFwear/Assets.xcassets/Mine/mine_data.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@2x.png | Bin 0 -> 2578 bytes HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@3x.png | Bin 0 -> 2038 bytes HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@2x.png | Bin 900 -> 0 bytes HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@3x.png | Bin 1587 -> 0 bytes HDFwear/Assets.xcassets/Mine/personal_info.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@2x.png | Bin 0 -> 2249 bytes HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@3x.png | Bin 0 -> 1760 bytes HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@2x.png | Bin 1215 -> 0 bytes HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@3x.png | Bin 2277 -> 0 bytes HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/Contents.json | 4 ++-- HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@2x.png | Bin 0 -> 2939 bytes HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@3x.png | Bin 0 -> 2235 bytes HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@2x.png | Bin 795 -> 0 bytes HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@3x.png | Bin 1466 -> 0 bytes HDFwear/Assets.xcassets/Setting/.DS_Store | Bin 14340 -> 0 bytes HDFwear/Mine/Base.lproj/Mine.storyboard | 424 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- HDFwear/Mine/MineViewController.swift | 54 +++++++++++++++++++++++++++--------------------------- HDFwear/en.lproj/Localizable.strings | 2 +- HDFwear/zh-Hans.lproj/Localizable.strings | 2 +- 35 files changed, 208 insertions(+), 298 deletions(-) delete mode 100644 HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@3x.png create mode 100644 HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@2x.png create mode 100644 HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@3x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@2x.png delete mode 100644 HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@3x.png diff --git a/HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@2x.png b/HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@2x.png deleted file mode 100644 index 1c884db..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@3x.png b/HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@3x.png deleted file mode 100644 index e917350..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/app_update.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/app_update.imageset/Contents.json index 4a20937..8956c17 100644 --- a/HDFwear/Assets.xcassets/Mine/app_update.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/app_update.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "APP检查更新@2x.png", + "filename" : "app_update@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "APP检查更新@3x.png", + "filename" : "app_update@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@2x.png b/HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@2x.png new file mode 100644 index 0000000..0a49921 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@3x.png b/HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@3x.png new file mode 100644 index 0000000..365e507 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/health_report.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/health_report.imageset/Contents.json index 2fca738..e49d77d 100644 --- a/HDFwear/Assets.xcassets/Mine/health_report.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/health_report.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "健康报告@2x.png", + "filename" : "health_report@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "健康报告@3x.png", + "filename" : "health_report@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@2x.png b/HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@2x.png new file mode 100644 index 0000000..2354fb3 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@3x.png b/HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@3x.png new file mode 100644 index 0000000..67d1a3e Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@2x.png b/HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@2x.png deleted file mode 100644 index 85a95f6..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@3x.png b/HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@3x.png deleted file mode 100644 index ef3e559..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/mine_about.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/mine_about.imageset/Contents.json index 448f52a..bf77b45 100644 --- a/HDFwear/Assets.xcassets/Mine/mine_about.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/mine_about.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "关于@2x.png", + "filename" : "mine_about@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "关于@3x.png", + "filename" : "mine_about@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@2x.png b/HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@2x.png new file mode 100644 index 0000000..281f709 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@3x.png b/HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@3x.png new file mode 100644 index 0000000..8ebef1a Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@2x.png b/HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@2x.png deleted file mode 100644 index 037be01..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@3x.png b/HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@3x.png deleted file mode 100644 index 32db818..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/mine_data.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/mine_data.imageset/Contents.json index 9f82555..12a558a 100644 --- a/HDFwear/Assets.xcassets/Mine/mine_data.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/mine_data.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "我的数据@2x.png", + "filename" : "mine_data@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "我的数据@3x.png", + "filename" : "mine_data@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@2x.png b/HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@2x.png new file mode 100644 index 0000000..1b90e72 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@3x.png b/HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@3x.png new file mode 100644 index 0000000..3568348 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@2x.png b/HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@2x.png deleted file mode 100644 index 86a14f8..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@3x.png b/HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@3x.png deleted file mode 100644 index 7a936e4..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/personal_info.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/personal_info.imageset/Contents.json index 2d923a3..9ae05ed 100644 --- a/HDFwear/Assets.xcassets/Mine/personal_info.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/personal_info.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "个人资料@2x.png", + "filename" : "personal_info@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "个人资料@3x.png", + "filename" : "personal_info@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@2x.png b/HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@2x.png new file mode 100644 index 0000000..ff880e8 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@3x.png b/HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@3x.png new file mode 100644 index 0000000..a3e5318 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@2x.png b/HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@2x.png deleted file mode 100644 index a6a5f73..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@3x.png b/HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@3x.png deleted file mode 100644 index fb04949..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/Contents.json b/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/Contents.json index fa729e8..af8d858 100644 --- a/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/Contents.json +++ b/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "隐私政策@2x.png", + "filename" : "privacy_policy@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "隐私政策@3x.png", + "filename" : "privacy_policy@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@2x.png b/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@2x.png new file mode 100644 index 0000000..6678a50 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@2x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@3x.png b/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@3x.png new file mode 100644 index 0000000..aaa7b64 Binary files /dev/null and b/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@3x.png differ diff --git a/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@2x.png b/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@2x.png deleted file mode 100644 index 4133900..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@2x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@3x.png b/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@3x.png deleted file mode 100644 index 2f33f80..0000000 Binary files a/HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@3x.png and /dev/null differ diff --git a/HDFwear/Assets.xcassets/Setting/.DS_Store b/HDFwear/Assets.xcassets/Setting/.DS_Store index ab405ad..a0ba49c 100644 Binary files a/HDFwear/Assets.xcassets/Setting/.DS_Store and b/HDFwear/Assets.xcassets/Setting/.DS_Store differ diff --git a/HDFwear/Mine/Base.lproj/Mine.storyboard b/HDFwear/Mine/Base.lproj/Mine.storyboard index a2b7f03..7686808 100644 --- a/HDFwear/Mine/Base.lproj/Mine.storyboard +++ b/HDFwear/Mine/Base.lproj/Mine.storyboard @@ -1,9 +1,9 @@ - + - + @@ -17,262 +17,177 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - + - - - - - - - - - - + + + + - - - - - - - @@ -290,20 +205,20 @@ - +