1、SGM832A测试电流和功耗不准，还需要继续研究

2、更换默认表盘
3、延长锁屏时间，默认为3分钟，可配置为永久不锁屏
4、系统设置里面增加语言设置，各菜单栏名称靠左对齐
5、删除蓝牙链接的状态提示信息
6、头像界面调整输入输出的图标和数值位置及颜色

application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/res/strvalue.txt

@@ -216,24 +216,24 @@ key_settings_display 214
 key_settings_display_off 215
 key_settings_end 216
 key_settings_media_volume 217
-key_settings_mute 218
-key_settings_mute_tips 219
-key_settings_number 220
-key_settings_open_all_day 221
-key_settings_pointer 222
-key_settings_power_off 223
-key_settings_power_off_tips 224
-key_settings_power_save 225
-key_settings_power_save_msg 226
-key_settings_power_saving_mode_e 227
-key_settings_raise_to_wake 228
-key_settings_recovery 229
-key_settings_reset_confirm 230
-key_settings_restart 231
-key_settings_restart_msg 232
-key_settings_ringing_volume 233
-key_settings_scheduled 234
-key_settings_second 235
+key_settings_minutes 218
+key_settings_mute 219
+key_settings_mute_tips 220
+key_settings_number 221
+key_settings_open_all_day 222
+key_settings_pointer 223
+key_settings_power_off 224
+key_settings_power_off_tips 225
+key_settings_power_save 226
+key_settings_power_save_msg 227
+key_settings_power_saving_mode_e 228
+key_settings_raise_to_wake 229
+key_settings_recovery 230
+key_settings_reset_confirm 231
+key_settings_restart 232
+key_settings_restart_msg 233
+key_settings_ringing_volume 234
+key_settings_scheduled 235
 key_settings_set_date 236
 key_settings_set_time 237
 key_settings_set_time_date 238

application/aem_watch/resource/360x360/bt_watch.ui

@@ -5966,8 +5966,8 @@
                 <element class="string_resource">
                     <property name="name" value="str_display_off" />
                     <property name="id" value="31763" />
-                    <property name="x" value="0x0000" />
-                    <property name="y" value="0x0000" />
+                    <property name="x" value="0x0084" />
+                    <property name="y" value="0x0019" />
                     <property name="width" value="0x0064" />
                     <property name="height" value="0x0014" />
                     <property name="foreground" value="0x00000000" />
@@ -5986,7 +5986,7 @@
                     <property name="name" value="str_display_time" />
                     <property name="id" value="31764" />
                     <property name="x" value="0x0000" />
-                    <property name="y" value="0x0000" />
+                    <property name="y" value="0x006d" />
                     <property name="width" value="0x0064" />
                     <property name="height" value="0x0014" />
                     <property name="foreground" value="0x00000000" />
@@ -5999,14 +5999,14 @@
                     <property name="direction" value="-1" />
                     <property name="space" value="0x0064" />
                     <property name="pixel" value="0x0001" />
-                    <property name="strid" value="key_settings_second" />
+                    <property name="strid" value="key_settings_minutes" />
                 </element>
                 <element class="string_resource">
                     <property name="name" value="str_brightness" />
                     <property name="id" value="31765" />
-                    <property name="x" value="0x0000" />
-                    <property name="y" value="0x0000" />
-                    <property name="width" value="0x0064" />
+                    <property name="x" value="0x006a" />
+                    <property name="y" value="0x0049" />
+                    <property name="width" value="0x0067" />
                     <property name="height" value="0x0014" />
                     <property name="foreground" value="0x00000000" />
                     <property name="background" value="0x00ffffff" />
@@ -6023,9 +6023,9 @@
                 <element class="string_resource">
                     <property name="name" value="str_ok" />
                     <property name="id" value="32031" />
-                    <property name="x" value="0x0000" />
-                    <property name="y" value="0x0000" />
-                    <property name="width" value="0x0064" />
+                    <property name="x" value="0x0025" />
+                    <property name="y" value="0x0034" />
+                    <property name="width" value="0x0061" />
                     <property name="height" value="0x0014" />
                     <property name="foreground" value="0x00000000" />
                     <property name="background" value="0x00ffffff" />
@@ -6887,6 +6887,25 @@
                     <property name="pixel" value="0x0001" />
                     <property name="strid" value="key_settings_power_off_tips" />
                 </element>
+                <element class="string_resource">
+                    <property name="name" value="str_language" />
+                    <property name="id" value="33307" />
+                    <property name="x" value="0x0000" />
+                    <property name="y" value="0x0000" />
+                    <property name="width" value="0x0064" />
+                    <property name="height" value="0x0014" />
+                    <property name="foreground" value="0x00000000" />
+                    <property name="background" value="0x00ffffff" />
+                    <property name="visible" value="0x0001" />
+                    <property name="align" value="0x000e" />
+                    <property name="mode" value="0x0002" />
+                    <property name="size" value="0x000c" />
+                    <property name="scroll" value="0x0" />
+                    <property name="direction" value="-1" />
+                    <property name="space" value="0x0064" />
+                    <property name="pixel" value="0x0001" />
+                    <property name="strid" value="key_setupwizard_language" />
+                </element>
             </element>
             <element class="resgroup_resource">
                 <property name="name" value="res_about" />
@@ -11437,7 +11456,7 @@
                 <property name="PNG_A8" value="0x0000" />
                 <property name="ARGB" value="0x0000" />
                 <element class="layer">
-                    <property name="0" value=".\profile_photo\in白.png" />
+                    <property name="0" value=".\profile_photo\in小.png" />
                 </element>
             </element>
             <element class="picture_resource">
@@ -11452,7 +11471,7 @@
                 <property name="PNG_A8" value="0x0000" />
                 <property name="ARGB" value="0x0000" />
                 <element class="layer">
-                    <property name="0" value=".\profile_photo\out白.png" />
+                    <property name="0" value=".\profile_photo\out小.png" />
                 </element>
             </element>
         </element>
@@ -22811,6 +22830,8 @@
         <picture value=".\bluetooth\蓝牙.png" />
         <picture value=".\bluetooth\连接新手机.png" />
         <picture value=".\applist\png\icon\蓝牙连接.png" />
+        <picture value=".\profile_photo\in小.png" />
+        <picture value=".\profile_photo\out小.png" />
         <txt value="..\multilang_translate_table.xls" />
         <string value="key_setupwizard_language" />
         <string value="key_setupwizard_download_app" />
@@ -23407,5 +23428,6 @@
         <string value="key_settings_set_time_date" />
         <string value="key_settings_set_time" />
         <string value="key_settings_set_date" />
+        <string value="key_settings_minutes" />
     </resource>
 </ui-rad>

application/aem_watch/resource/360x360/bt_watch_enG.c

@@ -436,41 +436,41 @@ static const uint8_t STR_217[] = {0x45, 0x6e, 0x64, 0x0};
 
 static const uint8_t STR_218[] = {0x4d, 0x65, 0x64, 0x69, 0x61, 0x20, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x0}; 
 
-static const uint8_t STR_219[] = {0x4d, 0x75, 0x74, 0x65, 0x0}; 
+static const uint8_t STR_219[] = {0x4d, 0x69, 0x6e, 0x0}; 
 
-static const uint8_t STR_220[] = {0x54, 0x68, 0x65, 0x72, 0x65, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x20, 0x72, 0x69, 0x6e, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 0x6e, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x2c, 0x20, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x61, 0x6c, 0x61, 0x72, 0x6d, 0x73, 0x0}; 
+static const uint8_t STR_220[] = {0x4d, 0x75, 0x74, 0x65, 0x0}; 
 
-static const uint8_t STR_221[] = {0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x0}; 
+static const uint8_t STR_221[] = {0x54, 0x68, 0x65, 0x72, 0x65, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x20, 0x72, 0x69, 0x6e, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 0x6e, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x2c, 0x20, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x61, 0x6c, 0x61, 0x72, 0x6d, 0x73, 0x0}; 
 
-static const uint8_t STR_222[] = {0x4f, 0x70, 0x65, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x64, 0x61, 0x79, 0x0}; 
+static const uint8_t STR_222[] = {0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x0}; 
 
-static const uint8_t STR_223[] = {0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x0}; 
+static const uint8_t STR_223[] = {0x4f, 0x70, 0x65, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x64, 0x61, 0x79, 0x0}; 
 
-static const uint8_t STR_224[] = {0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x66, 0x0}; 
+static const uint8_t STR_224[] = {0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x0}; 
 
-static const uint8_t STR_225[] = {0x53, 0x75, 0x72, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x66, 0x3f, 0x0}; 
+static const uint8_t STR_225[] = {0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x66, 0x0}; 
 
-static const uint8_t STR_226[] = {0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x53, 0x61, 0x76, 0x65, 0x20, 0x4d, 0x6f, 0x64, 0x65, 0x0}; 
+static const uint8_t STR_226[] = {0x53, 0x75, 0x72, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x66, 0x3f, 0x0}; 
 
-static const uint8_t STR_227[] = {0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x73, 0x61, 0x76, 0x65, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x6f, 0x6e, 0x6c, 0x79, 0x20, 0x73, 0x68, 0x6f, 0x77, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x0}; 
+static const uint8_t STR_227[] = {0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x53, 0x61, 0x76, 0x65, 0x20, 0x4d, 0x6f, 0x64, 0x65, 0x0}; 
 
-static const uint8_t STR_228[] = {0x50, 0x72, 0x65, 0x73, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x65, 0x78, 0x69, 0x74, 0x20, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x73, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x0}; 
+static const uint8_t STR_228[] = {0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x73, 0x61, 0x76, 0x65, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x6f, 0x6e, 0x6c, 0x79, 0x20, 0x73, 0x68, 0x6f, 0x77, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x0}; 
 
-static const uint8_t STR_229[] = {0x52, 0x61, 0x69, 0x73, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x77, 0x61, 0x6b, 0x65, 0x0}; 
+static const uint8_t STR_229[] = {0x50, 0x72, 0x65, 0x73, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x65, 0x78, 0x69, 0x74, 0x20, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x73, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x0}; 
 
-static const uint8_t STR_230[] = {0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x0}; 
+static const uint8_t STR_230[] = {0x52, 0x61, 0x69, 0x73, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x77, 0x61, 0x6b, 0x65, 0x0}; 
 
-static const uint8_t STR_231[] = {0x52, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x65, 0x72, 0x61, 0x73, 0x65, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x0}; 
+static const uint8_t STR_231[] = {0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x0}; 
 
-static const uint8_t STR_232[] = {0x52, 0x65, 0x73, 0x74, 0x61, 0x72, 0x74, 0x0}; 
+static const uint8_t STR_232[] = {0x52, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x65, 0x72, 0x61, 0x73, 0x65, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x0}; 
 
-static const uint8_t STR_233[] = {0x53, 0x75, 0x72, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x65, 0x73, 0x74, 0x61, 0x72, 0x74, 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x3f, 0x0}; 
+static const uint8_t STR_233[] = {0x52, 0x65, 0x73, 0x74, 0x61, 0x72, 0x74, 0x0}; 
 
-static const uint8_t STR_234[] = {0x52, 0x69, 0x6e, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x0}; 
+static const uint8_t STR_234[] = {0x53, 0x75, 0x72, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x65, 0x73, 0x74, 0x61, 0x72, 0x74, 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x3f, 0x0}; 
 
-static const uint8_t STR_235[] = {0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x64, 0x0}; 
+static const uint8_t STR_235[] = {0x52, 0x69, 0x6e, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x0}; 
 
-static const uint8_t STR_236[] = {0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x0}; 
+static const uint8_t STR_236[] = {0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x64, 0x0}; 
 
 static const uint8_t STR_237[] = {0x44, 0x61, 0x74, 0x65, 0x0}; 
 
@@ -488,7 +488,7 @@ static const uint8_t STR_243[] = {0x53, 0x74, 0x61, 0x72, 0x74, 0x0};
 
 static const uint8_t STR_244[] = {0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x0}; 
 
-static const uint8_t STR_245[] = {0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x0}; 
+static const uint8_t STR_245[] = {0x50, 0x61, 0x69, 0x72, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x73, 0x0}; 
 
 static const uint8_t STR_246[] = {0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x20, 0x44, 0x6f, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x3f, 0x0}; 
 

application/aem_watch/resource/360x360/bt_watch_sty.h

@@ -331,6 +331,7 @@
 #define  STR_RESTART_TIP    0x77266ae3
 #define  STR_POWER_OFF    0xb196cb25
 #define  STR_POWER_OFF_TIP    0x2eeb391f
+#define  STR_LANGUAGE    0xc1e19d1e
 #define  RES_ABOUT    0x1773fd30
 #define  STR_DEVICE    0x5b10c0de
 #define  STR_MODEL    0x6e71c94f

application/aem_watch/resource/360x360/bt_watch_zhC.c

@@ -436,41 +436,41 @@ static const uint8_t STR_217[] = {0xe7, 0xbb, 0x93, 0xe6, 0x9d, 0x9f, 0xe6, 0x97
 
 static const uint8_t STR_218[] = {0xe5, 0xaa, 0x92, 0xe4, 0xbd, 0x93, 0xe9, 0x9f, 0xb3, 0xe9, 0x87, 0x8f, 0x0}; 
 
-static const uint8_t STR_219[] = {0xe9, 0x9d, 0x99, 0xe9, 0x9f, 0xb3, 0xe6, 0xa8, 0xa1, 0xe5, 0xbc, 0x8f, 0x0}; 
+static const uint8_t STR_219[] = {0xe5, 0x88, 0x86, 0xe9, 0x92, 0x9f, 0x0}; 
 
-static const uint8_t STR_220[] = {0xe5, 0xbc, 0x80, 0xe5, 0x90, 0xaf, 0xe5, 0x90, 0x8e, 0xef, 0xbc, 0x8c, 0xe6, 0x9d, 0xa5, 0xe7, 0x94, 0xb5, 0xe3, 0x80, 0x81, 0xe9, 0x80, 0x9a, 0xe7, 0x9f, 0xa5, 0xe3, 0x80, 0x81, 0xe9, 0x97, 0xb9, 0xe9, 0x92, 0x9f, 0xe6, 0x97, 0xa0, 0xe9, 0x93, 0x83, 0xe5, 0xa3, 0xb0, 0xe6, 0x8f, 0x90, 0xe9, 0x86, 0x92, 0x0}; 
+static const uint8_t STR_220[] = {0xe9, 0x9d, 0x99, 0xe9, 0x9f, 0xb3, 0xe6, 0xa8, 0xa1, 0xe5, 0xbc, 0x8f, 0x0}; 
 
-static const uint8_t STR_221[] = {0xe6, 0x95, 0xb0, 0xe5, 0xad, 0x97, 0x0}; 
+static const uint8_t STR_221[] = {0xe5, 0xbc, 0x80, 0xe5, 0x90, 0xaf, 0xe5, 0x90, 0x8e, 0xef, 0xbc, 0x8c, 0xe6, 0x9d, 0xa5, 0xe7, 0x94, 0xb5, 0xe3, 0x80, 0x81, 0xe9, 0x80, 0x9a, 0xe7, 0x9f, 0xa5, 0xe3, 0x80, 0x81, 0xe9, 0x97, 0xb9, 0xe9, 0x92, 0x9f, 0xe6, 0x97, 0xa0, 0xe9, 0x93, 0x83, 0xe5, 0xa3, 0xb0, 0xe6, 0x8f, 0x90, 0xe9, 0x86, 0x92, 0x0}; 
 
-static const uint8_t STR_222[] = {0xe5, 0x85, 0xa8, 0xe5, 0xa4, 0xa9, 0xe5, 0xbc, 0x80, 0xe5, 0x90, 0xaf, 0x0}; 
+static const uint8_t STR_222[] = {0xe6, 0x95, 0xb0, 0xe5, 0xad, 0x97, 0x0}; 
 
-static const uint8_t STR_223[] = {0xe6, 0x8c, 0x87, 0xe9, 0x92, 0x88, 0x0}; 
+static const uint8_t STR_223[] = {0xe5, 0x85, 0xa8, 0xe5, 0xa4, 0xa9, 0xe5, 0xbc, 0x80, 0xe5, 0x90, 0xaf, 0x0}; 
 
-static const uint8_t STR_224[] = {0xe5, 0x85, 0xb3, 0xe6, 0x9c, 0xba, 0x0}; 
+static const uint8_t STR_224[] = {0xe6, 0x8c, 0x87, 0xe9, 0x92, 0x88, 0x0}; 
 
-static const uint8_t STR_225[] = {0xe7, 0xa1, 0xae, 0xe5, 0xae, 0x9a, 0xe8, 0xa6, 0x81, 0xe5, 0x85, 0xb3, 0xe9, 0x97, 0xad, 0xe8, 0xae, 0xbe, 0xe5, 0xa4, 0x87, 0xe5, 0x90, 0x97, 0xef, 0xbc, 0x9f, 0x0}; 
+static const uint8_t STR_225[] = {0xe5, 0x85, 0xb3, 0xe6, 0x9c, 0xba, 0x0}; 
 
-static const uint8_t STR_226[] = {0xe7, 0x9c, 0x81, 0xe7, 0x94, 0xb5, 0xe6, 0xa8, 0xa1, 0xe5, 0xbc, 0x8f, 0x0}; 
+static const uint8_t STR_226[] = {0xe7, 0xa1, 0xae, 0xe5, 0xae, 0x9a, 0xe8, 0xa6, 0x81, 0xe5, 0x85, 0xb3, 0xe9, 0x97, 0xad, 0xe8, 0xae, 0xbe, 0xe5, 0xa4, 0x87, 0xe5, 0x90, 0x97, 0xef, 0xbc, 0x9f, 0x0}; 
 
-static const uint8_t STR_227[] = {0xe7, 0x9c, 0x81, 0xe7, 0x94, 0xb5, 0xe6, 0xa8, 0xa1, 0xe5, 0xbc, 0x8f, 0xe4, 0xbb, 0x85, 0xe5, 0x8f, 0xaf, 0xe6, 0x9f, 0xa5, 0xe7, 0x9c, 0x8b, 0xe6, 0x97, 0xb6, 0xe9, 0x97, 0xb4, 0xef, 0xbc, 0x8c, 0xe7, 0xa1, 0xae, 0xe5, 0xae, 0x9a, 0xe8, 0xa6, 0x81, 0xe5, 0xbc, 0x80, 0xe5, 0x90, 0xaf, 0xe5, 0x90, 0x97, 0xef, 0xbc, 0x9f, 0x0}; 
+static const uint8_t STR_227[] = {0xe7, 0x9c, 0x81, 0xe7, 0x94, 0xb5, 0xe6, 0xa8, 0xa1, 0xe5, 0xbc, 0x8f, 0x0}; 
 
-static const uint8_t STR_228[] = {0xe9, 0x95, 0xbf, 0xe6, 0x8c, 0x89, 0xe5, 0x8f, 0xaf, 0xe9, 0x80, 0x80, 0xe5, 0x87, 0xba, 0xe7, 0x9c, 0x81, 0xe7, 0x94, 0xb5, 0x0}; 
+static const uint8_t STR_228[] = {0xe7, 0x9c, 0x81, 0xe7, 0x94, 0xb5, 0xe6, 0xa8, 0xa1, 0xe5, 0xbc, 0x8f, 0xe4, 0xbb, 0x85, 0xe5, 0x8f, 0xaf, 0xe6, 0x9f, 0xa5, 0xe7, 0x9c, 0x8b, 0xe6, 0x97, 0xb6, 0xe9, 0x97, 0xb4, 0xef, 0xbc, 0x8c, 0xe7, 0xa1, 0xae, 0xe5, 0xae, 0x9a, 0xe8, 0xa6, 0x81, 0xe5, 0xbc, 0x80, 0xe5, 0x90, 0xaf, 0xe5, 0x90, 0x97, 0xef, 0xbc, 0x9f, 0x0}; 
 
-static const uint8_t STR_229[] = {0xe6, 0x8a, 0xac, 0xe8, 0x85, 0x95, 0xe4, 0xba, 0xae, 0xe5, 0xb1, 0x8f, 0x0}; 
+static const uint8_t STR_229[] = {0xe9, 0x95, 0xbf, 0xe6, 0x8c, 0x89, 0xe5, 0x8f, 0xaf, 0xe9, 0x80, 0x80, 0xe5, 0x87, 0xba, 0xe7, 0x9c, 0x81, 0xe7, 0x94, 0xb5, 0x0}; 
 
-static const uint8_t STR_230[] = {0xe6, 0x81, 0xa2, 0xe5, 0xa4, 0x8d, 0xe5, 0x87, 0xba, 0xe5, 0x8e, 0x82, 0x0}; 
+static const uint8_t STR_230[] = {0xe6, 0x8a, 0xac, 0xe8, 0x85, 0x95, 0xe4, 0xba, 0xae, 0xe5, 0xb1, 0x8f, 0x0}; 
 
-static const uint8_t STR_231[] = {0xe6, 0x81, 0xa2, 0xe5, 0xa4, 0x8d, 0xe5, 0x87, 0xba, 0xe5, 0x8e, 0x82, 0xe5, 0xb0, 0x86, 0xe4, 0xbc, 0x9a, 0xe5, 0x88, 0xa0, 0xe6, 0x8e, 0x89, 0xe8, 0xae, 0xbe, 0xe5, 0xa4, 0x87, 0xe4, 0xb8, 0xad, 0xe7, 0x9a, 0x84, 0xe6, 0x89, 0x80, 0xe6, 0x9c, 0x89, 0xe6, 0x95, 0xb0, 0xe6, 0x8d, 0xae, 0xe3, 0x80, 0x82, 0x0}; 
+static const uint8_t STR_231[] = {0xe6, 0x81, 0xa2, 0xe5, 0xa4, 0x8d, 0xe5, 0x87, 0xba, 0xe5, 0x8e, 0x82, 0x0}; 
 
-static const uint8_t STR_232[] = {0xe9, 0x87, 0x8d, 0xe5, 0x90, 0xaf, 0x0}; 
+static const uint8_t STR_232[] = {0xe6, 0x81, 0xa2, 0xe5, 0xa4, 0x8d, 0xe5, 0x87, 0xba, 0xe5, 0x8e, 0x82, 0xe5, 0xb0, 0x86, 0xe4, 0xbc, 0x9a, 0xe5, 0x88, 0xa0, 0xe6, 0x8e, 0x89, 0xe8, 0xae, 0xbe, 0xe5, 0xa4, 0x87, 0xe4, 0xb8, 0xad, 0xe7, 0x9a, 0x84, 0xe6, 0x89, 0x80, 0xe6, 0x9c, 0x89, 0xe6, 0x95, 0xb0, 0xe6, 0x8d, 0xae, 0xe3, 0x80, 0x82, 0x0}; 
 
-static const uint8_t STR_233[] = {0xe7, 0xa1, 0xae, 0xe5, 0xae, 0x9a, 0xe8, 0xa6, 0x81, 0xe9, 0x87, 0x8d, 0xe5, 0x90, 0xaf, 0xe8, 0xae, 0xbe, 0xe5, 0xa4, 0x87, 0xe5, 0x90, 0x97, 0xef, 0xbc, 0x9f, 0x0}; 
+static const uint8_t STR_233[] = {0xe9, 0x87, 0x8d, 0xe5, 0x90, 0xaf, 0x0}; 
 
-static const uint8_t STR_234[] = {0xe9, 0x93, 0x83, 0xe5, 0xa3, 0xb0, 0xe9, 0x9f, 0xb3, 0xe9, 0x87, 0x8f, 0x0}; 
+static const uint8_t STR_234[] = {0xe7, 0xa1, 0xae, 0xe5, 0xae, 0x9a, 0xe8, 0xa6, 0x81, 0xe9, 0x87, 0x8d, 0xe5, 0x90, 0xaf, 0xe8, 0xae, 0xbe, 0xe5, 0xa4, 0x87, 0xe5, 0x90, 0x97, 0xef, 0xbc, 0x9f, 0x0}; 
 
-static const uint8_t STR_235[] = {0xe5, 0xae, 0x9a, 0xe6, 0x97, 0xb6, 0xe5, 0xbc, 0x80, 0xe5, 0x90, 0xaf, 0x0}; 
+static const uint8_t STR_235[] = {0xe9, 0x93, 0x83, 0xe5, 0xa3, 0xb0, 0xe9, 0x9f, 0xb3, 0xe9, 0x87, 0x8f, 0x0}; 
 
-static const uint8_t STR_236[] = {0xe7, 0xa7, 0x92, 0x0}; 
+static const uint8_t STR_236[] = {0xe5, 0xae, 0x9a, 0xe6, 0x97, 0xb6, 0xe5, 0xbc, 0x80, 0xe5, 0x90, 0xaf, 0x0}; 
 
 static const uint8_t STR_237[] = {0xe6, 0x97, 0xa5, 0xe6, 0x9c, 0x9f, 0x0}; 
 

application/aem_watch/resource/360x360/res_include.h

@@ -906,6 +906,7 @@ typedef enum{
 	ID_KEY_SETTINGS_DISPLAY_OFF,
 	ID_KEY_SETTINGS_END,
 	ID_KEY_SETTINGS_MEDIA_VOLUME,
+	ID_KEY_SETTINGS_MINUTES,
 	ID_KEY_SETTINGS_MUTE,
 	ID_KEY_SETTINGS_MUTE_TIPS,
 	ID_KEY_SETTINGS_NUMBER,
@@ -923,7 +924,6 @@ typedef enum{
 	ID_KEY_SETTINGS_RESTART_MSG,
 	ID_KEY_SETTINGS_RINGING_VOLUME,
 	ID_KEY_SETTINGS_SCHEDULED,
-	ID_KEY_SETTINGS_SECOND,
 	ID_KEY_SETTINGS_SET_DATE,
 	ID_KEY_SETTINGS_SET_TIME,
 	ID_KEY_SETTINGS_SET_TIME_DATE,

application/aem_watch/resource/360x360/res_string_id.c

@@ -221,24 +221,24 @@ res_string_item_t RES_STRING_ID_DIC[420] = {
 		{.key = "key_settings_display_off",		.value = 216},
 		{.key = "key_settings_end",		.value = 217},
 		{.key = "key_settings_media_volume",		.value = 218},
-		{.key = "key_settings_mute",		.value = 219},
-		{.key = "key_settings_mute_tips",		.value = 220},
-		{.key = "key_settings_number",		.value = 221},
-		{.key = "key_settings_open_all_day",		.value = 222},
-		{.key = "key_settings_pointer",		.value = 223},
-		{.key = "key_settings_power_off",		.value = 224},
-		{.key = "key_settings_power_off_tips",		.value = 225},
-		{.key = "key_settings_power_save",		.value = 226},
-		{.key = "key_settings_power_save_msg",		.value = 227},
-		{.key = "key_settings_power_saving_mode_e",		.value = 228},
-		{.key = "key_settings_raise_to_wake",		.value = 229},
-		{.key = "key_settings_recovery",		.value = 230},
-		{.key = "key_settings_reset_confirm",		.value = 231},
-		{.key = "key_settings_restart",		.value = 232},
-		{.key = "key_settings_restart_msg",		.value = 233},
-		{.key = "key_settings_ringing_volume",		.value = 234},
-		{.key = "key_settings_scheduled",		.value = 235},
-		{.key = "key_settings_second",		.value = 236},
+		{.key = "key_settings_minutes",		.value = 219},
+		{.key = "key_settings_mute",		.value = 220},
+		{.key = "key_settings_mute_tips",		.value = 221},
+		{.key = "key_settings_number",		.value = 222},
+		{.key = "key_settings_open_all_day",		.value = 223},
+		{.key = "key_settings_pointer",		.value = 224},
+		{.key = "key_settings_power_off",		.value = 225},
+		{.key = "key_settings_power_off_tips",		.value = 226},
+		{.key = "key_settings_power_save",		.value = 227},
+		{.key = "key_settings_power_save_msg",		.value = 228},
+		{.key = "key_settings_power_saving_mode_e",		.value = 229},
+		{.key = "key_settings_raise_to_wake",		.value = 230},
+		{.key = "key_settings_recovery",		.value = 231},
+		{.key = "key_settings_reset_confirm",		.value = 232},
+		{.key = "key_settings_restart",		.value = 233},
+		{.key = "key_settings_restart_msg",		.value = 234},
+		{.key = "key_settings_ringing_volume",		.value = 235},
+		{.key = "key_settings_scheduled",		.value = 236},
 		{.key = "key_settings_set_date",		.value = 237},
 		{.key = "key_settings_set_time",		.value = 238},
 		{.key = "key_settings_set_time_date",		.value = 239},

application/aem_watch/src/application/bluetooth/aem_bluetooth.c

@@ -109,7 +109,6 @@ static void refresh_list(aem_msg_t *msg)
     {
     #ifndef CONFIG_SIMULATOR
         if (bt_manager_get_ble_state() == BT_STATUS_BLE_CONNECTED)
-    #endif
         {
             str_id = ID_KEY_SETTINGS_BT_CONNECTED;
         }
@@ -117,6 +116,7 @@ static void refresh_list(aem_msg_t *msg)
         {
             str_id = ID_KEY_SETTINGS_BT_DISCONNECTING;
         }
+    #endif
         /*
         if (s_ui->list)
         {
@@ -335,6 +335,11 @@ static void create_ui(void)
             &IMG_SCENE_BLUETOOTH_PIC_BLUETOOTH, res_manager_get_string_from_id(ID_KEY_SETTINGS_BT_HEADSET), NULL);
         if (s_ui->bt)
         {
+            lv_obj_t *label = aem_icon_double_label_switch_item_get_main_label(s_ui->bt);
+            if (label)
+            {
+                lv_obj_set_style_text_align(label, LV_TEXT_ALIGN_LEFT, 0);
+            }
             lv_obj_add_event_cb(s_ui->bt, switch_event_handler, LV_EVENT_SHORT_CLICKED, NULL);
 
             s_ui->bt_switch = aem_icon_double_label_switch_item_get_switch(s_ui->bt);

application/aem_watch/src/application/bluetooth/aem_bluetooth.h

@@ -23,53 +23,7 @@
 #include "aem_data_share.h"
 
 #define SETTINGS_PAD_BOTTOM     AEM_PUB_WIDGET_ITEM_MIN_H
-/*
-typedef enum
-{
-    AEM_RINGTONE,
-    AEM_MEDIA,
-    AEM_VIBRATE,
-    AEM_BRIGHTNESS,
-} aem_regulator_type_e;
 
-typedef enum
-{
-    AEM_TEMPERATURE,
-    AEM_DISTANCE,
-    // AEM_WEIGHT,
-    AEM_UNIT_MAX,
-} aem_unit_type_e;
-
-typedef enum
-{
-    AEM_AOD_START,
-    AEM_AOD_END,
-    AEM_WAKE_START,
-    AEM_WAKE_END,
-    AEM_DND_START,
-    AEM_DND_END,
-    AEM_TIME,
-    AEM_DATE,
-} aem_set_time_type_e;
-
-typedef enum
-{
-    AEM_CONNECT_MORE,
-    AEM_RESET,
-    AEM_RESTART,
-    AEM_POWER_OFF,
-    AEM_BLUETOOTH,
-    AEM_SYSTEM_END,
-} aem_system_type_e;
-
-typedef enum
-{
-    TXT_SCHEDULED,
-    TXT_START_TIME,
-    TXT_END_TIME,
-    TXT_OK,
-} aem_common_txt_e;
-*/
 void aem_bluetooth_app_create(void);
 
 #endif

application/aem_watch/src/application/profile_photo/aem_profile_photo_screen.c

@@ -95,7 +95,7 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
         }
 
         char *in_power_data = aem_auto_release_txt_fmt("%d", day_data.steps);
-        lv_obj_t *in_power_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_WHITE, in_power_data, 50, aem_font_sub());
+        lv_obj_t *in_power_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_BLUE, in_power_data, 50, aem_font_sub());
         //lv_obj_set_style_bg_color(in_power_item, (lv_color_t)LV_COLOR_GREEN, 0);
         //lv_obj_set_style_radius(in_power_item, AEM_SIZE_FACTOR_466(10), 0);
         lv_obj_set_style_width(in_power_item, AEM_SIZE_FACTOR_466(POWER_WIDTH), 0);
@@ -112,12 +112,12 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
         {
             lv_obj_set_style_text_font(in_power_unit_label, aem_font_small(), 0);
             text_canvas_set_text(in_power_unit_label, "W");
-            lv_obj_set_style_text_color(in_power_unit_label, (lv_color_t)LV_COLOR_WHITE, 0);
+            lv_obj_set_style_text_color(in_power_unit_label, (lv_color_t)LV_COLOR_BLUE, 0);
             lv_obj_align(in_power_unit_label, LV_ALIGN_TOP_MID, AEM_SIZE_HOR_FACTOR_466(45), AEM_SIZE_VER_FACTOR_466(18));
         }
 
         char *out_power_data = aem_auto_release_txt_fmt("%d", day_data.steps);
-        lv_obj_t *out_power_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_WHITE, out_power_data, 50, aem_font_sub());
+        lv_obj_t *out_power_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_GREEN, out_power_data, 50, aem_font_sub());
         //lv_obj_set_style_bg_color(out_power_item, (lv_color_t)LV_COLOR_GREEN, 0);
         //lv_obj_set_style_radius(out_power_item, AEM_SIZE_FACTOR_466(10), 0);
         lv_obj_set_style_width(out_power_item, AEM_SIZE_FACTOR_466(POWER_WIDTH), 0);
@@ -134,7 +134,7 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
         {
             lv_obj_set_style_text_font(out_power_unit_label, aem_font_small(), 0);
             text_canvas_set_text(out_power_unit_label, "W");
-            lv_obj_set_style_text_color(out_power_unit_label, (lv_color_t)LV_COLOR_WHITE, 0);
+            lv_obj_set_style_text_color(out_power_unit_label, (lv_color_t)LV_COLOR_GREEN, 0);
             lv_obj_align(out_power_unit_label, LV_ALIGN_TOP_MID, AEM_SIZE_HOR_FACTOR_466(45), AEM_SIZE_VER_FACTOR_466(18));
         }
 

application/aem_watch/src/application/quick_settings/aem_quick_setting.c

@@ -11,7 +11,10 @@
 #include "aem_ble_data_share.h"
 // #include "aem_quick_setting_prompt.h"
 #include "aem_app_comm.h"
-
+#ifndef CONFIG_SIMULATOR
+#include "bt_manager_ble.h"
+#include "bt_manager.h"
+#endif
 #include "aem_bg.h"
 #include "text_canvas.h"
 #include "aem_app_fwk.h"
@@ -282,7 +285,7 @@ static lv_obj_t *create_status_bar(lv_obj_t *par)
         lv_obj_align(link_bg, LV_ALIGN_BOTTOM_MID, AEM_SIZE_FACTOR_466(-quick_status_ble_x), AEM_SIZE_FACTOR_466(quick_status_time_y));
         lv_obj_add_event_cb(link_bg, quick_settings_link_event_cb, LV_EVENT_CLICKED, NULL);
     }
-
+    /*
     quick_settings->ble = simple_img_create(bg);
     if (quick_settings->ble)
     {
@@ -291,7 +294,7 @@ static lv_obj_t *create_status_bar(lv_obj_t *par)
         simple_img_set_angle(quick_settings->ble, quick_max_angle - quick_rotate_angle);
         lv_obj_align(quick_settings->ble, LV_ALIGN_BOTTOM_MID, AEM_SIZE_FACTOR_466(quick_status_ble_x), AEM_SIZE_FACTOR_466(quick_status_ble_y));
     }
-
+    */
     return bg;
 }
 #if 0
@@ -499,11 +502,18 @@ static void on_ui_refresh(aem_msg_t *msg)
         lv_bar_set_value(quick_settings->bat_bar, bat_info->level, LV_ANIM_ON);
     }
 #endif    
+    /*
     if (quick_settings->ble != NULL)
     {
-        simple_img_set_src(quick_settings->ble, get_img[aem_share_get_ble_connect_status()]);
+    #ifndef CONFIG_SIMULATOR
+        os_printk("bt_manager_get_ble_state() = %d \r\n", bt_manager_get_ble_state());
+        os_printk("bt_manager_get_status() = %d \r\n", bt_manager_get_status());
+        simple_img_set_src(quick_settings->ble, get_img[bt_manager_get_ble_state() == BT_STATUS_BLE_CONNECTED?1:0]);
+    #else
+        simple_img_set_src(quick_settings->ble, get_img[0]);
+    #endif    
     }
-
+    */
     simple_img_set_src(quick_settings->link_img, get_img[2]);
 
     if (msg == NULL)

application/aem_watch/src/application/settings/aem_about_watch.c

@@ -157,14 +157,14 @@ static void debug_event_cb(lv_event_t *event)
     {
         aem_activity_run(AEM_SET_LANGUAGE, NULL);
     }
-    //else if (event->current_target == s_ui->set_date)
-    //{
-    //    aem_activity_run(AEM_SET_TIME, (void *)AEM_DATE);
-    //}
-    //else if (event->current_target == s_ui->set_time)
-    //{
-    //   aem_activity_run(AEM_SET_TIME, (void *)AEM_TIME);
-    //}
+    else if (event->current_target == s_ui->set_date)
+    {
+        aem_activity_run(AEM_SET_TIME, (void *)AEM_DATE);
+    }
+    else if (event->current_target == s_ui->set_time)
+    {
+       aem_activity_run(AEM_SET_TIME, (void *)AEM_TIME);
+    }
     else if (event->current_target == s_ui->system_anim)
     {
         aem_activity_run(AEM_SLIDING_EFFECT, NULL);
@@ -256,7 +256,7 @@ static void create_debug_ui(void)
     s_ui->aem_ver = aem_double_label_create(s_ui->bg2, AEM_VERSION, BUILD_TIME);
 
     s_ui->aem_lib = aem_double_label_create(s_ui->bg2, "libgui_fwk", AEM_GUI_FWK_LIB_VER);
-
+    /*
     if (!s_ui->language)
     {
         s_ui->language = aem_double_label_icon_item_create(s_ui->bg2, "language", NULL, NULL);
@@ -265,7 +265,7 @@ static void create_debug_ui(void)
             lv_obj_add_event_cb(s_ui->language, debug_event_cb, LV_EVENT_SHORT_CLICKED, NULL);
         }
     }
-    /*
+    
     if (!s_ui->set_date)
     {
         s_ui->set_date = aem_double_label_icon_item_create(s_ui->bg2, "date", NULL, NULL);

application/aem_watch/src/application/settings/aem_display.c

@@ -82,7 +82,7 @@ static void on_resume(void)
 {
     if (s_ui != NULL && s_ui->time != NULL)
     {
-        text_canvas_set_text_fmt(s_ui->time, "%d %s", aem_share_get_lock_time(), res_manager_get_string_from_id(ID_KEY_SETTINGS_SECOND));
+        text_canvas_set_text_fmt(s_ui->time, "%d %s", aem_share_get_lock_time(), res_manager_get_string_from_id(ID_KEY_SETTINGS_MINUTES));
     }
 }
 

application/aem_watch/src/application/settings/aem_screen_time.c

@@ -73,18 +73,26 @@ static void create_ui(void)
     char *str = strtok(opts, "\n");
     uint8_t i = 0;
 
-    while (str != NULL && i < s_ui->number)
+    while (str != NULL && i < s_ui->number - 1)
     {
         s_ui->time_range[i] = (uint32_t)atoi(str);
         str = strtok(NULL, "\n");
+        s_ui->time_range[i] = s_ui->time_range[i] * 60;  // convert to seconds
         i++;
     }
+    if (i >= s_ui->number - 1)
+        s_ui->time_range[i] = -1;  //never lock
+
     i = 0;
     while (aem_share_get_lock_time() > s_ui->time_range[i])
     {
         i++;
     }
-    if (i >= s_ui->number)
+    if (aem_share_get_lock_time() == 0)
+    {
+        i = SCREEN_CLOCK_TIME_OPTS_NUM - 1;
+    }
+    else if (i >= s_ui->number)
     {
         i = 0;
     }
@@ -97,7 +105,7 @@ static void create_ui(void)
         aem_roller_set_selected(roller, i, LV_ANIM_OFF);
         aem_roller_set_value_changed_event_cb(roller, (aem_roller_event_cb_t)roller_event_cb);
         lv_obj_center(roller);
-        aem_roller_add_unit(roller, res_manager_get_string_from_id(ID_KEY_SETTINGS_SECOND));
+        aem_roller_add_unit(roller, res_manager_get_string_from_id(ID_KEY_SETTINGS_MINUTES));
     }
     s_ui->roller = roller;
 

application/aem_watch/src/application/settings/aem_settings_zoom_item.c

@@ -122,9 +122,9 @@ void aem_settings_zoom_item_set_text(lv_obj_t *item, const char *text)
         lv_obj_center(ext->label);
 
         aem_zoom_label_t *zoom_label = (aem_zoom_label_t *)ext->label;
-        lv_obj_set_width(zoom_label->label_obj, label_w);
-        lv_obj_set_style_text_align(zoom_label->label_obj, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN);
-        text_canvas_set_long_mode(zoom_label->label_obj, TEXT_CANVAS_LONG_WRAP);
+        lv_obj_set_width(zoom_label->label_obj, label_w - PAD_LEFT * 4);
+        lv_obj_set_style_text_align(zoom_label->label_obj, LV_TEXT_ALIGN_LEFT, LV_PART_MAIN);
+        text_canvas_set_long_mode(zoom_label->label_obj, TEXT_CANVAS_LONG_CLIP);
 
         aem_zoom_label_set_text(ext->label, text);
     }

application/aem_watch/src/application/settings/aem_system_operate.c

@@ -18,7 +18,8 @@ static system_operate_ui_t *s_ui = NULL;
 
 static res_string_id_e get_str[4] =
 {
-    ID_KEY_SETTINGS_SYSTEM_CONNECT_TO,
+    //ID_KEY_SETTINGS_SYSTEM_CONNECT_TO,
+    ID_KEY_SETUPWIZARD_LANGUAGE,
     ID_KEY_SETTINGS_RECOVERY,
     ID_KEY_SETTINGS_RESTART,
     ID_KEY_SETTINGS_POWER_OFF,
@@ -41,7 +42,15 @@ static void item_event_handler(lv_event_t *event)
     else
     {
         int id = (int)event->user_data;
-        aem_activity_run(AEM_SET_SYSTEM_TIPS, (void *)id);
+        if (id == 0)
+        {
+            aem_activity_run(AEM_SET_LANGUAGE, NULL);
+        }
+        else
+        {     
+            aem_activity_run(AEM_SET_SYSTEM_TIPS, (void *)id);
+        }
+
     }
 }
 
@@ -64,11 +73,17 @@ static void create_ui(void)
         lv_obj_set_style_pad_bottom(s_ui->page, SETTINGS_PAD_BOTTOM, LV_PART_MAIN);
         aem_title_create(s_ui->page, true, res_manager_get_string_from_id(ID_KEY_SETTINGS_SYSTEM));
 
-        for (int i = AEM_RESET; i < AEM_POWER_OFF; i++)
+        for (int i = 0; i < AEM_POWER_OFF; i++)
         {
             lv_obj_t *item = aem_icon_double_label_item_create(s_ui->page, get_img[i], res_manager_get_string_from_id(get_str[i]), NULL);
             if (item)
             {
+                lv_obj_t *label = aem_icon_double_label_item_get_main_label(item);
+                if (label)
+                {
+                    lv_obj_set_style_text_align(label, LV_TEXT_ALIGN_LEFT, 0);
+                }
+                
                 lv_obj_add_event_cb(item, item_event_handler, LV_EVENT_SHORT_CLICKED, (void *)i);
             }
         }

application/aem_watch/src/user_cfg/data_default_cfg.h

@@ -13,9 +13,9 @@
 #define TIMING_OPEN (0x01)  // 定时开启
 
 // 锁屏时间配置
-#define SCREEN_LOCK_TIME (60)                                      // 熄屏时间
-#define SCREEN_CLOCK_TIME_OPTS_NUM (7)                             // 熄屏时间选项个数
-const static char *s_lock_time_opts = "15\n20\n30\n45\n60\n90\n120"; // 熄屏时间选项
+#define SCREEN_LOCK_TIME (3 * 60)                                      // 熄屏时间
+#define SCREEN_CLOCK_TIME_OPTS_NUM (8)                             // 熄屏时间选项个数
+const static char *s_lock_time_opts = "1\n3\n5\n10\n30\n60\n120\nNever"; // 熄屏时间选项
 
 // 默认系统时间
 const static char *s_def_datetime_str = "2024-03-01 08:00:00"; // 默认系统日期时间字符串

thirdparty/lib/aem/adapter/def_settings/aem_adapter_def_settings.c

@@ -27,11 +27,11 @@ const static aem_language_table_t s_aem_language_table[] =
 #ifndef CONFIG_SIMULATOR
 // 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
 const static uint32_t s_inside_wf[] = {
-    80,
+    79,
 };
 // 预置表盘，文件可删除
 const static uint32_t s_outside_wf[] = {
-    79,
+    80,
 };
 #else
 // 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
@@ -60,11 +60,11 @@ const static uint32_t s_outside_wf[] = {
 #else
 // 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
 const static uint32_t s_inside_wf[] = {
-    80,
+    79,
 };
 // 预置表盘，文件可删除
 const static uint32_t s_outside_wf[] = {
-    79,
+    80,
 };
 #endif
 #endif  // CONFIG_BOARD_ATS3085S4_DEV_WATCH_EXT_NOR

thirdparty/lib/aem/config/aem_project.h

@@ -4,7 +4,7 @@
 #pragma warning(error : 4013)
 #endif
 #define AEM_VERSION "BL_Develop_NOR"
-#define BUILD_TIME "202412131837"
+#define BUILD_TIME "202412231702"
 #define AEM_GUI_FWK_LIB_VER "2.0.0.0"
 #define APP_DOWNLOAD_URL "https://customer.com"
 #define AEM_APP_TRANS_ANIMATION 1

zephyr/drivers/input/sgm832a_acts.c

@@ -121,7 +121,7 @@ static void sgm832_typec_get_data(const struct device *i2c_dev, uint16_t sgm832_
 	static uint16_t read_data[1] = {0};
 	int ret = 0;
 
-	//printk("sgm832 typec%d get data\n", typec_num);
+	printk("sgm832 typec%d get data\n", typec_num);
 
     //00H Configuartion Register
 	ret = i2c_write_read(i2c_dev, sgm832_typec_slaver_addr, write_cmd, 1, read_data, 2);
@@ -131,7 +131,7 @@ static void sgm832_typec_get_data(const struct device *i2c_dev, uint16_t sgm832_
 	}
 	
 	read_data[0] = ((read_data[0]  & 0xFF00) >> 8) + ((read_data[0] & 0x00FF) << 8);
-	//printk("ConfigReg: 0x%04x\n", read_data[0]);
+	printk("ConfigReg: 0x%04x\n", read_data[0]);
 
     //01H Shunt Voltage Register
 	ret = i2c_write_read(i2c_dev, sgm832_typec_slaver_addr, &write_cmd[1], 1, read_data, 2);
@@ -149,7 +149,7 @@ static void sgm832_typec_get_data(const struct device *i2c_dev, uint16_t sgm832_
 	{
 		printk("sgm832 typec%d i2c_write_read Shunt_Voltage ERR\n", typec_num);
 	}
-    //printk("Shunt_Voltage: %.4f mV\n", f_ShuntVoltage[typec_num]);
+    printk("Shunt_Voltage: %.4f mV\n", f_ShuntVoltage[typec_num]);
 	//printk("ConfigReg: 0x%04x, ShuntVoltage: %.4f mV, BusVoltage: %.3f V, Power: 0x%04x, Current: 0x%04x, Calibration: 0x%04x, MaskEnable: 0x%04x, AlertLimit: 0x%04x\n",
 	//		read_data[0], f_ShuntVoltage, f_BusVoltage, read_data[3], read_data[4], read_data[5], read_data[6], read_data[7]);
 
@@ -162,7 +162,7 @@ static void sgm832_typec_get_data(const struct device *i2c_dev, uint16_t sgm832_
 
     read_data[0] = ((read_data[0]  & 0xFF00) >> 8) + ((read_data[0] & 0x00FF) << 8);
     f_BusVoltage[typec_num] = (float)read_data[0] * 1.25 * 0.001;
-	//printk("Bus_Voltage: %.3f V\n", f_BusVoltage[typec_num]);
+	printk("Bus_Voltage: %.3f V\n", f_BusVoltage[typec_num]);
 
     //03H Power Register
     ret = i2c_write_read(i2c_dev, sgm832_typec_slaver_addr, &write_cmd[3], 1, read_data, 2);
@@ -172,8 +172,8 @@ static void sgm832_typec_get_data(const struct device *i2c_dev, uint16_t sgm832_
 	}
 
 	read_data[0] = ((read_data[0]  & 0xFF00) >> 8) + ((read_data[0] & 0x00FF) << 8);
-	f_Power[typec_num] = (float)read_data[0] * 25 * 0.001;  //W
-	//printk("Power: %.3f mW\n", f_Power[typec_num]);
+	f_Power[typec_num] = (float)read_data[0] * 225 * 0.001;  //W
+	printk("Power: %.3f mW\n", f_Power[typec_num]);
 
 	//04H Current Register
     ret = i2c_write_read(i2c_dev, sgm832_typec_slaver_addr, &write_cmd[4], 1, read_data, 2);
@@ -185,13 +185,14 @@ static void sgm832_typec_get_data(const struct device *i2c_dev, uint16_t sgm832_
             read_data[0] = ~read_data[0] + 1;
         }
 
-		f_Current[typec_num] = read_data[0] * 0.001;  //A
+		f_Current[typec_num] = read_data[0] * 0.00009;  //A
 	}
 	else
 	{
 		printk("sgm832 typec%d i2c_write_read Current Register ERR\n", typec_num);
 	}
-	//printk("Current: %.3f mA\n", f_Current[typec_num]);
+	printk("Current data: 0x%04x\n", read_data[0]);
+	printk("Current: %.3f mA\n", f_Current[typec_num]);
 
 	//05H Calibration Register
     ret = i2c_write_read(i2c_dev, sgm832_typec_slaver_addr, &write_cmd[5], 1, read_data, 2);
@@ -201,7 +202,7 @@ static void sgm832_typec_get_data(const struct device *i2c_dev, uint16_t sgm832_
 	}
 
 	read_data[0] = ((read_data[0]  & 0xFF00) >> 8) + ((read_data[0] & 0x00FF) << 8);
-	//printk("Calibration: 0x%04x\n", read_data[0]);
+	printk("Calibration: 0x%04x\n", read_data[0]);
 
 	//06H Mask/Enable Register
     ret = i2c_write_read(i2c_dev, sgm832_typec_slaver_addr, &write_cmd[6], 1, read_data, 2);
@@ -308,8 +309,8 @@ static void sgm832_typec1_get_shuntvoltage(const struct device *i2c_dev)
 static void sgm832_typec_calibration(const struct device *i2c_dev, uint16_t sgm832_typec_slaver_addr, uint8_t typec_num)
 {
     //static uint8_t configurate_write_data[3] = {CONFIGURATION_REGISTER, 0x47, 0x6F};
-	static uint8_t calibrate_write_data0[3] = {CALIBRATION_REGISTER, 0x00, 0xD0};  //typec0, input/output
-	static uint8_t calibrate_write_data1[3] = {CALIBRATION_REGISTER, 0x00, 0xF2};  //typec1, input
+	static uint8_t calibrate_write_data0[3] = {CALIBRATION_REGISTER, 0x07, 0xcd};  //typec0, input/output
+	static uint8_t calibrate_write_data1[3] = {CALIBRATION_REGISTER, 0x07, 0xcd};  //typec1, input
     int ret = 0;
 
 	//ret = i2c_write(i2c_dev, configurate_write_data, 3, sgm832_typec_slaver_addr);