Merge #3264 into fd272 from refs/changes/3264/head

Code review from aliyun3243248791

* refs/changes/3264/head: (2 commits squashed)

  - 修改血氧，心率，运动，省电界面的UI颜色与资源

  - Merge branch 'fd272' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into fd272

Signed-off-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3264

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
index f44a4a7..80bad35 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
@@ -78,7 +78,7 @@ void BloodResultView::UpSPO2Text() {
  */
 bool BloodResultView::AddButton() {
   InitButtonExt(checkButton, 118, 336, 230, 80, CLICK_BLOOD, STR_CHECK, 30);
-  checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF5A36); // 设置按键颜色
+  checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0D6EFF); // 设置按键颜色
   // 设置按键监听
   UIView::OnClickListener *clickListener =
       (UIView::OnClickListener *)OHOS::BloodResultPresenter::GetInstance();

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartNoteView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartNoteView.cpp
index 4fc7ca9..501c592 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartNoteView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartNoteView.cpp
@@ -98,7 +98,7 @@ UIScrollView *HeartNoteView::CreateHeartNoteView(void) {
 
   InitButtonExt(ReButton, 238, 320, 170, 90, CLICK_HEART_RESTART, STR_RECHECK,
                 30);
-  ReButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF8A36); // 设置按键颜色
+  ReButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0D6EFF); // 设置按键颜色
   UIView::OnClickListener *buttonClickre =
       static_cast<UIView::OnClickListener *>(
           HeartChartPresenter::GetInstance());

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/saveele/src/SaveBatView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/saveele/src/SaveBatView.cpp
index 07dc378..2bed85d 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/saveele/src/SaveBatView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/saveele/src/SaveBatView.cpp
@@ -47,7 +47,7 @@ namespace OHOS
     const static int16_t RADIUS = 90; // 半径 90\r
     const static int16_t STROKE_WIDTH = 20;\r
     const static int16_t CIRCLE_BASE_WIDTH = 4;\r
-    const static uint32_t LIGHT_GREEN = 0xff007700;\r
+    const static uint32_t LIGHT_GREEN = 0xff0D6EFF;\r
     static const uint16_t LABEL_FONT_SIZE = 80;\r
     static const uint16_t ANIMATE_TIME = 500;\r
     static const uint16_t SECOND_TO_MINISECOND = 1000;\r
@@ -196,7 +196,7 @@ namespace OHOS
         // 如果起始角度与结束角度不相同，则绘制弧线\r
         if (start != end)\r
         {\r
-            paint.SetStrokeColor(Color::Green()); // 设置弧线颜色为绿色\r
+            paint.SetStrokeColor(Color::Blue()); // 设置弧线颜色为绿色\r
             // 如果起始角和结束角相差完整的一圈，则绘制完整的圆圈\r
             if (end - start == DEGREES_PER_CIRCLE)\r
             {\r
@@ -537,7 +537,8 @@ namespace OHOS
         timelabel->SetStyle(STYLE_TEXT_FONT, 100);\r
         timelabel->SetText("11:00");\r
         timelabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);\r
-        timelabel->SetTextColor(Color::GetColorFromRGBA(0x49, 0xef, 0x13, 0xff));\r
+        // timelabel->SetTextColor(Color::GetColorFromRGBA(0x49, 0xef, 0x13, 0xff));\r
+        timelabel->SetTextColor(Color::White());\r
         timelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         timelabel->SetRollSpeed(0);\r
         timelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 100);\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
index 03332f8..5ec462d 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -4,7 +4,7 @@
 #include "components/ui_label_ext.h"\r
 #include "ui_resource_string.h"\r
 #include "NativeAbility.h"\r
-// #include "sport_countdown/CountdownPresenter.h"\r
+#include "sport_countdown/CountdownPresenter.h"\r
 #include "key/include/KeyInputListener.h"\r
 #include "custom_utils.h"\r
 #include "common/key_code.h"\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TrainingSetCaluliView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TrainingSetCaluliView.cpp
index f0d71cc..5db1f1f 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TrainingSetCaluliView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TrainingSetCaluliView.cpp
@@ -139,7 +139,7 @@ namespace OHOS
         // 设置 UIPicker 的属性
         picker->SetItemHeight(70);
         picker->SetLoopState(true);
-        picker->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff), Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));
+        picker->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff), Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff));
         picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT); // 设置普通文本大小
         picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT);  // 设置高光文本大小
         picker->SetValues(values, caluliValues.size());

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TrainingSetTimeView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TrainingSetTimeView.cpp
index 219b011..6a1e808 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TrainingSetTimeView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TrainingSetTimeView.cpp
@@ -133,7 +133,7 @@ namespace OHOS
         // 设置 UIPicker 的属性
         picker->SetItemHeight(70);
         picker->SetLoopState(true);
-        picker->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff), Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));
+        picker->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff), Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff));
         picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT); // 设置普通文本大小
         picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT);  // 设置高光文本大小
         picker->SetValues(values, TimeValues.size());

diff --git a/code/sdk/files/fd272/fs/user/res/Save_Ele/finger2.bin b/code/sdk/files/fd272/fs/user/res/Save_Ele/finger2.bin
index b08089f..a8eca67 100644 (file)
Binary files a/code/sdk/files/fd272/fs/user/res/Save_Ele/finger2.bin and b/code/sdk/files/fd272/fs/user/res/Save_Ele/finger2.bin differ

diff --git a/code/sdk/files/fd272/fs/user/res/Training/modules/Calories.bin b/code/sdk/files/fd272/fs/user/res/Training/modules/Calories.bin
index a467828..7e9aa2a 100644 (file)
Binary files a/code/sdk/files/fd272/fs/user/res/Training/modules/Calories.bin and b/code/sdk/files/fd272/fs/user/res/Training/modules/Calories.bin differ

diff --git a/code/sdk/files/fd272/fs/user/res/Training/modules/Go.bin b/code/sdk/files/fd272/fs/user/res/Training/modules/Go.bin
index 4ae9a38..96058ef 100644 (file)
Binary files a/code/sdk/files/fd272/fs/user/res/Training/modules/Go.bin and b/code/sdk/files/fd272/fs/user/res/Training/modules/Go.bin differ

diff --git a/code/sdk/files/fd272/fs/user/res/heart_chart/buttomicon.bin b/code/sdk/files/fd272/fs/user/res/heart_chart/buttomicon.bin
index 45116af..4f1b9d4 100644 (file)
Binary files a/code/sdk/files/fd272/fs/user/res/heart_chart/buttomicon.bin and b/code/sdk/files/fd272/fs/user/res/heart_chart/buttomicon.bin differ