修改蓝色为品牌蓝

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 80bad35..23a5d93 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, 0xff0D6EFF); // 设置按键颜色
+  checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0d62ff); // 品牌蓝
   // 设置按键监听
   UIView::OnClickListener *clickListener =
       (UIView::OnClickListener *)OHOS::BloodResultPresenter::GetInstance();

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/bluetooth/src/BluetoothOptionsView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/bluetooth/src/BluetoothOptionsView.cpp
index e173eae..c1f2a18 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/bluetooth/src/BluetoothOptionsView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/bluetooth/src/BluetoothOptionsView.cpp
@@ -191,7 +191,7 @@ namespace OHOS
         }\r
         else if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERSETTING)\r
         {\r
-            optionsOneButton->SetTextColor(Color::Blue());\r
+            optionsOneButton->SetTextColor(Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff));\r
             optionsOneButton->SetOnClickListener(clickListener2);\r
         }\r
         optionsOneButton->SetVisible(false);\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/connectnewphone/src/ConnectOpenView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/connectnewphone/src/ConnectOpenView.cpp
index 23e80b2..3ec0d12 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/connectnewphone/src/ConnectOpenView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/connectnewphone/src/ConnectOpenView.cpp
@@ -85,7 +85,7 @@ void ConnectOpenView::ShowUpBackView()
         backButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40); // 40：font data\r
         backButton->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
         backButton->SetViewId(CONNECT_OPEN_BACK_BUTTON);\r
-        backButton->SetTextColor(Color::Blue());\r
+        backButton->SetTextColor(Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff));\r
         backButton->SetOnClickListener(clickListener);\r
         group->Add(backButton);\r
     }\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h
index 27e4c9f..1fe0a9a 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h
@@ -48,7 +48,7 @@ namespace OHOS
     constexpr int64_t ColorValue_ColorSettingItem_[COLOR_SETTING_ITEM_COUNT] = 
                                                     {
                                                         0xffffffff, 0xffff5a36, 0xff4fc34c,
-                                                        0xff3549ff, 0xffff8a36, 0xff8120e2
+                                                        0xff0d62ff, 0xffff8a36, 0xff8120e2  // 品牌蓝
                                                     };
 
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/BloodCardView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/BloodCardView.cpp
index a1f2388..1cd5833 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/BloodCardView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/BloodCardView.cpp
@@ -86,13 +86,14 @@ namespace OHOS
     bool BloodCardView::AddButton()\r
     {\r
         InitButtonExt(checkButton, 118, 336, 230, 80, MAIN_CLICK_BLOOD, STR_CHECK, 30);\r
-        checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF5A36); // 设置按键颜色\r
+        // TODO: 品牌蓝\r
+        checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0d62ff); // 设置按键颜色\r
         // 设置按键监听\r
         UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::MainPresenterSample::GetInstance();\r
         checkButton->SetOnClickListener(clickListener);\r
 \r
         Add(checkButton);\r
-        return true;\r
+        return true; \r
     }\r
     /***\r
      * @description:\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckAbnormalView.cpp
index 7b056b9..9a8d199 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckAbnormalView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckAbnormalView.cpp
@@ -61,7 +61,8 @@ namespace OHOS
         StButton->SetOnClickListener(presenter_);
 
         InitButtonExt(ReButton, 238, 320, 170, 90, CLICK_BLOOD_RE, STR_RECHECK, 30);
-        ReButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF8A36); // 设置按键颜色
+        // TODO: 品牌蓝
+        ReButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0d62ff); // 设置按键颜色
         ReButton->SetOnClickListener(presenter_);
 
         group->Add(StButton);

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
index 6202d52..9724464 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
@@ -187,7 +187,8 @@ namespace OHOS
         }
         factoryResetLabel->SetViewId(FACTORYRESET_LABEL_VIEWID);
         factoryResetLabel->SetTouchable((ConfigModel::GetInstance()->GetisFirstTimeStart() && ConfigModel::GetInstance()->GetLanguage() == -1) ? false : true);
-        factoryResetLabel->SetTextColor(Color::GetColorFromRGBA(0x35, 0x49, 0xff, 0xff));
+        //TODO: 品牌蓝
+        factoryResetLabel->SetTextColor(Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff));
         factoryResetLabel->SetOnClickListener(presenter_);
 
         return true;

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 2bed85d..a8a4d03 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 = 0xff0D6EFF;\r
+    const static uint32_t LIGHT_GREEN = 0xff0d62ff; // 品牌蓝\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::Blue()); // 设置弧线颜色为绿色\r
+            paint.SetStrokeColor(Color::Blue()); // 设置弧线颜色为蓝 打底\r
             // 如果起始角和结束角相差完整的一圈，则绘制完整的圆圈\r
             if (end - start == DEGREES_PER_CIRCLE)\r
             {\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/schedule/include/ScheduleListItem.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/schedule/include/ScheduleListItem.h
index 3a3c125..df027e3 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/schedule/include/ScheduleListItem.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/schedule/include/ScheduleListItem.h
@@ -49,7 +49,7 @@ namespace OHOS
         #define ITEM_GAP (20)
 
         #define ODD_ITEM_BACKGROUND_COLOR (0Xff001833)
-        #define ODD_ITEM_TOPIC_COLOR (0Xff0176ff)
+        #define ODD_ITEM_TOPIC_COLOR (0xff0d62ff)  // 品牌蓝
         #define ODD_ITEM_TIME_COLOR (0Xff8bc0ff)
 
         #define EVEN_ITEM_BACKGROUND_COLOR (0Xff331f00)

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp
index 8d11e3a..e14a9b9 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp
@@ -146,7 +146,7 @@ void TempContinueWarn::RefreshTempContinue(void)
     int8 tempListener = TempPresenter::GetInstance()->GetTempListen();\r
     if (tempListener == 0) {\r
         tempLabel[SET_ONE]->SetText(TEMP_COLD_WARN);\r
-        tempLabel[SET_ONE]->SetTextColor(Color::Blue());\r
+        tempLabel[SET_ONE]->SetTextColor(Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff));\r
         tempLabel[SET_TWO]->SetText(TEMP_HOT_WARN_LABEL);\r
     } else if (tempListener == 1) {\r
         tempLabel[SET_ONE]->SetText(TEMP_HOT_WARN);\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
index dd5ed66..972f5e1 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
@@ -235,7 +235,7 @@ void TraingEnddataView::BonusdataView() {
     InitLabel(labelmile, 146, startY_Value_Init_Bonusdata + row0 * labelInterval, 240, 60,
               "label15", "--", DEFAULT_VECTOR_FONT_FILENAME, 40);
     labelumile->SetTextColor(textColor);
-    labelmile->SetTextColor(Color::Blue());
+    labelmile->SetTextColor(Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff));
     scrollView_->Add(labelumile);
     scrollView_->Add(labelmile);
     return;
@@ -267,7 +267,8 @@ void TraingEnddataView::BonusdataView() {
   InitLabel(labelmile, 146, startY_Value_Init_Bonusdata + row0 * labelInterval, 240, 60,
             "label15", "--", DEFAULT_VECTOR_FONT_FILENAME, 40);
   labelumile->SetTextColor(textColor);
-  labelmile->SetTextColor(Color::Blue());
+  // TODO: 品牌蓝
+  labelmile->SetTextColor(Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff));
 
   // 步数
   InitRollLabel(labelusteps, 146, startY_Unit_Init_Bonusdata + labelInterval * (5 + tagflge), 240, 40,
@@ -856,7 +857,7 @@ void TraingEnddataView::GenerateTrackPoints() {
   trackSegments_.clear();
 
   TrackSegment seg1;
-  seg1.color = Color::Blue();
+  seg1.color = Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff);
 
   std::vector<Point> canvasData = TraingModel::GetInstance()->GetCanvasData();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNoteView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNoteView.cpp
index 7d06855..9dc2384 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNoteView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNoteView.cpp
@@ -65,7 +65,8 @@ namespace OHOS
             button_download->SetText("连接手机");
         else
             button_download->SetText("Connect Phone");
-        button_download->SetStyle(STYLE_BACKGROUND_COLOR, 0xff4fc34c);
+        // TODO: 品牌蓝
+        button_download->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0d62ff);
         scrollView1_->Add(button_download);
         button_download->SetOnClickListener(presenter_);
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traingrecord/src/TraingRecordView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traingrecord/src/TraingRecordView.cpp
index c8d38ab..2b95866 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traingrecord/src/TraingRecordView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traingrecord/src/TraingRecordView.cpp
@@ -151,7 +151,8 @@ void TraingRecordView::ShowLackView() {
   InitImageView(imagerecord, 174, 120, 118, 120, "image", RECOED_IMAGE);
   /*初始化按键*/
   InitButtonExt(buttongo, 93, 330, 280, 90, BUTTONGO, STR_TRAINGGO, 30);
-  buttongo->SetStyle(STYLE_BACKGROUND_COLOR, 0xff4fc34c); // 设置按键颜色
+  // TODO: 品牌蓝
+  buttongo->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0d62ff); // 设置按键颜色
   buttongo->SetOnClickListener(static_cast<UIView::OnClickListener *>(
       TraingRecordPresenter::GetInstance()));
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/womenhealth/src/WomenHealthMainPage.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/womenhealth/src/WomenHealthMainPage.cpp
index 64397a3..ba5a4c2 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/womenhealth/src/WomenHealthMainPage.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/womenhealth/src/WomenHealthMainPage.cpp
@@ -695,7 +695,7 @@ namespace OHOS
      * 
      * 作用：根据日期状态绘制不同颜色的圆圈背景
      * - 月经期：红色 (0xFFFF5A5A)
-     * - 排卵期：蓝色 (0xFF5AB0FF)
+     * - 排卵期：品牌蓝 (0xff0d62ff)
      * - 预测经期：浅红色 (0xFFFFB5B5)
      * - 今天：灰色 (0xFF808080)
      * - 普通日：不显示圆圈
@@ -728,8 +728,8 @@ namespace OHOS
             case DAY_STATUS_MENSTRUAL:  // 月经期：红色
                 color = 0xFFFF5A5A;
                 break;
-            case DAY_STATUS_OVULATION:  // 排卵期：蓝色
-                color = 0xFF5AB0FF;
+            case DAY_STATUS_OVULATION:  // 排卵期：品牌蓝
+                color = 0xff0d62ff;
                 break;
             case DAY_STATUS_PREDICT:    // 预测经期：浅红色
                 color = 0xFFFFB5B5;

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
index 476361f..94b7bba 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp
@@ -1399,7 +1399,8 @@ namespace OHOS
         nextorprepageLabelButton->SetPosition(143, 20);
         nextorprepageLabelButton->Resize(100, 100);
         nextorprepageLabelButton->SetViewId(NEXTORPREPAGELABELBUTTON);
-        nextorprepageLabelButton->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
+        // TODO: 品牌蓝
+        nextorprepageLabelButton->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff).full);
         nextorprepageLabelButton->SetText("第一页");
         nextorprepageLabelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         nextorprepageLabelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffff0000, UIButton::PRESSED);