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

str resource

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

  - str resource

  - resource

  - image

Signed-off-by: dingtalk_kaxuzp <2393524978@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/702

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index e52cb31..57c019b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
@@ -519,12 +519,16 @@ enum UIResourceTextId : uint16_t {
     STR_MUSIC_LIST_IS_EMPTY = 506,\r
     STR_BT_HEADSET_RESCAN = 507,\r
     STR_BT_HEADSET_NOFOND = 508,\r
-    STR_MAX_ID = 509,\r
+    STR_SCHEDULE = 509,\r
+    STR_SCHEDULE_TITLE = 510,\r
+    STR_SCHEDULE_NO_DATA = 511,\r
+    STR_SCHEDULE_NO_DATA_PROMPT = 512,\r
+    STR_MAX_ID = 513,\r
 }; // UIResourceTextId\r
 \r
 enum FontLanguageId : uint8_t {\r
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/schedule.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/schedule.bin
new file mode 100644 (file)
index 0000000..950c969
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/schedule.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5954d8cb08578c97fdf033738c3eddb10cb072eabf39008a2f14310a430bf4ac
+size 5544

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index 2d40727..70e58ab 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index 7a74b5d..3a7807b 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -519,12 +519,16 @@ enum UIResourceTextId : uint16_t {
     STR_MUSIC_LIST_IS_EMPTY = 506,\r
     STR_BT_HEADSET_RESCAN = 507,\r
     STR_BT_HEADSET_NOFOND = 508,\r
-    STR_MAX_ID = 509,\r
+    STR_SCHEDULE = 509,\r
+    STR_SCHEDULE_TITLE = 510,\r
+    STR_SCHEDULE_NO_DATA = 511,\r
+    STR_SCHEDULE_NO_DATA_PROMPT = 512,\r
+    STR_MAX_ID = 513,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 6ec39cf..02e059c 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/schedule_no_data.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/schedule_no_data.bin
new file mode 100644 (file)
index 0000000..60569ea
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/schedule_no_data.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23284b2be3f3dd2f4ccdf891d6292d3bad834898f2dfd8b81c95387f9ad7faa8
+size 9624

diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index ee0611c..e38bd7b 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -506,4 +506,8 @@ STR_4G_NOTE$Note: After opening, the power consumption of the watch will be incr
 STR_MUSIC_PLAYER_SOURCE_NOTE$Please enter Music - Music Source from the watch app interface, set it to Mobile Mode and try again\r
 STR_MUSIC_LIST_IS_EMPTY$The current music list is empty, please download and add via APP\r
 STR_BT_HEADSET_RESCAN$Rescan\r
-STR_BT_HEADSET_NOFOND$No headset Bluetooth device can be found
\ No newline at end of file
+STR_BT_HEADSET_NOFOND$No headset Bluetooth device can be found\r
+STR_SCHEDULE$Schedule\r
+STR_SCHEDULE_TITLE$Schedule management\r
+STR_SCHEDULE_NO_DATA$No schedules\r
+STR_SCHEDULE_NO_DATA_PROMPT$Please sync with the APP
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index fe74323..fe0bef7 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -506,4 +506,8 @@ STR_4G_NOTE$注：开启后，手表功耗会提高，待机时间会缩短
 STR_MUSIC_PLAYER_SOURCE_NOTE$请从手表端应用界面进入“音乐”-“音乐来源”，设置为“手机模式”后重试\r
 STR_MUSIC_LIST_IS_EMPTY$当前音乐列表为空请通过APP下载添加\r
 STR_BT_HEADSET_RESCAN$重新搜索\r
-STR_BT_HEADSET_NOFOND$当前搜索不到耳机蓝牙设备
\ No newline at end of file
+STR_BT_HEADSET_NOFOND$当前搜索不到耳机蓝牙设备\r
+STR_SCHEDULE$日程\r
+STR_SCHEDULE_TITLE$日程管理\r
+STR_SCHEDULE_NO_DATA$当前无日程\r
+STR_SCHEDULE_NO_DATA_PROMPT$请先通过APP同步
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index 11c50ce..146df0b 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -508,4 +508,7 @@
        <lanstr id="STR_MUSIC_LIST_IS_EMPTY" value="The current music list is empty, please download and add via APP"/>
        <lanstr id="STR_BT_HEADSET_RESCAN" value="Rescan"/>
        <lanstr id="STR_BT_HEADSET_NOFOND" value="No headset Bluetooth device can be found"/>
+       <lanstr id="STR_SCHEDULE_TITLE" value="Schedule management"/>
+       <lanstr id="STR_SCHEDULE_NO_DATA" value="No schedules"/>
+       <lanstr id="STR_SCHEDULE_NO_DATA_PROMPT" value="Please sync with the APP"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 2b70d68..90dc16f 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -508,4 +508,7 @@
        <lanstr id="STR_MUSIC_LIST_IS_EMPTY" value="当前音乐列表为空请通过APP下载添加"/>
        <lanstr id="STR_BT_HEADSET_RESCAN" value="重新搜索"/>
        <lanstr id="STR_BT_HEADSET_NOFOND" value="当前搜索不到耳机蓝牙设备"/>
+       <lanstr id="STR_SCHEDULE_TITLE" value="日程管理"/>
+       <lanstr id="STR_SCHEDULE_NO_DATA" value="当前无日程"/>
+       <lanstr id="STR_SCHEDULE_NO_DATA_PROMPT" value="请先通过APP同步"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index 2d40727..c6126ec 100644 (file)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ

diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h
index 7a74b5d..3a7807b 100644 (file)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -519,12 +519,16 @@ enum UIResourceTextId : uint16_t {
     STR_MUSIC_LIST_IS_EMPTY = 506,\r
     STR_BT_HEADSET_RESCAN = 507,\r
     STR_BT_HEADSET_NOFOND = 508,\r
-    STR_MAX_ID = 509,\r
+    STR_SCHEDULE = 509,\r
+    STR_SCHEDULE_TITLE = 510,\r
+    STR_SCHEDULE_NO_DATA = 511,\r
+    STR_SCHEDULE_NO_DATA_PROMPT = 512,\r
+    STR_MAX_ID = 513,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 6ec39cf..eca7ab5 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ