From cb4b90e7c143be24ff3a7fe55bbe0d4a33ce9a67 Mon Sep 17 00:00:00 2001 From: Caisking Date: Wed, 3 Sep 2025 17:58:37 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0AOD=E7=9B=B8=E5=85=B3=E8=B5=84?= =?utf8?q?=E6=BA=90=E6=96=87=E4=BB=B6=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?utf8?q?=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeapp/nativelauncher/include/UiConfig.h | 1 + .../nativeui/set_aod/src/SetAodDialView.cpp | 12 ++++++++++++ .../nativeui/settings/src/SettingItemView.cpp | 10 ++++++++++ .../nativeui/settings/src/SettingModel.cpp | 2 +- .../files/fd230/fs/user/res/settings/AODDIAL.bin | Bin 0 -> 2840 bytes .../files/n9/fs/user/res/settings/AODDIAL.bin | Bin 0 -> 2840 bytes 6 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 code/sdk/files/fd230/fs/user/res/settings/AODDIAL.bin create mode 100644 code/sdk/files/n9/fs/user/res/settings/AODDIAL.bin 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 bf1920c18..456ba70d9 100644 --- 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 af6a6a58e..b9d0c3f7b 100644 --- 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 17580ce28..b3a3a316e 100644 --- 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 2e54d9829..e6d9cc013 100644 --- 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 index 0000000000000000000000000000000000000000..7936aef1d6c3512a11a6743050647e5ff3f6338c GIT binary patch literal 2840 zcmb_eeP~lx6hHU9XY(l%%JC5_^f@)p(; zcyKu9{?6~5d(OE51)z@okQeJ_y;YEvg+)xua=K#ORmg1IIm9D99DsUx#z6^311Aup z>#HGg^0XsaDLRvt{k_a@bDKgwu&>^gfs4Nfs`V@8pGT!A3-gPuR=r&2{9P;okY$_9 zyv*X8*%N)G&WSwVb_ONqv5(sIb(&v{@e5#zWX}`Q-K{5@tA14@++UL^>`9eJ$Nv6# zR_z*K_yWbF)vyt4IrI15S>vR*3S3&dLNZ zjLI?j@%mrA^saLlf3kq~TxTA;Z$;r*_Aw;-8CFuWcq?u9-F>?~e8ok);n7MNIC~af zr=yG7b5w({wgFm5-b%t zC)hh$*ZmpkQ(ESOC+ioHoN7SHEple~>V{*iKMH6dx`23Z>_NX}*s^-oG#%V}O$2SE zVdD7s^h;)VN{jF;oRL!a{Q~wjfRN@J?rZcE9e%UqOTn#jgu6$A>}pszgeMct^Og1+ z1;ktagtCLpgc-ikKI-Fpw+hw?q5y&sY`Oj`Ve;BHn+vZd~j?dFA9r6ow>FV5h|_##Rd z@7GrHOa7jaJJPo{WX8{EH}LCu`G33ay%W+nY4{8+8v)f@?$$djX?>u?PD{ zzkgj={R6E2k>=~6T4>F)FZpZpXh$5%eg8G2=f8v1=V;{g!m)_|@^&Y!uV9TOb&UQt zJ!Rx))YZX$>yJ0b-$DtlfF%hEk@P*3nZNOee01)*WabgNV4W4#bD!nh5B`?-GyI?$ z2CjYa%=0aTyvw zqeDJ_$t!O$@-x#_F-F8Xk@Wviz*<_uHj?faef{)PR$rE1eA2&Ee*n!4PYHeNxShgO zkXp1*EuGH#>wvl_gGY4!?hJpspxph~MPqCq3p83WhKpJM<@WJP+kJz)YZwn(DDMV{ zZ+zrn(THUIzs literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..7936aef1d6c3512a11a6743050647e5ff3f6338c GIT binary patch literal 2840 zcmb_eeP~lx6hHU9XY(l%%JC5_^f@)p(; zcyKu9{?6~5d(OE51)z@okQeJ_y;YEvg+)xua=K#ORmg1IIm9D99DsUx#z6^311Aup z>#HGg^0XsaDLRvt{k_a@bDKgwu&>^gfs4Nfs`V@8pGT!A3-gPuR=r&2{9P;okY$_9 zyv*X8*%N)G&WSwVb_ONqv5(sIb(&v{@e5#zWX}`Q-K{5@tA14@++UL^>`9eJ$Nv6# zR_z*K_yWbF)vyt4IrI15S>vR*3S3&dLNZ zjLI?j@%mrA^saLlf3kq~TxTA;Z$;r*_Aw;-8CFuWcq?u9-F>?~e8ok);n7MNIC~af zr=yG7b5w({wgFm5-b%t zC)hh$*ZmpkQ(ESOC+ioHoN7SHEple~>V{*iKMH6dx`23Z>_NX}*s^-oG#%V}O$2SE zVdD7s^h;)VN{jF;oRL!a{Q~wjfRN@J?rZcE9e%UqOTn#jgu6$A>}pszgeMct^Og1+ z1;ktagtCLpgc-ikKI-Fpw+hw?q5y&sY`Oj`Ve;BHn+vZd~j?dFA9r6ow>FV5h|_##Rd z@7GrHOa7jaJJPo{WX8{EH}LCu`G33ay%W+nY4{8+8v)f@?$$djX?>u?PD{ zzkgj={R6E2k>=~6T4>F)FZpZpXh$5%eg8G2=f8v1=V;{g!m)_|@^&Y!uV9TOb&UQt zJ!Rx))YZX$>yJ0b-$DtlfF%hEk@P*3nZNOee01)*WabgNV4W4#bD!nh5B`?-GyI?$ z2CjYa%=0aTyvw zqeDJ_$t!O$@-x#_F-F8Xk@Wviz*<_uHj?faef{)PR$rE1eA2&Ee*n!4PYHeNxShgO zkXp1*EuGH#>wvl_gGY4!?hJpspxph~MPqCq3p83WhKpJM<@WJP+kJz)YZwn(DDMV{ zZ+zrn(THUIzs literal 0 HcmV?d00001 -- 2.17.1