AI界面添加deepseek和九天多国语言，打开恢复出厂设置接口

diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
index c64cc04..770e095 100644 (file)
--- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@ -504,10 +504,10 @@ static void thread_main(const void *unused)
 #endif\r
 \r
 \r
-// #ifdef CUSTOM_UTILS\r
-//     uapi_custom_cmd_service_init();\r
-//     uapi_custom_fileoperate_service_init();\r
-// #endif\r
+#ifdef CUSTOM_UTILS\r
+    uapi_custom_cmd_service_init();\r
+    // uapi_custom_fileoperate_service_init();\r
+#endif\r
 \r
 \r
 #ifdef SUPPORT_CAT1_SERVICE\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
index 37c2407..1094f32 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
@@ -90,22 +90,7 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
-        //TOOD: 待优化
-        if(labelconfig.textId == STR_DEEPSEEK) {
-            label->SetText("DeepSeek");
-        }else if(labelconfig.textId == STR_AIMODES_LINGXI) {
-            int language = ConfigModel::GetInstance()->GetLanguage();
-            if (language == 0) // 如果当前系统为中文
-            {
-                label->SetText("九天大模型");
-            }
-            else
-            {
-                label->SetText("jiutian");
-            }
-        } else{
-            label->SetTextId(labelconfig.textId);
-        }
+        label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetRollSpeed(23);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -290,22 +275,7 @@ namespace OHOS
     {
         if (title)
         {
-            if(textId == STR_DEEPSEEK) {
-                title->SetText("DeepSeek");
-             }else if(textId == STR_AIMODES_LINGXI) {
-                int language = ConfigModel::GetInstance()->GetLanguage();
-                if (language == 0) // 如果当前系统为中文
-                {
-                    title->SetText("九天大模型");
-                }
-                else
-                {
-                    title->SetText("jiutian");
-                }
-            } else{
-                title->SetTextId(textId);
-            }
-
+            title->SetTextId(textId);
             title->ForceResetText();
         }
     }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
index e5922c9..5ee1d28 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
@@ -154,22 +154,7 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
-        //TOOD: 待优化
-        if(labelconfig.textId == STR_DEEPSEEK) {
-            label->SetText("DeepSeek");
-        }else if(labelconfig.textId == STR_AIMODES_LINGXI) {
-            int language = ConfigModel::GetInstance()->GetLanguage();
-            if (language == 0) // 如果当前系统为中文
-            {
-                label->SetText("九天大模型");
-            }
-            else
-            {
-                label->SetText("jiutian");
-            }
-        } else{
-            label->SetTextId(labelconfig.textId);
-        }
+        label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetRollSpeed(23);
@@ -915,22 +900,7 @@ namespace OHOS
         int textId = AiVoiceModel::GetInstance().GetAiModelTextId();
         if (title)
         {
-            if(textId == STR_DEEPSEEK) {
-                title->SetText("DeepSeek");
-             }else if(textId == STR_AIMODES_LINGXI) {
-                int language = ConfigModel::GetInstance()->GetLanguage();
-                if (language == 0) // 如果当前系统为中文
-                {
-                    title->SetText("九天大模型");
-                }
-                else
-                {
-                    title->SetText("jiutian");
-                }
-            } else{
-                title->SetTextId(textId);
-            }
-
+            title->SetTextId(textId);
             title->ForceResetText();
         }
         if (aiModelImage)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
index 517752f..fab01cc 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
@@ -82,22 +82,7 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
-        //TOOD: 待优化
-        if(labelconfig.textId == STR_DEEPSEEK) {
-            label->SetText("DeepSeek");
-         }else if(labelconfig.textId == STR_AIMODES_LINGXI) {
-            int language = ConfigModel::GetInstance()->GetLanguage();
-            if (language == 0) // 如果当前系统为中文
-            {
-                label->SetText("九天大模型");
-            }
-            else
-            {
-                label->SetText("jiutian");
-            }
-        } else{
-            label->SetTextId(labelconfig.textId);
-        }
+        label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
@@ -281,22 +266,7 @@ namespace OHOS
     {
         if (title)
         {
-            if(textId == STR_DEEPSEEK) {
-                title->SetText("DeepSeek");
-             }else if(textId == STR_AIMODES_LINGXI) {
-                int language = ConfigModel::GetInstance()->GetLanguage();
-                if (language == 0) // 如果当前系统为中文
-                {
-                    title->SetText("九天大模型");
-                }
-                else
-                {
-                    title->SetText("jiutian");
-                }
-            } else{
-                title->SetTextId(textId);
-            }
-
+            title->SetTextId(textId);
             title->ForceResetText();
         }
     }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
index 4f96464..01423d8 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
@@ -90,22 +90,7 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
-         //TOOD: 待优化
-         if(labelconfig.textId == STR_DEEPSEEK) {
-            label->SetText("DeepSeek");
-        }else if(labelconfig.textId == STR_AIMODES_LINGXI) {
-            int language = ConfigModel::GetInstance()->GetLanguage();
-            if (language == 0) // 如果当前系统为中文
-            {
-                label->SetText("九天大模型");
-            }
-            else
-            {
-                label->SetText("jiutian");
-            }
-        } else{
-            label->SetTextId(labelconfig.textId);
-        }
+        label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetRollSpeed(23);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -291,22 +276,7 @@ namespace OHOS
     {
         if (title)
         {
-            if(textId == STR_DEEPSEEK) {
-                title->SetText("DeepSeek");
-             }else if(textId == STR_AIMODES_LINGXI) {
-                int language = ConfigModel::GetInstance()->GetLanguage();
-                if (language == 0) // 如果当前系统为中文
-                {
-                    title->SetText("九天大模型");
-                }
-                else
-                {
-                    title->SetText("jiutian");
-                }
-            } else{
-                title->SetTextId(textId);
-            }
-
+            title->SetTextId(textId);
             title->ForceResetText();
         }
     }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp
index 1e0b85d..e81a42d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp
@@ -126,22 +126,7 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeight);
-        //TOOD: 待优化
-        if(labelconfig.textId == STR_DEEPSEEK) {
-            label->SetText("DeepSeek");
-        }else if(labelconfig.textId == STR_AIMODES_LINGXI) {
-            int language = ConfigModel::GetInstance()->GetLanguage();
-            if (language == 0) // 如果当前系统为中文
-            {
-                label->SetText("九天大模型");
-            }
-            else
-            {
-                label->SetText("jiutian");
-            }
-        } else{
-            label->SetTextId(labelconfig.textId);
-        }
+        label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
@@ -364,22 +349,7 @@ namespace OHOS
     {
         if (title)
         {
-            if(textId == STR_DEEPSEEK) {
-                title->SetText("DeepSeek");
-             }else if(textId == STR_AIMODES_LINGXI) {
-                int language = ConfigModel::GetInstance()->GetLanguage();
-                if (language == 0) // 如果当前系统为中文
-                {
-                    title->SetText("九天大模型");
-                }
-                else
-                {
-                    title->SetText("jiutian");
-                }
-            } else{
-                title->SetTextId(textId);
-            }
-
+            title->SetTextId(textId);
             title->ForceResetText();
         }
     }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index eeaf223..a2216b6 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -516,12 +516,16 @@ extern "C"
             if ((curTime->tm_hour == wake_time_hour && curTime->tm_min == wake_time_min && curTime->tm_sec == 0) ||\r
                 (curTime->tm_hour == sleep_time_hour && curTime->tm_min == sleep_time_min && curTime->tm_sec == 0) && curTime->tm_min)\r
             {\r
+                #ifdef CUSTOM_UTILS\r
                 uapi_cywee_time_sync();\r
+                #endif\r
             }\r
             else if (!time_sync_flag && curTime->tm_min)\r
             {\r
                 time_sync_flag = 1;\r
+                #ifdef CUSTOM_UTILS\r
                 uapi_cywee_time_sync();\r
+                #endif\r
             }\r
             // 退出睡眠检测模式并进入小睡检测模式\r
             if (!is_time_range(*curTime, sleep_time_hour, sleep_time_min, wake_time_hour, wake_time_min) && (uapi_dev_runtime_get_nap_monitoring_status() == 0))\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h
index 61fa326..63c3ef8 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h
@@ -37,9 +37,6 @@ namespace OHOS
         virtual ~SystemPresenter();\r
 \r
         void OnStart() override;\r
-        void OnPause() override;\r
-        void OnResume() override;\r
-        void OnStop() override;\r
 \r
         static SystemPresenter *GetInstance();\r
 \r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemPresenter.cpp
index aaf1c2c..72a45da 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemPresenter.cpp
@@ -47,28 +47,7 @@ namespace OHOS
         return g_pSystemPresenter;\r
     }\r
 \r
-    void SystemPresenter::OnStart()\r
-    {\r
-\r
-        Presenter<SystemView>::OnStart();\r
-    }\r
-\r
-    void SystemPresenter::OnPause(void)\r
-    {\r
-        Presenter<SystemView>::OnPause();\r
-    }\r
-\r
-    void SystemPresenter::OnResume(void)\r
-    {\r
-\r
-        Presenter<SystemView>::OnResume();\r
-    }\r
-\r
-    void SystemPresenter::OnStop(void)\r
-    {\r
-\r
-        Presenter<SystemView>::OnStop();\r
-    }\r
+    void SystemPresenter::OnStart(){}\r
 \r
     static uint32_t time = 0;\r
     static uint32_t OnClick_num = 0;\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp
index 24d03ec..96dab4b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp
@@ -664,16 +664,15 @@ void HandleUpdateDialState(Request *request)
 void HandleUpdatelcdMode(int type)
 {
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateSilentMode");
-    GraphicService::GetInstance()->PostGraphicEvent(
-        std::bind(&OHOS::testModel::testModelupdata, OHOS::testModel::GetInstance(), type));
+    // GraphicService::GetInstance()->PostGraphicEvent(
+    //     std::bind(&OHOS::testModel::testModelupdata, OHOS::testModel::GetInstance(), type));
 }
 
 static void HandleUpdateAlarmInfo(Request *request)
 {
-    #ifdef fd230_650
+    WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateAlarmInfo");
     GraphicService::GetInstance()->PostGraphicEvent(
         std::bind(&OHOS::AlarmClockModel::UpdateAlarmInfoByAppSet, OHOS::AlarmClockModel::GetInstance()));
-    #endif
 }
 
 static void HandleUpdateGoalInfo(Request *request)

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index e6aa1ce..6e9e5e0 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -337,7 +337,7 @@ target = {
             'BOARD_FD230',
             'FT_SINGLE_UART',
             'CONFIG_EFUSE_READ_TO_RAM',
-             #'CUSTOM_UTILS',
+             'CUSTOM_UTILS',
             # 'CUSTOM_HID_SERVICE',
             # 'WEARABLE_LOG_DEBUG',
             'SUPPORT_RC_CALIBRATION',

diff --git a/code/sdk/files/fd230/fs/user/res/font/en.lang b/code/sdk/files/fd230/fs/user/res/font/en.lang
index e16d0c4..e737dab 100644 (file)
Binary files a/code/sdk/files/fd230/fs/user/res/font/en.lang and b/code/sdk/files/fd230/fs/user/res/font/en.lang differ

diff --git a/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
index 05a9b80..64565ce 100644 (file)
--- a/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
@@ -651,7 +651,9 @@ enum UIResourceTextId : uint16_t {
     STR_FRE_CONTACT = 638,\r
     STR_RECORD_MAX = 639,\r
     STR_CLEAR_ALL_RECORDS = 640,\r
-    STR_MAX_ID = 641,\r
+    STR_DEEPSEEK = 641,\r
+    STR_AIMODES_LINGXI = 642,\r
+    STR_MAX_ID = 643,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/files/fd230/fs/user/res/font/zh.lang b/code/sdk/files/fd230/fs/user/res/font/zh.lang
index 2e9368a..2fd356c 100644 (file)
Binary files a/code/sdk/files/fd230/fs/user/res/font/zh.lang and b/code/sdk/files/fd230/fs/user/res/font/zh.lang differ

diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index a4b50da..b82d679 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -2375,6 +2375,7 @@ void uapi_restore_factory_setting(void)
                         "/user/log/",//离线日志
                         "/user/app_store/",//应用市场安装包文件
                         "/user/app/",//应用文件解压文件
+                        "/user/alipay/",//支付宝文件
                     };
 
 #else
@@ -2910,6 +2911,14 @@ void uapi_cywee_reset_daily_data(void)
     #endif
 }
 
+//cywee时间更新
+void uapi_cywee_time_sync(void)
+{
+    #ifdef CYWEE_SPORT
+    do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TIME_SYNC,NULL);
+    #endif
+}
+
 void uapi_cywee_get_id(uint8_t *id)
 {
     custom_i2c_read_regs(0x19,0x0FU,1,id,1,I2C_BUS_2);

diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index 3b89c68..ffafb47 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -640,4 +640,6 @@ STR_CALL_LIST$Call log
 STR_DELETE_ALL$Clear all\r
 STR_FRE_CONTACT$Frequent contact\r
 STR_RECORD_MAX$The recording space is full\r
-STR_CLEAR_ALL_RECORDS$Clear all records
\ No newline at end of file
+STR_CLEAR_ALL_RECORDS$Clear all records\r
+STR_DEEPSEEK$DeepSeek\r
+STR_AIMODES_LINGXI$jiutian 
\ 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 27a1119..a0be7d7 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -640,4 +640,6 @@ STR_CALL_LIST$通话记录
 STR_DELETE_ALL$全部清除\r
 STR_FRE_CONTACT$常用联系人\r
 STR_RECORD_MAX$录音空间已满\r
-STR_CLEAR_ALL_RECORDS$清除全部记录
\ No newline at end of file
+STR_CLEAR_ALL_RECORDS$清除全部记录\r
+STR_DEEPSEEK$DeepSeek\r
+STR_AIMODES_LINGXI$九天大模型
\ 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 d19277e..214b009 100644 (file)
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 71b1e8c..ca5ed51 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -642,4 +642,6 @@
        <lanstr id="STR_FRE_CONTACT" value="Frequent contact"/>
        <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_AIMODES_LINGXI" value="jiutian"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 19692f1..ecc5343 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -642,4 +642,6 @@
        <lanstr id="STR_FRE_CONTACT" value="常用联系人"/>
        <lanstr id="STR_RECORD_MAX" value="录音空间已满"/>
        <lanstr id="STR_CLEAR_ALL_RECORDS" value="清除全部记录"/>
+       <lanstr id="STR_DEEPSEEK" value="DeepSeek"/>
+       <lanstr id="STR_AIMODES_LINGXI" value="九天大模型"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index e16d0c4..e737dab 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 05a9b80..64565ce 100644 (file)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -651,7 +651,9 @@ enum UIResourceTextId : uint16_t {
     STR_FRE_CONTACT = 638,\r
     STR_RECORD_MAX = 639,\r
     STR_CLEAR_ALL_RECORDS = 640,\r
-    STR_MAX_ID = 641,\r
+    STR_DEEPSEEK = 641,\r
+    STR_AIMODES_LINGXI = 642,\r
+    STR_MAX_ID = 643,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 2e9368a..2fd356c 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ

diff --git a/tools/language_tool/make_language.sh b/tools/language_tool/make_language.sh
index 2106659..08b3cab 100644 (file)
--- a/tools/language_tool/make_language.sh
+++ b/tools/language_tool/make_language.sh
@@ -35,7 +35,7 @@ echo "脚本生成文件执行完成。"
 cp ../font/ui_resource_string.h  ../../../code/sdk/application/wearable/fd230app/nativelauncher/include/
 
 #复制资源文件  
-cp -r ../font  ../../../code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/
+cp -r ./font  ../../code/sdk/files/fd230/fs/user/res/
 
 #打印完成信息  
 echo "脚本复制文件执行完成。"