#1171 手表，切换表盘屏蔽手表名称

diff --git a/code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h b/code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h
index 068b647..5f3a8d3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h
@@ -99,6 +99,7 @@ namespace OHOS
         bool InitTimeView(TimeDisplayPosition type);   // 时间
         bool InitBatteryView(BatteryDisplayType type); // 电量
         bool InitColor(ColorTypeSet type);             // 颜色
+        void SetLabelsColor(ColorType color);
 
         void UpdateStateShow(void);
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
index e1432b9..785a3ba 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
@@ -297,50 +297,45 @@ namespace OHOS
     */
     bool MainClockView::InitColor(ColorTypeSet type)
     {
-        if (!timerlabel || !datelabel)
+        if (!timerlabel ||!datelabel)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label is null");
             return false;
         }
-        int16 textColor;
 
         // 根据传入的颜色类型设置文本颜色
         switch (type)
         {
         case COLOR_BLACK:
-            timerlabel->SetTextColor(Color::Black());
-            datelabel->SetTextColor(Color::Black());
-            // weekLabel->SetTextColor(Color::Black());
+            SetLabelsColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));
             break;
         case COLOR_GRAY:
-            timerlabel->SetTextColor(Color::Gray());
-            datelabel->SetTextColor(Color::Gray());
-            // weekLabel->SetTextColor(Color::Gray());
+            SetLabelsColor(Color::GetColorFromRGBA(0xCC, 0xCC, 0xCC, 0xff));
             break;
         case COLOR_GREEN:
-            timerlabel->SetTextColor(Color::Green());
-            datelabel->SetTextColor(Color::Green());
-            // weekLabel->SetTextColor(Color::Green());
+            SetLabelsColor(Color::GetColorFromRGBA(0x4F, 0xC3, 0x4C, 0xff));
             break;
         case COLOR_ORANGE:
-            timerlabel->SetTextColor(Color::Orange());
-            datelabel->SetTextColor(Color::Orange());
-            // weekLabel->SetTextColor(Color::Orange());
+            SetLabelsColor(Color::GetColorFromRGBA(0xFF, 0x5A, 0x36, 0xff));
             break;
         case COLOR_BLUE:
-            timerlabel->SetTextColor(Color::Blue());
-            datelabel->SetTextColor(Color::Blue());
-            // weekLabel->SetTextColor(Color::Blue());
+            SetLabelsColor(Color::GetColorFromRGBA(0x35, 0x49, 0xFF, 0xff));
             break;
         case COLOR_WHITE:
         default: // 默认情况下使用白色
-            timerlabel->SetTextColor(Color::White());
-            datelabel->SetTextColor(Color::White());
-            // weekLabel->SetTextColor(Color::White());
+            SetLabelsColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
             break;
         }
         return true;
     }
+
+    void MainClockView::SetLabelsColor(ColorType color)
+    {
+        timerlabel->SetTextColor(color);
+        datelabel->SetTextColor(color);
+        // weekLabel->SetTextColor(color);
+    }
+
     /*
         电量显示 [电池框图片 电池进度条 电池标签]
         0 不显示图标