1、about里面显示版本号改为用16进制显示

2、设置语言后调用aem_os_settings_data_write保存设置，重新上电可保留设置
3、系统设置里只保留语言设置，去掉【恢复出厂设置】、【重启设备】功能

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

@@ -128,7 +128,7 @@ static void create_about_ui(void)
     sprintf(str, "%s", info.device_id);
     s_ui->model = aem_double_label_create(s_ui->bg1, res_manager_get_string_from_id(ID_KEY_SETTINGS_ABOUT_MODEL), str);
 
-    sprintf(str, "%d.%d.%d", info.major_v, info.minor_v, info.micro_v);
+    sprintf(str, "%x.%x.%x", info.major_v, info.minor_v, info.micro_v);
     s_ui->version = aem_double_label_create(s_ui->bg1, res_manager_get_string_from_id(ID_KEY_SETTINGS_WATCH_VERSION), str);
     if (s_ui->version != NULL)
     {

application/aem_watch/src/application/settings/aem_set_language.c

@@ -39,6 +39,8 @@ static void item_event_hanlder(lv_event_t *event)
 
     aem_language_type_e lang_type = aem_get_language_id_from_index(index);
     aem_share_set_language(lang_type);
+
+    aem_os_settings_data_write();  //保存设置
 }
 
 static void create_ui(void)

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

@@ -73,7 +73,7 @@ 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 = 0; i < AEM_POWER_OFF; i++)
+        for (int i = 0; i < AEM_RESET; 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)

application/aem_watch/src/user_cfg/device_info_cfg.h

@@ -6,13 +6,13 @@
 #define DMG_LCM  0  //达明光电的LCM
 
 #if DMG_LCM
-#define MAJOR_VERSION 1
-#define MINOR_VERSION 1
-#define MICRO_VERSION 9
+#define MAJOR_VERSION 0X01
+#define MINOR_VERSION 0X01
+#define MICRO_VERSION 0x0A
 #else
-#define MAJOR_VERSION 2
-#define MINOR_VERSION 0
-#define MICRO_VERSION 9
+#define MAJOR_VERSION 0X02
+#define MINOR_VERSION 0X00
+#define MICRO_VERSION 0x0A
 #endif
 
 #define DEVICE_ID "CJ01"//3085

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 "202506251620"
+#define BUILD_TIME "202506271050"
 #define AEM_GUI_FWK_LIB_VER "2.0.0.0"
 #define APP_DOWNLOAD_URL "https://customer.com"
 #define AEM_APP_TRANS_ANIMATION 1