删除蓝牙/二维码的功能

application/aem_watch/simulator/LVGL.Simulator/bt_watch_simulator.c

@@ -655,7 +655,7 @@ aem_launch_desc_t aem_launch_db_begin[] =
 aem_launch_desc_t *aem_launch_db_end = NULL;
 
 extern const aem_quick_setting_ops_t quick_setting_app_settings_ops;
-extern const aem_quick_setting_ops_t quick_setting_app_bluetooth_setting_ops;
+//extern const aem_quick_setting_ops_t quick_setting_app_bluetooth_setting_ops;
 extern const aem_quick_setting_ops_t quick_setting_display_off_ops;
 #if 0
 extern const aem_quick_setting_ops_t quick_setting_mute_mode_ops;
@@ -678,10 +678,10 @@ aem_quick_setting_desc_t aem_quick_setting_db_begin[] =
             .op = &quick_setting_app_settings_ops,
         },
 
-        {
-            .priority = AEM_QUICK_SETTING_BLUETOOTH_SETTING,
-            .op = &quick_setting_app_bluetooth_setting_ops,
-        },
+        //{
+        //    .priority = AEM_QUICK_SETTING_BLUETOOTH_SETTING,
+        //    .op = &quick_setting_app_bluetooth_setting_ops,
+        //},
 
 #if CONFIG_AEM_APPLICATION_LOCAL_MUSIC
         {

application/aem_watch/src/application/boot_binding/aem_boot_binding.c

@@ -32,6 +32,7 @@
 #include "aem_pop_service.h"
 #include "aem_pop_window_id.h"
 #include "aem_app_comm.h"
+#include "aem_ble_data_share.h"
 
 #define LV_COLOR_BLACK lv_color_hex(0x000000)
 #define LV_COLOR_GREEN lv_color_hex(0x008000)
@@ -70,7 +71,12 @@ static void item_event_handler(lv_event_t *e)
     int index = (int)e->user_data;
     aem_language_type_e lang_type = aem_get_language_id_from_index(index);
     aem_share_set_language(lang_type);
-    aem_activity_run(AEM_BIND_MAIN, NULL);
+    //aem_activity_run(AEM_BIND_MAIN, NULL);
+#ifndef CONFIG_SIMULATOR
+    aem_share_set_bind_status(BINDING);
+#endif    
+    aem_app_run(AEM_APP_ID_LAUNCH);
+    aem_app_close(AEM_APP_ID_BOOT_BINDING);
 }
 
 static void boot_binding_language_setlect_create(void)

application/aem_watch/src/application/in_out_power/aem_in_out_power_screen.c

@@ -465,14 +465,14 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
             lv_img_set_src(out_icon, &IMG_SCENE_IN_OUT_POWER_PIC_OUT);
             lv_obj_align(out_icon, LV_ALIGN_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(-20), AEM_SIZE_VER_FACTOR_466(80));
         }
-        
+        /*  //delete QR code link
         lv_obj_t *link_icon = lv_img_create(arc_bg);
         if (link_icon)
         {
             lv_img_set_src(link_icon, &IMG_SCENE_IN_OUT_POWER_PIC_LINK);
             lv_obj_align(link_icon, LV_ALIGN_BOTTOM_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(-15));
         } 
-
+        */
         // lv_obj_t *link_bg = aem_bg_create(arc_bg, AEM_SIZE_HOR_FACTOR_466(120), AEM_SIZE_VER_FACTOR_466(80), lv_color_white());
         // if (link_bg)
         // {

application/aem_watch/src/application/in_out_power/aem_input_power_screen.c

@@ -336,14 +336,14 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
             lv_obj_set_style_img_opa(in_bg_icon6, BG_ICON6_IMG_OPA, 0);
         }
         //==========================================================================================//
-        
+        /*  //delete QR code link
         lv_obj_t *link_icon = lv_img_create(arc_bg);
         if (link_icon)
         {
             lv_img_set_src(link_icon, &IMG_SCENE_IN_OUT_POWER_PIC_LINK);
             lv_obj_align(link_icon, LV_ALIGN_BOTTOM_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(-15));
         } 
-
+        */
         // lv_obj_t *link_bg = aem_bg_create(arc_bg, AEM_SIZE_HOR_FACTOR_466(120), AEM_SIZE_VER_FACTOR_466(80), lv_color_white());
         // if (link_bg)
         // {

application/aem_watch/src/application/in_out_power/aem_widget_in_out_power.c

@@ -20,14 +20,14 @@
 typedef struct
 {
     lv_obj_t *bg;
-    lv_obj_t *link_bg;
+    //lv_obj_t *link_bg;
     lv_timer_t *timer;
 } aem_wf_in_out_power_t;
 
 static aem_wf_in_out_power_t *s_wf_in_out_power = NULL;
 
 static bool in_out_value_show_flag = false;
-
+/*
 static void link_icon_event_cb(lv_event_t* event)
 {
     //printk("link_icon_event_cb\n");
@@ -38,7 +38,7 @@ static void link_icon_event_cb(lv_event_t* event)
         //aem_app_close(AEM_APP_ID_input_power);
     }
 }
-
+*/
 static void timer_cb(lv_timer_t *t)
 {
     if (s_wf_in_out_power == NULL)
@@ -71,7 +71,7 @@ static void timer_cb(lv_timer_t *t)
         lv_obj_remove_event_cb(s_wf_in_out_power->bg, NULL);  //清除所有事件回调
         lv_obj_del(s_wf_in_out_power->bg);
         s_wf_in_out_power->bg = NULL;
-        s_wf_in_out_power->link_bg = NULL;
+        //s_wf_in_out_power->link_bg = NULL;
         
         if (in_out_value_show_flag)
         {
@@ -81,7 +81,7 @@ static void timer_cb(lv_timer_t *t)
         {
             s_wf_in_out_power->bg = aem_input_power_screen_create(par, true);
         }
-
+        /*  //delete QR code link
         if (s_wf_in_out_power->link_bg == NULL)
         {
             s_wf_in_out_power->link_bg = aem_bg_create(s_wf_in_out_power->bg, AEM_SIZE_HOR_FACTOR_466(120), AEM_SIZE_VER_FACTOR_466(80), lv_color_white());
@@ -94,6 +94,7 @@ static void timer_cb(lv_timer_t *t)
                 lv_obj_add_event_cb(s_wf_in_out_power->link_bg, link_icon_event_cb, LV_EVENT_CLICKED, NULL);
             }  
         }
+        */
         lv_timer_resume(s_wf_in_out_power->timer);
 
         return;
@@ -143,7 +144,7 @@ static void on_resume()
     if (s_wf_in_out_power->bg)
     {
         lv_obj_remove_event_cb(s_wf_in_out_power->bg, NULL);  //清除所有事件回调
-        
+        /*  //delete QR code
         if (s_wf_in_out_power->link_bg == NULL)
         {
             s_wf_in_out_power->link_bg = aem_bg_create(s_wf_in_out_power->bg, AEM_SIZE_HOR_FACTOR_466(120), AEM_SIZE_VER_FACTOR_466(80), lv_color_white());
@@ -156,6 +157,7 @@ static void on_resume()
                 lv_obj_add_event_cb(s_wf_in_out_power->link_bg, link_icon_event_cb, LV_EVENT_CLICKED, NULL);
             }  
         }
+        */
     }        
 
     if (s_wf_in_out_power->timer == NULL)

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

@@ -198,7 +198,7 @@ static void del_cards(void)
         module = _lv_ll_get_next(modules, module);
     }
 }
-
+/*  //delete QR code link
 static void quick_settings_link_event_cb(lv_event_t *e)
 {
     if (quick_settings == NULL)
@@ -207,7 +207,7 @@ static void quick_settings_link_event_cb(lv_event_t *e)
     aem_activity_run(AEM_BIND_QRCODE, NULL);
     //aem_app_close(AEM_APP_ID_LAUNCH);
 }
-
+*/
 static lv_obj_t *create_status_bar(lv_obj_t *par)
 {
     lv_obj_t *btn = aem_waterfall_get_centre_btn(par);
@@ -267,7 +267,7 @@ static lv_obj_t *create_status_bar(lv_obj_t *par)
         lv_obj_align(quick_settings->time, LV_ALIGN_BOTTOM_MID, 0, AEM_SIZE_FACTOR_466(quick_status_time_y));
     }
 #endif
-
+    /*  //delete QR code link
     quick_settings->link_img = simple_img_create(bg);
     if (quick_settings->link_img)
     {
@@ -285,6 +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)
@@ -514,7 +515,7 @@ static void on_ui_refresh(aem_msg_t *msg)
     #endif    
     }
     */
-    simple_img_set_src(quick_settings->link_img, get_img[2]);
+    //simple_img_set_src(quick_settings->link_img, get_img[2]);  //delete QR code link
 
     if (msg == NULL)
         return;

application/aem_watch/src/application/quick_settings/aem_quick_setting_alarm.c

@@ -48,7 +48,7 @@ void alarm_btn_create(lv_obj_t *card_bg)
     lv_memset(s_ui, 0, sizeof(alarm_ui_t));
 
     s_ui->btn = aem_waterfall_btn_create(card_bg, QUICK_SETTING_CARD_SIZE, QUICK_SETTING_CARD_SIZE, get_img[0]);
-    lv_obj_align(s_ui->btn, LV_ALIGN_CENTER, AEM_SIZE_HOR_FACTOR_466(0), 0);
+    lv_obj_align(s_ui->btn, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(0), 0);
     lv_obj_add_event_cb(s_ui->btn, card_event_cb, LV_EVENT_ALL, NULL);
 }
 

application/aem_watch/src/application/quick_settings/aem_quick_setting_app_settings.c

@@ -28,7 +28,7 @@ static void card_event_cb(lv_event_t *e)
     }
     else if (LV_EVENT_RELEASED == e->code)
     {
-        simple_img_set_src(s_ui->btn, get_img[0]);
+        simple_img_set_src(s_ui->btn, get_img[1]);
     }
     else if (LV_EVENT_CLICKED == e->code)
     {
@@ -48,7 +48,8 @@ static void app_settings_btn_create(lv_obj_t *card_bg)
 
     lv_memset(s_ui, 0, sizeof(app_settings_ui_t));
 
-    s_ui->btn = aem_waterfall_btn_create(card_bg, QUICK_SETTING_CARD_SIZE, QUICK_SETTING_CARD_SIZE, get_img[0]);
+    s_ui->btn = aem_waterfall_btn_create(card_bg, QUICK_SETTING_CARD_SIZE, QUICK_SETTING_CARD_SIZE, get_img[1]);
+    //lv_obj_align(s_ui->btn, LV_ALIGN_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), 0);
     lv_obj_add_event_cb(s_ui->btn, card_event_cb, LV_EVENT_ALL, NULL);
 }
 

application/aem_watch/src/application/quick_settings/aem_quick_setting_bluetooth_setting.c

@@ -66,4 +66,4 @@ const aem_quick_setting_ops_t quick_setting_app_bluetooth_setting_ops = {
     .refresh = NULL,
 };
 
-AEM_QUICK_SETTING_REGISTER(AEM_QUICK_SETTING_BLUETOOTH_SETTING, (aem_quick_setting_ops_t *)&quick_setting_app_bluetooth_setting_ops);
+//AEM_QUICK_SETTING_REGISTER(AEM_QUICK_SETTING_BLUETOOTH_SETTING, (aem_quick_setting_ops_t *)&quick_setting_app_bluetooth_setting_ops);

application/aem_watch/src/user_cfg/data_default_cfg.h

@@ -26,7 +26,7 @@ const static char *s_def_datetime_str = "2024-03-01 08:00:00"; // 默认系统
 #define DEFAULT_LANGUAGE AEM_LANGUAGE_EN_GB // 系统默认语言
 
 // 亮度默认配置
-#define BRIGHTNESS_LEVEL (153) // 亮度级别 0-255
+#define BRIGHTNESS_LEVEL (200) // 亮度级别 0-255
 
 // 勿扰模式默认配置
 #define NOT_DISTURB_SWITCH SWITCH_CLOSE // 勿扰模式开关
@@ -134,7 +134,7 @@ typedef enum
     //AEM_QUICK_SETTING_RAISE_UP,
     //AEM_QUICK_SETTING_POWER_SAVE_MODE,
     //AEM_QUICK_SETTING_FIND_PHONE,
-    AEM_QUICK_SETTING_BLUETOOTH_SETTING,
+    //AEM_QUICK_SETTING_BLUETOOTH_SETTING,
     AEM_QUICK_SETTING_ALARM,
     AEM_QUICK_SETTING_END,
 } aem_quick_setting_prio_e;

application/aem_watch/src/user_cfg/device_info_cfg.h

@@ -8,11 +8,11 @@
 #if DMG_LCM
 #define MAJOR_VERSION 0X01
 #define MINOR_VERSION 0X01
-#define MICRO_VERSION 0x0A
+#define MICRO_VERSION 0x0B
 #else
 #define MAJOR_VERSION 0X02
 #define MINOR_VERSION 0X00
-#define MICRO_VERSION 0x0A
+#define MICRO_VERSION 0x0B
 #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 "202506271050"
+#define BUILD_TIME "202507181450"
 #define AEM_GUI_FWK_LIB_VER "2.0.0.0"
 #define APP_DOWNLOAD_URL "https://customer.com"
 #define AEM_APP_TRANS_ANIMATION 1