Merge #1391 into sdk602patch0911 from refs/changes/1391/head

Code review from 袁清梦

* refs/changes/1391/head: (2 commits squashed)

  - 表盘：增加活力数字表盘

  - 系统：屏蔽亮屏函数设置回到主界面时间；预防错误设置

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1391

diff --git a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
index 1da2833..6346147 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
@@ -186,8 +186,8 @@ extern "C"
         }
 #if defined(SUPPORT_POWER_MANAGER)
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[ScreenTurn] timeout = %d", timeout);
-        g_interval = get_back_to_home_interval();
-        set_back_to_home_interval(0xFFFFFFFF);
+        // g_interval = get_back_to_home_interval();
+        // set_back_to_home_interval(0xFFFFFFFF);
         const power_display_svr_api_t *display_api = power_display_svr_get_api();
         if (display_api->get_screen_state() != SCREEN_ON)
         {
@@ -212,7 +212,7 @@ extern "C"
         }
 #if defined(SUPPORT_POWER_MANAGER)
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[ScreenTurnOff] timeout auto");
-        set_back_to_home_interval(g_interval);
+        // set_back_to_home_interval(g_interval);
         const power_display_svr_api_t *display_api = power_display_svr_get_api();
         display_api->set_screen_set_keepon_timeout(0);
 #endif

diff --git a/tools/dial_converter_tool/dial_lzma/128/vibrantnumber.lzma b/tools/dial_converter_tool/dial_lzma/128/vibrantnumber.lzma
new file mode 100644 (file)
index 0000000..c003d38
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/128/vibrantnumber.lzma differ

diff --git a/tools/dial_converter_tool/instance/128/Succulents.png b/tools/dial_converter_tool/dial_lzma/128/vibrantnumber.png
similarity index 100%
rename from tools/dial_converter_tool/instance/128/Succulents.png
rename to tools/dial_converter_tool/dial_lzma/128/vibrantnumber.png

diff --git a/tools/dial_converter_tool/instance/128/nums/g_0.png b/tools/dial_converter_tool/instance/128/nums/g_0.png
new file mode 100644 (file)
index 0000000..ff27240
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_0.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_1.png b/tools/dial_converter_tool/instance/128/nums/g_1.png
new file mode 100644 (file)
index 0000000..78aadf4
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_1.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_2.png b/tools/dial_converter_tool/instance/128/nums/g_2.png
new file mode 100644 (file)
index 0000000..3fcf337
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_2.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_3.png b/tools/dial_converter_tool/instance/128/nums/g_3.png
new file mode 100644 (file)
index 0000000..0694a42
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_3.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_4.png b/tools/dial_converter_tool/instance/128/nums/g_4.png
new file mode 100644 (file)
index 0000000..29c1025
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_4.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_5.png b/tools/dial_converter_tool/instance/128/nums/g_5.png
new file mode 100644 (file)
index 0000000..e740cc5
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_5.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_6.png b/tools/dial_converter_tool/instance/128/nums/g_6.png
new file mode 100644 (file)
index 0000000..6110f04
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_6.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_7.png b/tools/dial_converter_tool/instance/128/nums/g_7.png
new file mode 100644 (file)
index 0000000..199eaea
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_7.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_8.png b/tools/dial_converter_tool/instance/128/nums/g_8.png
new file mode 100644 (file)
index 0000000..b679d88
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_8.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/g_9.png b/tools/dial_converter_tool/instance/128/nums/g_9.png
new file mode 100644 (file)
index 0000000..bf0b464
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/g_9.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_0.png b/tools/dial_converter_tool/instance/128/nums/w_0.png
new file mode 100644 (file)
index 0000000..04339de
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_0.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_1.png b/tools/dial_converter_tool/instance/128/nums/w_1.png
new file mode 100644 (file)
index 0000000..e305631
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_1.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_2.png b/tools/dial_converter_tool/instance/128/nums/w_2.png
new file mode 100644 (file)
index 0000000..0dc23ce
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_2.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_3.png b/tools/dial_converter_tool/instance/128/nums/w_3.png
new file mode 100644 (file)
index 0000000..d2d8031
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_3.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_4.png b/tools/dial_converter_tool/instance/128/nums/w_4.png
new file mode 100644 (file)
index 0000000..a331ed1
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_4.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_5.png b/tools/dial_converter_tool/instance/128/nums/w_5.png
new file mode 100644 (file)
index 0000000..54eb5ce
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_5.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_6.png b/tools/dial_converter_tool/instance/128/nums/w_6.png
new file mode 100644 (file)
index 0000000..26bb0c5
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_6.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_7.png b/tools/dial_converter_tool/instance/128/nums/w_7.png
new file mode 100644 (file)
index 0000000..54fcd16
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_7.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_8.png b/tools/dial_converter_tool/instance/128/nums/w_8.png
new file mode 100644 (file)
index 0000000..2e4e78d
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_8.png differ

diff --git a/tools/dial_converter_tool/instance/128/nums/w_9.png b/tools/dial_converter_tool/instance/128/nums/w_9.png
new file mode 100644 (file)
index 0000000..f4d259a
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/nums/w_9.png differ

diff --git a/tools/dial_converter_tool/instance/128/vibrantnumber.png b/tools/dial_converter_tool/instance/128/vibrantnumber.png
new file mode 100644 (file)
index 0000000..ad4bf05
Binary files /dev/null and b/tools/dial_converter_tool/instance/128/vibrantnumber.png differ

diff --git a/tools/dial_converter_tool/instance/128/vibrantnumber.xml b/tools/dial_converter_tool/instance/128/vibrantnumber.xml
new file mode 100644 (file)
index 0000000..6b3d371
--- /dev/null
+++ b/tools/dial_converter_tool/instance/128/vibrantnumber.xml
@@ -0,0 +1,10 @@
+<dial title="vibrantnumber" description="活力数字" size="466 466" version="1.0" preview_img="./instance/128/vibrantnumber.png">\r
+\r
+\r
+    <option_img position="66 209" img_names="./instance/128/nums/g_0.png,./instance/128/nums/g_1.png,./instance/128/nums/g_2.png,./instance/128/nums/g_3.png,./instance/128/nums/g_4.png,./instance/128/nums/g_5.png,./instance/128/nums/g_6.png,./instance/128/nums/g_7.png,./instance/128/nums/g_8.png,./instance/128/nums/g_9.png" bind_data="28" ></option_img>\r
+    <option_img position="233 209" img_names="./instance/128/nums/g_0.png,./instance/128/nums/g_1.png,./instance/128/nums/g_2.png,./instance/128/nums/g_3.png,./instance/128/nums/g_4.png,./instance/128/nums/g_5.png,./instance/128/nums/g_6.png,./instance/128/nums/g_7.png,./instance/128/nums/g_8.png,./instance/128/nums/g_9.png" bind_data="29" ></option_img>\r
+\r
+    <option_img position="66 43" img_names="./instance/128/nums/w_0.png,./instance/128/nums/w_1.png,./instance/128/nums/w_2.png,./instance/128/nums/w_3.png,./instance/128/nums/w_4.png,./instance/128/nums/w_5.png,./instance/128/nums/w_6.png,./instance/128/nums/w_7.png,./instance/128/nums/w_8.png,./instance/128/nums/w_9.png" bind_data="26" ></option_img>\r
+    <option_img position="233 43" img_names="./instance/128/nums/w_0.png,./instance/128/nums/w_1.png,./instance/128/nums/w_2.png,./instance/128/nums/w_3.png,./instance/128/nums/w_4.png,./instance/128/nums/w_5.png,./instance/128/nums/w_6.png,./instance/128/nums/w_7.png,./instance/128/nums/w_8.png,./instance/128/nums/w_9.png" bind_data="27" ></option_img>\r
+\r
+</dial>
\ No newline at end of file