From: Caisking <3449750381@qq.com> Date: Mon, 26 Aug 2024 11:17:22 +0000 (+0800) Subject: 修改自定义表盘可配置Id(1~5) X-Git-Tag: release_V1.2.70_20241020_135402~585 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=c596e4dd72db408d09333e99900f65f29a083945;p=mirrors%2FFD230.git 修改自定义表盘可配置Id(1~5) --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index c023335ef..bc1392af2 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -38,6 +38,7 @@ namespace OHOS DIAL_CLOCK_2 = 2, DIAL_CLOCK_3 = 3, DIAL_CLOCK_4 = 4, + DIAL_CLOCK_5 = 5, DIAL_MAX, } DialId; @@ -89,6 +90,8 @@ namespace OHOS static constexpr const char *CUSTOM_CLOCK3_DIALPER_PATH = APP_CUSTOM_DIAL_PATH "/3/thumbnail.bin"; static constexpr const char *CUSTOM_CLOCK4_DIALBACK_PATH = APP_CUSTOM_DIAL_PATH "/4/main_bg.bin"; static constexpr const char *CUSTOM_CLOCK4_DIALPER_PATH = APP_CUSTOM_DIAL_PATH "/4/thumbnail.bin"; + static constexpr const char *CUSTOM_CLOCK5_DIALBACK_PATH = APP_CUSTOM_DIAL_PATH "/5/main_bg.bin"; + static constexpr const char *CUSTOM_CLOCK5_DIALPER_PATH = APP_CUSTOM_DIAL_PATH "/5/thumbnail.bin"; /* -------------------------------------------------------------------------- */ /*卡片管理*/ static constexpr const char *PNG_SET_CARD_ADD = APP_RES_PATH "/MainCard/CARD_ADD.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp index 0cd452184..448cfaec3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -53,6 +53,7 @@ namespace OHOS {DIAL_CLOCK_2, "Custom_2", CUSTOM_CLOCK2_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 2 {DIAL_CLOCK_3, "Custom_3", CUSTOM_CLOCK3_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 3 {DIAL_CLOCK_4, "Custom_4", CUSTOM_CLOCK4_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 4 + {DIAL_CLOCK_5, "Custom_5", CUSTOM_CLOCK5_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 4 }; const CardInfo printfMap[] = { {HEART_RATE, "心率卡片"},