Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/wearable/fd230app/CMakeLists.txt
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index 1fabeb8,a2934e9..33ea86c
--- 1/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
--- 2/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,\r
      STR_PE4GC = 491,\r
      STR_OBU_MESSAGE = 492,\r
-     STR_CHARGE = 493,\r
-     STR_CHARGE_NOTE = 494,\r
-     STR_MAX_ID = 495,\r
+     STR_DELETE = 493,\r
 -    STR_MAX_ID = 494,\r
++    STR_CHARGE = 494,\r
++    STR_CHARGE_NOTE = 495,\r
++    STR_MAX_ID = 496,\r
  }; // UIResourceTextId\r
  \r
  enum FontLanguageId : uint8_t {\r

diff --cc code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
Simple merge

diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index 9de9fec,4978d5e..71b0e9c
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 02262a6,41acc32..165e242
--- 1/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
--- 2/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,\r
      STR_AIMODES_KIMI = 473,\r
      STR_AIMODES_CHATGPT = 474,\r
-     STR_CHARGE = 475,\r
-     STR_CHARGE_NOTE = 476,\r
-     STR_MAX_ID = 477,\r
+     STR_SLIDE_TO_SHUTDOWN = 475,\r
+     STR_SLIDE_TO_REBOOT = 476,\r
+     STR_AI_FAMILY_MEALS = 477,\r
+     STR_CHAT = 478,\r
+     STR_PCY4GC_OR_AS = 479,\r
+     STR_API_KEYS = 480,\r
+     STR_PGTTAF = 481,\r
+     STR_DAFBS = 482,\r
+     STR_OPENAI_API_KEYS = 483,\r
+     STR_KHBB = 484,\r
+     STR_GTAS = 485,\r
+     STR_DYWTDAK = 486,\r
+     STR_CONNECTING = 487,\r
+     STR_CONNECTION_FAIL = 488,\r
+     STR_PTALORTM = 489,\r
+     STR_MOTION_DETECTION_NOTE = 490,\r
+     STR_PE4GC = 491,\r
+     STR_OBU_MESSAGE = 492,\r
+     STR_DELETE = 493,\r
 -    STR_MAX_ID = 494,\r
++    STR_CHARGE = 494,\r
++    STR_CHARGE_NOTE = 495,\r
++    STR_MAX_ID = 496,\r
  }; // UIResourceTextId\r
  
  enum FontLanguageId : uint8_t {

diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 82dc2cf,3a64204..bf97ee6
Binary files differ

diff --cc code/sdk/drivers/peripheral/config/include/ConfigModel.h
Simple merge

diff --cc tools/language_tool/Language_xml/input_list_en.txt
index bd842a6,bd842a6..5dd086e
--- 1/tools/language_tool/Language_xml/input_list_en.txt
--- 2/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\r
  STR_EQUIPMENT_UNTYING_NOTE$XX would like to unbind you\r
  STR_DRINK_WATER_REMINDER$Drink water reminder\r
--STR_DRINK_WATER_REMINDER_NOTE$Time for some water! And stay hydrated (๑•̀ㅂ•́)\r
++STR_DRINK_WATER_REMINDER_NOTE$Time for some water! And stay hydrated\r
  STR_SEDENTARY_REMINDER$Sedentary reminder\r
  STR_SEDENTARY_REMINDER_NOTE$You haven't moved for XX hours. Get up and move.\r
  STR_SYSTEM_UPGRADING$System upgrading\r
@@@ -471,5 -471,5 +471,26 @@@ STR_PLEASE_RESTART_CHAT$Please restart 
  STR_CONTINUE_CHAT$Continue the conversation\r
  STR_AIMODELS_DOUBAO$Cici\r
  STR_AIMODES_WENXINYIYAN$ERNIE Bot\r
--STR_AIMODES_KIMI$Kimi\r
--STR_AIMODES_CHATGPT$ChatGPT
++STR_AIMODES_KIMI$KIMI\r
++STR_AIMODES_CHATGPT$ChatGPT\r
++STR_SLIDE_TO_SHUTDOWN$Slide to shutdown >>\r
++STR_SLIDE_TO_REBOOT$Slide to reboot >>\r
++STR_AI_FAMILY_MEALS$AI Family Meals\r
++STR_CHAT$Chat\r
++STR_PCY4GC_OR_AS$Please check your 4G connection or APP Settings\r
++STR_API_KEYS$API keys\r
++STR_PGTTAF$Please go to the APP first\r
++STR_DAFBS$Device" - "AI Family Bucket" setting\r
++STR_OPENAI_API_KEYS$OpenAI API keys\r
++STR_KHBB$API keys have been bound\r
++STR_GTAS$Please go to APP Settings\r
++STR_DYWTDAK$Do you want to delete API keys\r
++STR_CONNECTING$Connecting\r
++STR_CONNECTION_FAIL$Connection fail\r
++STR_PTALORTM$Please try again later or replace the model\r
++STR_MOTION_DETECTION_NOTE$It seems that you are performing XX movement, whether to start recording\r
++STR_PE4GC$Please enable 4G capability\r
++STR_OBU_MESSAGE$OBU\r
++STR_DELETE$Delete\r
++STR_CHARGE$Charging\r
++STR_CHARGE_NOTE$Currently charging, do not use detection

diff --cc tools/language_tool/Language_xml/input_list_zh.txt
index 407425a,407425a..a6fa4e2
--- 1/tools/language_tool/Language_xml/input_list_zh.txt
--- 2/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æ\83³è¦\81ä¸\8eä½ è
  STR_EQUIPMENT_UNTYING$设备解绑\r
  STR_EQUIPMENT_UNTYING_NOTE$XX想要与你进行解绑\r
  STR_DRINK_WATER_REMINDER$喝水提醒\r
--STR_DRINK_WATER_REMINDER_NOTE$该喝水啦！记得按时保持水分充足(๑•̀ㅂ•́)و✧\r
++STR_DRINK_WATER_REMINDER_NOTE$该喝水啦！记得按时保持水分充足\r
  STR_SEDENTARY_REMINDER$久坐提醒\r
  STR_SEDENTARY_REMINDER_NOTE$你已经XX小时未活动了，站起来活动一下吧。\r
  STR_SYSTEM_UPGRADING$系统升级中\r
@@@ -471,5 -471,5 +471,26 @@@ STR_PLEASE_RESTART_CHAT$请重新开始
  STR_CONTINUE_CHAT$继续对话\r
  STR_AIMODELS_DOUBAO$豆包\r
  STR_AIMODES_WENXINYIYAN$文心一言\r
--STR_AIMODES_KIMI$Kimi\r
--STR_AIMODES_CHATGPT$ChatGPT
++STR_AIMODES_KIMI$KIMI\r
++STR_AIMODES_CHATGPT$ChatGPT\r
++STR_SLIDE_TO_SHUTDOWN$滑动关机 >>\r
++STR_SLIDE_TO_REBOOT$滑动重启 >>\r
++STR_AI_FAMILY_MEALS$AI 全家桶\r
++STR_CHAT$对话\r
++STR_PCY4GC_OR_AS$请检查4G连接或APP设置\r
++STR_API_KEYS$API keys\r
++STR_PGTTAF$请先前往APP\r
++STR_DAFBS$“设备”-“AI全家桶”设置\r
++STR_OPENAI_API_KEYS$OpenAI API keys\r
++STR_KHBB$已绑定API keys\r
++STR_GTAS$更换请前往APP设置\r
++STR_DYWTDAK$是否确认删除API keys\r
++STR_CONNECTING$正在连接\r
++STR_CONNECTION_FAIL$连接失败\r
++STR_PTALORTM$请稍后再重试或更换模型\r
++STR_MOTION_DETECTION_NOTE$检测到您好像在进行XX运动，是否开始记录\r
++STR_PE4GC$请开启4G能力\r
++STR_OBU_MESSAGE$OBU\r
++STR_DELETE$删除\r
++STR_CHARGE$正在充电\r
++STR_CHARGE_NOTE$当前处于充电中，请勿使用检测

diff --cc tools/language_tool/Language_xml/language_en.xml
index be26e19,be26e19..5eccf31
--- 1/tools/language_tool/Language_xml/language_en.xml
--- 2/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@@ -452,7 -452,7 +452,7 @@@
        <lanstr id="STR_EQUIPMENT_UNTYING" value="Equipment untying"/>
        <lanstr id="STR_EQUIPMENT_UNTYING_NOTE" value="XX would like to unbind you"/>
        <lanstr id="STR_DRINK_WATER_REMINDER" value="Drink water reminder"/>
--      <lanstr id="STR_DRINK_WATER_REMINDER_NOTE" value="Time for some water! And stay hydrated (๑•̀ㅂ•́)"/>
++      <lanstr id="STR_DRINK_WATER_REMINDER_NOTE" value="Time for some water! And stay hydrated"/>
        <lanstr id="STR_SEDENTARY_REMINDER" value="Sedentary reminder"/>
        <lanstr id="STR_SEDENTARY_REMINDER_NOTE" value="You haven't moved for XX hours. Get up and move."/>
        <lanstr id="STR_SYSTEM_UPGRADING" value="System upgrading"/>
@@@ -472,6 -472,6 +472,27 @@@
        <lanstr id="STR_CONTINUE_CHAT" value="Continue the conversation"/>
        <lanstr id="STR_AIMODELS_DOUBAO" value="Cici"/>
        <lanstr id="STR_AIMODES_WENXINYIYAN" value="ERNIE Bot"/>
--      <lanstr id="STR_AIMODES_KIMI" value="Kimi"/>
++      <lanstr id="STR_AIMODES_KIMI" value="KIMI"/>
        <lanstr id="STR_AIMODES_CHATGPT" value="ChatGPT"/>
++      <lanstr id="STR_SLIDE_TO_SHUTDOWN" value="Slide to shutdown &gt;&gt;"/>
++      <lanstr id="STR_SLIDE_TO_REBOOT" value="Slide to reboot &gt;&gt;"/>
++      <lanstr id="STR_AI_FAMILY_MEALS" value="AI Family Meals"/>
++      <lanstr id="STR_CHAT" value="Chat"/>
++      <lanstr id="STR_PCY4GC_OR_AS" value="Please check your 4G connection or APP Settings"/>
++      <lanstr id="STR_API_KEYS" value="API keys"/>
++      <lanstr id="STR_PGTTAF" value="Please go to the APP first"/>
++      <lanstr id="STR_DAFBS" value="Device&quot; - &quot;AI Family Bucket&quot; setting"/>
++      <lanstr id="STR_OPENAI_API_KEYS" value="OpenAI API keys"/>
++      <lanstr id="STR_KHBB" value="API keys have been bound"/>
++      <lanstr id="STR_GTAS" value="Please go to APP Settings"/>
++      <lanstr id="STR_DYWTDAK" value="Do you want to delete API keys"/>
++      <lanstr id="STR_CONNECTING" value="Connecting"/>
++      <lanstr id="STR_CONNECTION_FAIL" value="Connection fail"/>
++      <lanstr id="STR_PTALORTM" value="Please try again later or replace the model"/>
++      <lanstr id="STR_MOTION_DETECTION_NOTE" value="It seems that you are performing XX movement, whether to start recording"/>
++      <lanstr id="STR_PE4GC" value="Please enable 4G capability"/>
++      <lanstr id="STR_OBU_MESSAGE" value="OBU"/>
++      <lanstr id="STR_DELETE" value="Delete"/>
++      <lanstr id="STR_CHARGE" value="Charging"/>
++      <lanstr id="STR_CHARGE_NOTE" value="Currently charging, do not use detection"/>
  </language>

diff --cc tools/language_tool/Language_xml/language_zh.xml
index 0ea317f,0ea317f..d39a0ea
--- 1/tools/language_tool/Language_xml/language_zh.xml
--- 2/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@@ -452,7 -452,7 +452,7 @@@
        <lanstr id="STR_EQUIPMENT_UNTYING" value="设备解绑"/>
        <lanstr id="STR_EQUIPMENT_UNTYING_NOTE" value="XX想要与你进行解绑"/>
        <lanstr id="STR_DRINK_WATER_REMINDER" value="喝水提醒"/>
--      <lanstr id="STR_DRINK_WATER_REMINDER_NOTE" value="该喝水啦！记得按时保持水分充足(๑•̀ㅂ•́)و✧"/>
++      <lanstr id="STR_DRINK_WATER_REMINDER_NOTE" value="该喝水啦！记得按时保持水分充足"/>
        <lanstr id="STR_SEDENTARY_REMINDER" value="久坐提醒"/>
        <lanstr id="STR_SEDENTARY_REMINDER_NOTE" value="你已经XX小时未活动了，站起来活动一下吧。"/>
        <lanstr id="STR_SYSTEM_UPGRADING" value="系统升级中"/>
@@@ -472,6 -472,6 +472,27 @@@
        <lanstr id="STR_CONTINUE_CHAT" value="继续对话"/>
        <lanstr id="STR_AIMODELS_DOUBAO" value="豆包"/>
        <lanstr id="STR_AIMODES_WENXINYIYAN" value="文心一言"/>
--      <lanstr id="STR_AIMODES_KIMI" value="Kimi"/>
++      <lanstr id="STR_AIMODES_KIMI" value="KIMI"/>
        <lanstr id="STR_AIMODES_CHATGPT" value="ChatGPT"/>
++      <lanstr id="STR_SLIDE_TO_SHUTDOWN" value="滑动关机 &gt;&gt;"/>
++      <lanstr id="STR_SLIDE_TO_REBOOT" value="滑动重启 &gt;&gt;"/>
++      <lanstr id="STR_AI_FAMILY_MEALS" value="AI 全家桶"/>
++      <lanstr id="STR_CHAT" value="对话"/>
++      <lanstr id="STR_PCY4GC_OR_AS" value="请检查4G连接或APP设置"/>
++      <lanstr id="STR_API_KEYS" value="API keys"/>
++      <lanstr id="STR_PGTTAF" value="请先前往APP"/>
++      <lanstr id="STR_DAFBS" value="“设备”-“AI全家桶”设置"/>
++      <lanstr id="STR_OPENAI_API_KEYS" value="OpenAI API keys"/>
++      <lanstr id="STR_KHBB" value="已绑定API keys"/>
++      <lanstr id="STR_GTAS" value="更换请前往APP设置"/>
++      <lanstr id="STR_DYWTDAK" value="是否确认删除API keys"/>
++      <lanstr id="STR_CONNECTING" value="正在连接"/>
++      <lanstr id="STR_CONNECTION_FAIL" value="连接失败"/>
++      <lanstr id="STR_PTALORTM" value="请稍后再重试或更换模型"/>
++      <lanstr id="STR_MOTION_DETECTION_NOTE" value="检测到您好像在进行XX运动，是否开始记录"/>
++      <lanstr id="STR_PE4GC" value="请开启4G能力"/>
++      <lanstr id="STR_OBU_MESSAGE" value="OBU"/>
++      <lanstr id="STR_DELETE" value="删除"/>
++      <lanstr id="STR_CHARGE" value="正在充电"/>
++      <lanstr id="STR_CHARGE_NOTE" value="当前处于充电中，请勿使用检测"/>
  </language>

diff --cc tools/language_tool/font/en.lang
index a242fed,a242fed..71b0e9c
Binary files differ

diff --cc tools/language_tool/font/ui_resource_string.h
index d7d2106,d7d2106..165e242
--- 1/tools/language_tool/font/ui_resource_string.h
--- 2/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,\r
      STR_AIMODES_KIMI = 473,\r
      STR_AIMODES_CHATGPT = 474,\r
--    STR_MAX_ID = 475,\r
++    STR_SLIDE_TO_SHUTDOWN = 475,\r
++    STR_SLIDE_TO_REBOOT = 476,\r
++    STR_AI_FAMILY_MEALS = 477,\r
++    STR_CHAT = 478,\r
++    STR_PCY4GC_OR_AS = 479,\r
++    STR_API_KEYS = 480,\r
++    STR_PGTTAF = 481,\r
++    STR_DAFBS = 482,\r
++    STR_OPENAI_API_KEYS = 483,\r
++    STR_KHBB = 484,\r
++    STR_GTAS = 485,\r
++    STR_DYWTDAK = 486,\r
++    STR_CONNECTING = 487,\r
++    STR_CONNECTION_FAIL = 488,\r
++    STR_PTALORTM = 489,\r
++    STR_MOTION_DETECTION_NOTE = 490,\r
++    STR_PE4GC = 491,\r
++    STR_OBU_MESSAGE = 492,\r
++    STR_DELETE = 493,\r
++    STR_CHARGE = 494,\r
++    STR_CHARGE_NOTE = 495,\r
++    STR_MAX_ID = 496,\r
  }; // UIResourceTextId\r
  
  enum FontLanguageId : uint8_t {

diff --cc tools/language_tool/font/zh.lang
index 053d7e3,053d7e3..bf97ee6
Binary files differ