Merge #791 into sdk602patch0626 from refs/changes/791/head

Code review from 袁清梦

* refs/changes/791/head: (3 commits squashed)

  - 屏蔽不使用的字体注册

  - 修改自定义表盘可配置Id(1~5)

  - 关闭表盘Model类型打印

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/791

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index c023335..bc1392a 100644 (file)
--- 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/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index f46d765..7356306 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -459,9 +459,11 @@ namespace OHOS
         // ConfigModel::GetInstance()->Init();
         // 初始化语言
         GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::VECTOR_FONT_DIR, DEFAULT_VECTOR_FONT_FILENAME);
-        GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, GILROY_BOLD_FONT);    // 注册字体
+        GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, GILROY_BOLD_FONT); // 注册字体
+#if 0
         GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, SHEEPING_CATS_FONT);  // 注册字体
         GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, OHOS::NEW_FONT_DIR, GILROY_REGULAR_FONT); // 注册字体
+#endif
 
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "NativeLauncher::InitNativeLauncher");
         /* -------------------------------------------------------------------------- */
@@ -1520,7 +1522,7 @@ namespace OHOS
     void NativeLauncher::InitScheduleSlice(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitScheduleSlice");
-        SliceProxy * t_View = new AbilitySliceProxy<ScheduleView, SchedulePresenter>;
+        SliceProxy *t_View = new AbilitySliceProxy<ScheduleView, SchedulePresenter>;
         if (nullptr == t_View)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "View is nullptr");

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 0cd4521..448cfae 100644 (file)
--- 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\r
         {DIAL_CLOCK_3, "Custom_3", CUSTOM_CLOCK3_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 3\r
         {DIAL_CLOCK_4, "Custom_4", CUSTOM_CLOCK4_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 4\r
+        {DIAL_CLOCK_5, "Custom_5", CUSTOM_CLOCK5_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 4\r
     };\r
     const CardInfo printfMap[] = {\r
         {HEART_RATE, "心率卡片"},\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp
index 5906b5c..2406141 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp
@@ -141,7 +141,7 @@ namespace OHOS
         if (!resLoadStatus)
         {
             /*打印已经注册的表盘model类型*/
-            ModelDialDataFactory::GetInstance().DumpModules();
+            // ModelDialDataFactory::GetInstance().DumpModules();
             resLoadStatus = true;
         }
         uint32_t elapseTime = HALTick::GetInstance().GetElapseTime(startTime_);