增加AOD相关资源文件以及相关文字描述

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h
index bf1920c..456ba70 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h
@@ -759,6 +759,7 @@ namespace OHOS
     static constexpr const char *PNG_SETTINGS_SOUND_VIBRATION = APP_RES_PATH "/settings/SETTINGS_SOUND_VIBRATION.bin";           // 声音与震动
     static constexpr const char *PNG_SETTINGS_DISPLAY_MODE = APP_RES_PATH "/settings/SETTINGS_DISPLAY_MODE.bin";                 // 显示方式
     static constexpr const char *PNG_SETTINGS_MOTION_RECOGNITION = APP_RES_PATH "/settings/SETTINGS_MOTION_RECOGNITION.bin";     // 运动识别
+    static constexpr const char *PNG_SETTINGS_AOD_DIAL = APP_RES_PATH "/settings/AODDIAL.bin";                                   // AOD
     static constexpr const char *PNG_SETTINGS_SYSTEM = APP_RES_PATH "/settings/SETTINGS_SYSTEM.bin";                             // 系统
     static constexpr const char *PNG_SETTINGS_DISTURB_IMAGE = APP_RES_PATH "/settings/SETTINGS_DISTURB.bin";                     // 勿扰
     static constexpr const char *PNG_SETTINGS_CARDSET_IMAGE = APP_RES_PATH "/settings/SETTINGS_CARDSET.bin";                     // 卡片管理

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
index af6a6a5..b9d0c3f 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
@@ -92,7 +92,11 @@ namespace OHOS
             Title->SetPosition(83, 50, 300, 40);
             Title->SetStyle(STYLE_TEXT_FONT, 30);
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);
+            #if 0
             Title->SetTextId(STR_AOD_DIAL); /*AOD表盘*/
+            #else
+            Title->SetText("AOD表盘");
+            #endif
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             Title->SetRollSpeed(23);
@@ -117,7 +121,11 @@ namespace OHOS
             SetAodDialLabel->SetPosition(90, 153, 180, 40);
             SetAodDialLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SetAodDialLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
+            #if 0
             SetAodDialLabel->SetTextId(STR_SCREEN_OFF_DISPLAY); /*息屏显示*/
+            #else
+            SetAodDialLabel->SetText("息屏显示");
+            #endif
             SetAodDialLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
             SetAodDialLabel->SetRollSpeed(23);
             SetAodDialLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
@@ -148,7 +156,11 @@ namespace OHOS
             note->SetStyle(STYLE_TEXT_FONT, 20);
             note->SetStyle(STYLE_LINE_HEIGHT, 40);
             note->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));
+            #if 0
             note->SetTextId(STR_AOD_REMIND); // 开启后，手表在在息屏状态下也会显示时间等信息。
+            #else
+            note->SetText("开启后，手表在在息屏状态下也会显示时间等信息。\n但是需注意，此功能可能会导致手表的电量消耗增加。");
+            #endif
             note->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
             note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);
             /* -------------------------------------------------------------------------- */

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingItemView.cpp
index 17580ce..b3a3a31 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingItemView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingItemView.cpp
@@ -60,7 +60,12 @@ namespace OHOS
             Icon.SetSrc(itemInfo.icon);
             settingLabelExt.SetVisible(true);
             settingLabelExt.SetPosition(SETTINGLABELEXT_X, SETTINGLABELEXT_Y, SETTINGLABELEXT_W, SETTINGLABELEXT_H);
+            if(itemInfo.textId != STR_SCREEN_OFF_DISPLAY){
             settingLabelExt.SetTextId(itemInfo.textId);
+            }
+            else{
+            settingLabelExt.SetText("息屏表盘");
+            }
             settingLabelExt.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
             settingLabelButtonExt.SetVisible(true);
             SetHeight(120);
@@ -81,7 +86,12 @@ namespace OHOS
                 SetHeight(120);
             }
             settingLabelExt.SetPosition(SETTINGLABELEXT_X2, SETTINGLABELEXT_Y2, SETTINGLABELEXT_W2, SETTINGLABELEXT_H2);
+            if(itemInfo.textId != STR_SCREEN_OFF_DISPLAY){
             settingLabelExt.SetTextId(itemInfo.textId);
+            }
+            else{
+            settingLabelExt.SetText("息屏表盘");
+            }
             settingLabelExt.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             settingLabelButtonExt.SetVisible(false);
             SetTouchable(false);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp
index 2e54d98..e6d9cc0 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp
@@ -40,7 +40,7 @@ namespace OHOS
         settings[index++] = {VIEW_SOUND_VIBRATION, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
         settings[index++] = {VIEW_THEME_STYLE, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true};
         settings[index++] = {VIEW_MOTION_RECOGNITION, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
-        settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_MOTION_RECOGNITION, STR_SCREEN_OFF_DISPLAY, true};
+        settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true};
         settings[index++] = {VIEW_DNOTDISTURB, PNG_SETTINGS_DISTURB_IMAGE, STR_DO_NOT_DISTURB, true};
         settings[index++] = {VIEW_ADD_CARD, PNG_SETTINGS_CARDSET_IMAGE, STR_CARD_MANAGEMENT, true};
         settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_SETTINGS_CHANGEDIAL_IMAGE, STR_DIAL_BROWSING_SPECIAL_EFFECTS, true};

diff --git a/code/sdk/files/fd230/fs/user/res/settings/AODDIAL.bin b/code/sdk/files/fd230/fs/user/res/settings/AODDIAL.bin
new file mode 100644 (file)
index 0000000..7936aef
Binary files /dev/null and b/code/sdk/files/fd230/fs/user/res/settings/AODDIAL.bin differ

diff --git a/code/sdk/files/n9/fs/user/res/settings/AODDIAL.bin b/code/sdk/files/n9/fs/user/res/settings/AODDIAL.bin
new file mode 100644 (file)
index 0000000..7936aef
Binary files /dev/null and b/code/sdk/files/n9/fs/user/res/settings/AODDIAL.bin differ