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

增加font文件

* refs/changes/1842/head: (1 commits squashed)

  - 增加font文件

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>
Reviewed-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1842

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 7127be4..6b6ba1f 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
@@ -652,7 +652,9 @@ enum UIResourceTextId : uint16_t {
     STR_RECORD_MAX = 639,\r
     STR_CLEAR_ALL_RECORDS = 640,\r
     STR_DEEPSEEK = 641,\r
-    STR_MAX_ID = 642,\r
+    STR_BP_CHECK = 642,\r
+    STR_BP_CALIBRATE = 643,\r
+    STR_MAX_ID = 644,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

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 2bfb736..1bf0019 100755 (executable)
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 7127be4..6b6ba1f 100755 (executable)
--- 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
@@ -652,7 +652,9 @@ enum UIResourceTextId : uint16_t {
     STR_RECORD_MAX = 639,\r
     STR_CLEAR_ALL_RECORDS = 640,\r
     STR_DEEPSEEK = 641,\r
-    STR_MAX_ID = 642,\r
+    STR_BP_CHECK = 642,\r
+    STR_BP_CALIBRATE = 643,\r
+    STR_MAX_ID = 644,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

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 056633b..7d44125 100755 (executable)
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/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index a6b602e..9b983a0 100755 (executable)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -641,4 +641,6 @@ STR_DELETE_ALL$Clear all
 STR_FRE_CONTACT$Frequent contact\r
 STR_RECORD_MAX$The recording space is full\r
 STR_CLEAR_ALL_RECORDS$Clear all records\r
-STR_DEEPSEEK$DEEPSEEK
\ No newline at end of file
+STR_DEEPSEEK$DEEPSEEK\r
+STR_BP_CHECK$Blood pressure measurement\r
+STR_BP_CALIBRATE$Blood pressure calibration
\ 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 5e20a09..9e733bc 100755 (executable)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -641,4 +641,6 @@ STR_DELETE_ALL$全部清除
 STR_FRE_CONTACT$常用联系人\r
 STR_RECORD_MAX$录音空间已满\r
 STR_CLEAR_ALL_RECORDS$清除全部记录\r
-STR_DEEPSEEK$DEEPSEEK
\ No newline at end of file
+STR_DEEPSEEK$DEEPSEEK\r
+STR_BP_CHECK$血压测量\r
+STR_BP_CALIBRATE$血压校准
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx
index f632fd5..9542406 100755 (executable)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index c079f16..729d149 100755 (executable)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -643,4 +643,6 @@
        <lanstr id="STR_RECORD_MAX" value="The recording space is full"/>
        <lanstr id="STR_CLEAR_ALL_RECORDS" value="Clear all records"/>
        <lanstr id="STR_DEEPSEEK" value="DEEPSEEK"/>
+       <lanstr id="STR_BP_CHECK" value="Blood pressure measurement"/>
+       <lanstr id="STR_BP_CALIBRATE" value="Blood pressure calibration"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 2c69e63..9487ded 100755 (executable)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -643,4 +643,6 @@
        <lanstr id="STR_RECORD_MAX" value="录音空间已满"/>
        <lanstr id="STR_CLEAR_ALL_RECORDS" value="清除全部记录"/>
        <lanstr id="STR_DEEPSEEK" value="DEEPSEEK"/>
+       <lanstr id="STR_BP_CHECK" value="血压测量"/>
+       <lanstr id="STR_BP_CALIBRATE" value="血压校准"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index 2bfb736..1bf0019 100755 (executable)
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 7127be4..6b6ba1f 100755 (executable)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -652,7 +652,9 @@ enum UIResourceTextId : uint16_t {
     STR_RECORD_MAX = 639,\r
     STR_CLEAR_ALL_RECORDS = 640,\r
     STR_DEEPSEEK = 641,\r
-    STR_MAX_ID = 642,\r
+    STR_BP_CHECK = 642,\r
+    STR_BP_CALIBRATE = 643,\r
+    STR_MAX_ID = 644,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 056633b..7d44125 100755 (executable)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ