From: Caisking <3449750381@qq.com> Date: Wed, 31 Jul 2024 08:48:41 +0000 (+0800) Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: release_V1.2.70_20241020_135402~725 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=84c4b200e0523d275891b5cb4ec65c417b6901e4;p=mirrors%2FFD230.git Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 --- 84c4b200e0523d275891b5cb4ec65c417b6901e4 diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h index 1fabeb861,a2934e90c..33ea86c90 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h @@@ -503,9 -503,8 +503,10 @@@ enum UIResourceTextId : uint16_t STR_MOTION_DETECTION_NOTE = 490, STR_PE4GC = 491, STR_OBU_MESSAGE = 492, - STR_CHARGE = 493, - STR_CHARGE_NOTE = 494, - STR_MAX_ID = 495, + STR_DELETE = 493, - STR_MAX_ID = 494, ++ STR_CHARGE = 494, ++ STR_CHARGE_NOTE = 495, ++ STR_MAX_ID = 496, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index 9de9fec9d,4978d5e57..71b0e9c12 Binary files differ diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index 02262a6ad,41acc3231..165e24295 --- 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 @@@ -485,9 -485,26 +485,28 @@@ enum UIResourceTextId : uint16_t STR_AIMODES_WENXINYIYAN = 472, STR_AIMODES_KIMI = 473, STR_AIMODES_CHATGPT = 474, - STR_CHARGE = 475, - STR_CHARGE_NOTE = 476, - STR_MAX_ID = 477, + STR_SLIDE_TO_SHUTDOWN = 475, + STR_SLIDE_TO_REBOOT = 476, + STR_AI_FAMILY_MEALS = 477, + STR_CHAT = 478, + STR_PCY4GC_OR_AS = 479, + STR_API_KEYS = 480, + STR_PGTTAF = 481, + STR_DAFBS = 482, + STR_OPENAI_API_KEYS = 483, + STR_KHBB = 484, + STR_GTAS = 485, + STR_DYWTDAK = 486, + STR_CONNECTING = 487, + STR_CONNECTION_FAIL = 488, + STR_PTALORTM = 489, + STR_MOTION_DETECTION_NOTE = 490, + STR_PE4GC = 491, + STR_OBU_MESSAGE = 492, + STR_DELETE = 493, - STR_MAX_ID = 494, ++ STR_CHARGE = 494, ++ STR_CHARGE_NOTE = 495, ++ STR_MAX_ID = 496, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index 82dc2cf09,3a642040f..bf97ee6cb Binary files differ diff --cc tools/language_tool/Language_xml/input_list_en.txt index bd842a677,bd842a677..5dd086eee --- a/tools/language_tool/Language_xml/input_list_en.txt +++ b/tools/language_tool/Language_xml/input_list_en.txt @@@ -451,7 -451,7 +451,7 @@@ STR_DEVICE_BINDING_NOTE$XX wants to con STR_EQUIPMENT_UNTYING$Equipment untying STR_EQUIPMENT_UNTYING_NOTE$XX would like to unbind you STR_DRINK_WATER_REMINDER$Drink water reminder --STR_DRINK_WATER_REMINDER_NOTE$Time for some water! And stay hydrated (๑•̀ㅂ•́) ++STR_DRINK_WATER_REMINDER_NOTE$Time for some water! And stay hydrated STR_SEDENTARY_REMINDER$Sedentary reminder STR_SEDENTARY_REMINDER_NOTE$You haven't moved for XX hours. Get up and move. STR_SYSTEM_UPGRADING$System upgrading @@@ -471,5 -471,5 +471,26 @@@ STR_PLEASE_RESTART_CHAT$Please restart STR_CONTINUE_CHAT$Continue the conversation STR_AIMODELS_DOUBAO$Cici STR_AIMODES_WENXINYIYAN$ERNIE Bot --STR_AIMODES_KIMI$Kimi --STR_AIMODES_CHATGPT$ChatGPT ++STR_AIMODES_KIMI$KIMI ++STR_AIMODES_CHATGPT$ChatGPT ++STR_SLIDE_TO_SHUTDOWN$Slide to shutdown >> ++STR_SLIDE_TO_REBOOT$Slide to reboot >> ++STR_AI_FAMILY_MEALS$AI Family Meals ++STR_CHAT$Chat ++STR_PCY4GC_OR_AS$Please check your 4G connection or APP Settings ++STR_API_KEYS$API keys ++STR_PGTTAF$Please go to the APP first ++STR_DAFBS$Device" - "AI Family Bucket" setting ++STR_OPENAI_API_KEYS$OpenAI API keys ++STR_KHBB$API keys have been bound ++STR_GTAS$Please go to APP Settings ++STR_DYWTDAK$Do you want to delete API keys ++STR_CONNECTING$Connecting ++STR_CONNECTION_FAIL$Connection fail ++STR_PTALORTM$Please try again later or replace the model ++STR_MOTION_DETECTION_NOTE$It seems that you are performing XX movement, whether to start recording ++STR_PE4GC$Please enable 4G capability ++STR_OBU_MESSAGE$OBU ++STR_DELETE$Delete ++STR_CHARGE$Charging ++STR_CHARGE_NOTE$Currently charging, do not use detection diff --cc tools/language_tool/Language_xml/input_list_zh.txt index 407425a50,407425a50..a6fa4e21b --- a/tools/language_tool/Language_xml/input_list_zh.txt +++ b/tools/language_tool/Language_xml/input_list_zh.txt @@@ -451,7 -451,7 +451,7 @@@ STR_DEVICE_BINDING_NOTE$XX想要与你è STR_EQUIPMENT_UNTYING$设备解绑 STR_EQUIPMENT_UNTYING_NOTE$XX想要与你进行解绑 STR_DRINK_WATER_REMINDER$喝水提醒 --STR_DRINK_WATER_REMINDER_NOTE$该喝水啦！记得按时保持水分充足(๑•̀ㅂ•́)و✧ ++STR_DRINK_WATER_REMINDER_NOTE$该喝水啦！记得按时保持水分充足 STR_SEDENTARY_REMINDER$久坐提醒 STR_SEDENTARY_REMINDER_NOTE$你已经XX小时未活动了，站起来活动一下吧。 STR_SYSTEM_UPGRADING$系统升级中 @@@ -471,5 -471,5 +471,26 @@@ STR_PLEASE_RESTART_CHAT$请重新开始 STR_CONTINUE_CHAT$继续对话 STR_AIMODELS_DOUBAO$豆包 STR_AIMODES_WENXINYIYAN$文心一言 --STR_AIMODES_KIMI$Kimi --STR_AIMODES_CHATGPT$ChatGPT ++STR_AIMODES_KIMI$KIMI ++STR_AIMODES_CHATGPT$ChatGPT ++STR_SLIDE_TO_SHUTDOWN$滑动关机 >> ++STR_SLIDE_TO_REBOOT$滑动重启 >> ++STR_AI_FAMILY_MEALS$AI 全家桶 ++STR_CHAT$对话 ++STR_PCY4GC_OR_AS$请检查4G连接或APP设置 ++STR_API_KEYS$API keys ++STR_PGTTAF$请先前往APP ++STR_DAFBS$“设备”-“AI全家桶”设置 ++STR_OPENAI_API_KEYS$OpenAI API keys ++STR_KHBB$已绑定API keys ++STR_GTAS$更换请前往APP设置 ++STR_DYWTDAK$是否确认删除API keys ++STR_CONNECTING$正在连接 ++STR_CONNECTION_FAIL$连接失败 ++STR_PTALORTM$请稍后再重试或更换模型 ++STR_MOTION_DETECTION_NOTE$检测到您好像在进行XX运动，是否开始记录 ++STR_PE4GC$请开启4G能力 ++STR_OBU_MESSAGE$OBU ++STR_DELETE$删除 ++STR_CHARGE$正在充电 ++STR_CHARGE_NOTE$当前处于充电中，请勿使用检测 diff --cc tools/language_tool/Language_xml/language_en.xml index be26e19d4,be26e19d4..5eccf31fa --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@@ -452,7 -452,7 +452,7 @@@ -- ++ @@@ -472,6 -472,6 +472,27 @@@ -- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc tools/language_tool/Language_xml/language_zh.xml index 0ea317fce,0ea317fce..d39a0eae9 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@@ -452,7 -452,7 +452,7 @@@ -- ++ @@@ -472,6 -472,6 +472,27 @@@ -- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc tools/language_tool/font/en.lang index a242fedb9,a242fedb9..71b0e9c12 Binary files differ diff --cc tools/language_tool/font/ui_resource_string.h index d7d2106ad,d7d2106ad..165e24295 --- a/tools/language_tool/font/ui_resource_string.h +++ b/tools/language_tool/font/ui_resource_string.h @@@ -485,7 -485,7 +485,28 @@@ enum UIResourceTextId : uint16_t STR_AIMODES_WENXINYIYAN = 472, STR_AIMODES_KIMI = 473, STR_AIMODES_CHATGPT = 474, -- STR_MAX_ID = 475, ++ STR_SLIDE_TO_SHUTDOWN = 475, ++ STR_SLIDE_TO_REBOOT = 476, ++ STR_AI_FAMILY_MEALS = 477, ++ STR_CHAT = 478, ++ STR_PCY4GC_OR_AS = 479, ++ STR_API_KEYS = 480, ++ STR_PGTTAF = 481, ++ STR_DAFBS = 482, ++ STR_OPENAI_API_KEYS = 483, ++ STR_KHBB = 484, ++ STR_GTAS = 485, ++ STR_DYWTDAK = 486, ++ STR_CONNECTING = 487, ++ STR_CONNECTION_FAIL = 488, ++ STR_PTALORTM = 489, ++ STR_MOTION_DETECTION_NOTE = 490, ++ STR_PE4GC = 491, ++ STR_OBU_MESSAGE = 492, ++ STR_DELETE = 493, ++ STR_CHARGE = 494, ++ STR_CHARGE_NOTE = 495, ++ STR_MAX_ID = 496, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --cc tools/language_tool/font/zh.lang index 053d7e382,053d7e382..bf97ee6cb Binary files differ