瀏覽代碼

多次切换界面后长按功耗界面,还是会有响应长按的概率,所以不限制响应长按了,恢复回响应长按
修改系统语言的头顶标识语“语言”可切换中英文

robbin 3 周之前
父節點
當前提交
efcd7ff1b6

+ 0 - 3
application/aem_watch/src/application/in_out_power/aem_in_out_power.c

@@ -177,7 +177,6 @@ lv_obj_t *in_out_power_ui_init(lv_obj_t *par)
     {
         return NULL;
     }
-    lv_obj_clear_flag(bg, LV_OBJ_FLAG_CLICKABLE);
 
     lv_obj_set_user_data(bg, activity_ui_data);
     activity_ui_data->s_app_bg = bg;
@@ -186,8 +185,6 @@ lv_obj_t *in_out_power_ui_init(lv_obj_t *par)
     lv_obj_t *screen1 = aem_bg_create(bg, DEF_UI_WIDTH, DEF_UI_HEIGHT, lv_color_black());
     if (screen1)
     {
-        lv_obj_clear_flag(screen1, LV_OBJ_FLAG_CLICKABLE);
-        
         if (in_out_value_show_flag)  //show in & out value
         {
             activity_ui_data->arc_screen = aem_in_out_power_screen_create(screen1, false);

+ 35 - 60
application/aem_watch/src/application/in_out_power/aem_in_out_power_screen.c

@@ -86,7 +86,7 @@ static lv_obj_t *activity_value_item_create(lv_obj_t *par, lv_color_t value_colo
         return NULL;
     }
 
-    lv_obj_clear_flag(bg, LV_OBJ_FLAG_CLICKABLE);
+    //lv_obj_clear_flag(bg, LV_OBJ_FLAG_CLICKABLE);
 
     lv_obj_t *value_label = text_canvas_create(bg);
     if (value_label)
@@ -94,7 +94,7 @@ static lv_obj_t *activity_value_item_create(lv_obj_t *par, lv_color_t value_colo
         lv_obj_set_width(value_label, AEM_SIZE_HOR_FACTOR_466(160));
         text_canvas_set_long_mode(value_label, LV_LABEL_LONG_SCROLL_CIRCULAR);
         lv_obj_set_style_text_align(value_label, LV_TEXT_ALIGN_LEFT, 0);
-        lv_obj_clear_flag(value_label, LV_OBJ_FLAG_CLICKABLE);
+        //lv_obj_clear_flag(value_label, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_text_color(value_label, value_color, 0);
         lv_obj_set_style_text_font(value_label, value_font, 0);
         text_canvas_set_text(value_label, value);
@@ -202,75 +202,62 @@ static lv_obj_t *aem_in_out_power_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_BLACK, in_power_data, 70, aem_font_def());
-    lv_obj_set_style_bg_color(in_power_item, (lv_color_t)LV_COLOR_BLUE, 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_STYLE_WIDTH), 0);
-    lv_obj_clear_flag(in_power_item, LV_OBJ_FLAG_CLICKABLE);
-
     if (in_power_item)
     {
+        lv_obj_set_style_bg_color(in_power_item, (lv_color_t)LV_COLOR_BLUE, 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_STYLE_WIDTH), 0);
         activity_ui_data->in_power_value = lv_obj_get_child(in_power_item, 0);
     }
 
     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_BLACK, out_power_data, 70, aem_font_def());
-    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_STYLE_WIDTH), 0);
-    lv_obj_clear_flag(out_power_item, LV_OBJ_FLAG_CLICKABLE);
-
     if (out_power_item)
     {
+        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_STYLE_WIDTH), 0);
         activity_ui_data->out_power_value = lv_obj_get_child(out_power_item, 0);
     }
 
     char *in_voltage_data = aem_auto_release_txt_fmt("%d", day_data.calories);
     lv_obj_t *in_voltage_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_BLUE, in_voltage_data, 50, aem_font_sub());
-    //lv_obj_set_style_bg_color(in_voltage_item, (lv_color_t)LV_COLOR_WHITE, 0);
-    lv_obj_set_style_align(in_voltage_item, LV_ALIGN_LEFT_MID, 0);
-    lv_obj_set_style_width(in_voltage_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
-    lv_obj_clear_flag(in_voltage_item, LV_OBJ_FLAG_CLICKABLE);
-
     if (in_voltage_item)
     {
+        //lv_obj_set_style_bg_color(in_voltage_item, (lv_color_t)LV_COLOR_WHITE, 0);
+        lv_obj_set_style_align(in_voltage_item, LV_ALIGN_LEFT_MID, 0);
+        lv_obj_set_style_width(in_voltage_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
         activity_ui_data->in_voltage_value = lv_obj_get_child(in_voltage_item, 0);
     }
 
     char *out_voltage_data = aem_auto_release_txt_fmt("%d", day_data.calories);
 
     lv_obj_t *out_voltage_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_GREEN, out_voltage_data, 50, aem_font_sub());
-
-    //lv_obj_set_style_bg_color(out_voltage_item, (lv_color_t)LV_COLOR_WHITE, 0);
-    lv_obj_set_style_align(out_voltage_item, LV_ALIGN_LEFT_MID, 0);
-    lv_obj_set_style_width(out_voltage_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
-    lv_obj_clear_flag(out_voltage_item, LV_OBJ_FLAG_CLICKABLE);
-
     if (out_voltage_item)
     {
+        //lv_obj_set_style_bg_color(out_voltage_item, (lv_color_t)LV_COLOR_WHITE, 0);
+        lv_obj_set_style_align(out_voltage_item, LV_ALIGN_LEFT_MID, 0);
+        lv_obj_set_style_width(out_voltage_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
         activity_ui_data->out_voltage_value = lv_obj_get_child(out_voltage_item, 0);
     }
 
     char *in_current_data = aem_auto_release_txt_fmt("%d", day_data.durmin);
     lv_obj_t *in_current_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_BLUE, in_current_data, 50, aem_font_sub());
-    //lv_obj_set_style_bg_color(in_current_item, (lv_color_t)LV_COLOR_WHITE, 0);
-    lv_obj_set_style_align(in_current_item, LV_ALIGN_LEFT_MID, 0);
-    lv_obj_set_style_width(in_current_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
-    lv_obj_clear_flag(in_current_item, LV_OBJ_FLAG_CLICKABLE);
-
     if (in_current_item)
     {
+        //lv_obj_set_style_bg_color(in_current_item, (lv_color_t)LV_COLOR_WHITE, 0);
+        lv_obj_set_style_align(in_current_item, LV_ALIGN_LEFT_MID, 0);
+        lv_obj_set_style_width(in_current_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
         activity_ui_data->in_current_value = lv_obj_get_child(in_current_item, 0);
     }
 
     char *out_current_data = aem_auto_release_txt_fmt("%d", day_data.durmin);
     lv_obj_t *out_current_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_GREEN, out_current_data, 50, aem_font_sub());
-    //lv_obj_set_style_bg_color(out_current_item, (lv_color_t)LV_COLOR_WHITE, 0);
-    lv_obj_set_style_align(out_current_item, LV_ALIGN_LEFT_MID, 0);
-    lv_obj_set_style_width(out_current_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
-    lv_obj_clear_flag(out_current_item, LV_OBJ_FLAG_CLICKABLE);
-
     if (out_current_item)
     {
+        //lv_obj_set_style_bg_color(out_current_item, (lv_color_t)LV_COLOR_WHITE, 0);
+        lv_obj_set_style_align(out_current_item, LV_ALIGN_LEFT_MID, 0);
+        lv_obj_set_style_width(out_current_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
         activity_ui_data->out_current_value = lv_obj_get_child(out_current_item, 0);
     }
 
@@ -281,7 +268,6 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
     lv_obj_t *in_power_unit_label = text_canvas_create(in_power_item);
     if (in_power_unit_label)
     {
-        lv_obj_clear_flag(in_power_unit_label, LV_OBJ_FLAG_CLICKABLE);
         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_BLACK, 0);
@@ -291,7 +277,6 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
     lv_obj_t *in_voltage_unit_label = text_canvas_create(in_voltage_item);
     if (in_voltage_unit_label)
     {
-        lv_obj_clear_flag(in_voltage_unit_label, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_text_font(in_voltage_unit_label, aem_font_small(), 0);
         text_canvas_set_text(in_voltage_unit_label, "V");
         lv_obj_set_style_text_color(in_voltage_unit_label, (lv_color_t)LV_COLOR_BLUE, 0);
@@ -301,7 +286,6 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
     lv_obj_t *in_current_unit_label = text_canvas_create(in_current_item);
     if (in_current_unit_label)
     {
-        lv_obj_clear_flag(in_current_unit_label, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_text_font(in_current_unit_label, aem_font_small(), 0);
         text_canvas_set_text(in_current_unit_label, "A");
         lv_obj_set_style_text_color(in_current_unit_label, (lv_color_t)LV_COLOR_BLUE, 0);
@@ -315,7 +299,6 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
     lv_obj_t *out_power_unit_label = text_canvas_create(out_power_item);
     if (out_power_unit_label)
     {
-        lv_obj_clear_flag(out_power_unit_label, LV_OBJ_FLAG_CLICKABLE);
         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_BLACK, 0);
@@ -325,7 +308,6 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
     lv_obj_t *out_voltage_unit_label = text_canvas_create(out_voltage_item);
     if (out_voltage_unit_label)
     {
-        lv_obj_clear_flag(out_voltage_unit_label, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_text_font(out_voltage_unit_label, aem_font_small(), 0);
         text_canvas_set_text(out_voltage_unit_label, "V");
         lv_obj_set_style_text_color(out_voltage_unit_label, (lv_color_t)LV_COLOR_GREEN, 0);
@@ -335,7 +317,6 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
     lv_obj_t *out_current_unit_label = text_canvas_create(out_current_item);
     if (out_current_unit_label)
     {
-        lv_obj_clear_flag(out_current_unit_label, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_text_font(out_current_unit_label, aem_font_small(), 0);
         text_canvas_set_text(out_current_unit_label, "A");
         lv_obj_set_style_text_color(out_current_unit_label, (lv_color_t)LV_COLOR_GREEN, 0);
@@ -346,7 +327,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
     lv_obj_t *arc_bg = aem_bg_create(par, DEF_UI_WIDTH, DEF_UI_HEIGHT, lv_color_black());
     if (arc_bg)
     {
-        lv_obj_clear_flag(arc_bg, LV_OBJ_FLAG_CLICKABLE);
+        //lv_obj_clear_flag(arc_bg, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_bg_opa(arc_bg, LV_OPA_TRANSP, 0);
         lv_obj_set_style_transform_pivot_x(arc_bg, DEF_UI_WIDTH / 2, 0);
         lv_obj_set_style_transform_pivot_y(arc_bg, DEF_UI_HEIGHT / 2, 0);
@@ -362,7 +343,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_icon = lv_img_create(arc_bg);
         if (in_icon)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_icon, &IMG_SCENE_IN_OUT_POWER_PIC_IN);
             lv_obj_align(in_icon, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(20), AEM_SIZE_VER_FACTOR_466(80));
         }
@@ -370,7 +351,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon1 = lv_img_create(arc_bg);
         if (in_bg_icon1)
         {
-            lv_obj_clear_flag(in_bg_icon1, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon1, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align(in_bg_icon1, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(10), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon1, BG_ICON1_IMG_OPA, 0);
@@ -379,7 +360,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon2 = lv_img_create(in_bg_icon1);
         if (in_bg_icon2)
         {
-            lv_obj_clear_flag(in_bg_icon2, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon2, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon2, in_bg_icon1, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon2, BG_ICON2_IMG_OPA, 0);
@@ -388,7 +369,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon3 = lv_img_create(in_bg_icon2);
         if (in_bg_icon3)
         {
-            lv_obj_clear_flag(in_bg_icon3, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon3, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon3, in_bg_icon2, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon3, BG_ICON3_IMG_OPA, 0);
@@ -397,7 +378,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon4 = lv_img_create(in_bg_icon3);
         if (in_bg_icon4)
         {
-            lv_obj_clear_flag(in_bg_icon4, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon4, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon4, in_bg_icon3, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon4, BG_ICON4_IMG_OPA, 0);
@@ -406,7 +387,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon5 = lv_img_create(in_bg_icon4);
         if (in_bg_icon5)
         {
-            lv_obj_clear_flag(in_bg_icon5, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon5, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon5, in_bg_icon4, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon5, BG_ICON5_IMG_OPA, 0);
@@ -415,7 +396,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon6 = lv_img_create(in_bg_icon5);
         if (in_bg_icon6)
         {
-            lv_obj_clear_flag(in_bg_icon6, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon6, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon6, in_bg_icon5, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon6, BG_ICON6_IMG_OPA, 0);
@@ -425,7 +406,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_bg_icon1 = lv_img_create(arc_bg);
         if (out_bg_icon1)
         {
-            lv_obj_clear_flag(out_bg_icon1, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(out_bg_icon1, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(out_bg_icon1, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPGREEN_ARROW);
             lv_obj_align(out_bg_icon1, LV_ALIGN_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(-10), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(out_bg_icon1, BG_ICON1_IMG_OPA, 0);
@@ -434,7 +415,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_bg_icon2 = lv_img_create(out_bg_icon1);
         if (out_bg_icon2)
         {
-            lv_obj_clear_flag(out_bg_icon2, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(out_bg_icon2, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(out_bg_icon2, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPGREEN_ARROW);
             lv_obj_align_to(out_bg_icon2, out_bg_icon1, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(out_bg_icon2, BG_ICON2_IMG_OPA, 0);
@@ -443,7 +424,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_bg_icon3 = lv_img_create(out_bg_icon2);
         if (out_bg_icon3)
         {
-            lv_obj_clear_flag(out_bg_icon3, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(out_bg_icon3, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(out_bg_icon3, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPGREEN_ARROW);
             lv_obj_align_to(out_bg_icon3, out_bg_icon2, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(out_bg_icon3, BG_ICON3_IMG_OPA, 0);
@@ -452,7 +433,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_bg_icon4 = lv_img_create(out_bg_icon3);
         if (out_bg_icon4)
         {
-            lv_obj_clear_flag(out_bg_icon4, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(out_bg_icon4, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(out_bg_icon4, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPGREEN_ARROW);
             lv_obj_align_to(out_bg_icon4, out_bg_icon3, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(out_bg_icon4, BG_ICON4_IMG_OPA, 0);
@@ -461,7 +442,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_bg_icon5 = lv_img_create(out_bg_icon4);
         if (out_bg_icon5)
         {
-            lv_obj_clear_flag(out_bg_icon5, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(out_bg_icon5, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(out_bg_icon5, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPGREEN_ARROW);
             lv_obj_align_to(out_bg_icon5, out_bg_icon4, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(out_bg_icon5, BG_ICON5_IMG_OPA, 0);
@@ -470,7 +451,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_bg_icon6 = lv_img_create(out_bg_icon5);
         if (out_bg_icon6)
         {
-            lv_obj_clear_flag(out_bg_icon6, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(out_bg_icon6, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(out_bg_icon6, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPGREEN_ARROW);
             lv_obj_align_to(out_bg_icon6, out_bg_icon5, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(out_bg_icon6, BG_ICON6_IMG_OPA, 0);
@@ -480,7 +461,7 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_icon = lv_img_create(arc_bg);
         if (out_icon)
         {
-            lv_obj_clear_flag(out_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(out_icon, LV_OBJ_FLAG_CLICKABLE);
             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));
         }
@@ -488,7 +469,6 @@ static lv_obj_t *aem_in_out_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *link_icon = lv_img_create(arc_bg);
         if (link_icon)
         {
-            lv_obj_clear_flag(link_icon, LV_OBJ_FLAG_CLICKABLE);
             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));
         } 
@@ -535,8 +515,6 @@ static lv_obj_t *create_chart(lv_obj_t *par, int type)
         return NULL;
     }
 
-    lv_obj_clear_flag(chart, LV_OBJ_FLAG_CLICKABLE);
-
     // 设置图表对象的大小为 360x120
     lv_obj_set_size(chart, AEM_SIZE_HOR_FACTOR_466(chart_width), AEM_SIZE_VER_FACTOR_466(chart_hight));
     // 设置图表对象的内边距为0
@@ -647,7 +625,6 @@ static void aem_create_in_out_point_page(lv_obj_t *par)
         s_power_point->bg = arc_bg_create(par);
         if (s_power_point->bg)
         {
-            lv_obj_clear_flag(s_power_point->bg, LV_OBJ_FLAG_CLICKABLE);
             s_power_point->input_power_blue_chart = create_chart(par, 0);
             s_power_point->output_power_green_chart = create_chart(par, 1);
         }
@@ -666,8 +643,6 @@ lv_obj_t *aem_in_out_power_screen_create(lv_obj_t *par, bool widget_start)
     lv_obj_t *screen = aem_bg_create(par, DEF_UI_WIDTH, DEF_UI_HEIGHT, lv_color_black());
     if (screen)
     {
-        lv_obj_clear_flag(screen, LV_OBJ_FLAG_CLICKABLE);
-
         lv_obj_set_user_data(screen, ext_data);
 
         aem_in_out_power_arc_show_create(screen);

+ 21 - 30
application/aem_watch/src/application/in_out_power/aem_input_power_screen.c

@@ -77,7 +77,7 @@ static lv_obj_t *activity_value_item_create(lv_obj_t *par, lv_color_t value_colo
         return NULL;
     }
 
-    lv_obj_clear_flag(bg, LV_OBJ_FLAG_CLICKABLE);
+    //lv_obj_clear_flag(bg, LV_OBJ_FLAG_CLICKABLE);
 
     lv_obj_t *value_label = text_canvas_create(bg);
     if (value_label)
@@ -85,7 +85,7 @@ static lv_obj_t *activity_value_item_create(lv_obj_t *par, lv_color_t value_colo
         lv_obj_set_width(value_label, AEM_SIZE_HOR_FACTOR_466(160));
         text_canvas_set_long_mode(value_label, LV_LABEL_LONG_SCROLL_CIRCULAR);
         lv_obj_set_style_text_align(value_label, LV_TEXT_ALIGN_LEFT, 0);
-        lv_obj_clear_flag(value_label, LV_OBJ_FLAG_CLICKABLE);
+        //lv_obj_clear_flag(value_label, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_text_color(value_label, value_color, 0);
         lv_obj_set_style_text_font(value_label, value_font, 0);
         text_canvas_set_text(value_label, value);
@@ -182,34 +182,31 @@ static lv_obj_t *aem_input_power_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_BLACK, in_power_data, 70, aem_font_def());
-    lv_obj_set_style_bg_color(in_power_item, (lv_color_t)LV_COLOR_BLUE, 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_STYLE_WIDTH), 0);
-
     if (in_power_item)
     {
+        lv_obj_set_style_bg_color(in_power_item, (lv_color_t)LV_COLOR_BLUE, 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_STYLE_WIDTH), 0);
         activity_ui_data->in_power_value = lv_obj_get_child(in_power_item, 0);
     }
 
     char *in_voltage_data = aem_auto_release_txt_fmt("%d", day_data.calories);
     lv_obj_t *in_voltage_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_BLUE, in_voltage_data, 50, aem_font_sub());
-    //lv_obj_set_style_bg_color(in_voltage_item, (lv_color_t)LV_COLOR_WHITE, 0);
-    lv_obj_set_style_align(in_voltage_item, LV_ALIGN_LEFT_MID, 0);
-    lv_obj_set_style_width(in_voltage_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
-
     if (in_voltage_item)
     {
+        //lv_obj_set_style_bg_color(in_voltage_item, (lv_color_t)LV_COLOR_WHITE, 0);
+        lv_obj_set_style_align(in_voltage_item, LV_ALIGN_LEFT_MID, 0);
+        lv_obj_set_style_width(in_voltage_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
         activity_ui_data->in_voltage_value = lv_obj_get_child(in_voltage_item, 0);
     }
 
     char *in_current_data = aem_auto_release_txt_fmt("%d", day_data.durmin);
     lv_obj_t *in_current_item = activity_value_item_create(par, (lv_color_t)LV_COLOR_BLUE, in_current_data, 50, aem_font_sub());
-    //lv_obj_set_style_bg_color(in_current_item, (lv_color_t)LV_COLOR_WHITE, 0);
-    lv_obj_set_style_align(in_current_item, LV_ALIGN_LEFT_MID, 0);
-    lv_obj_set_style_width(in_current_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
-
     if (in_current_item)
     {
+        //lv_obj_set_style_bg_color(in_current_item, (lv_color_t)LV_COLOR_WHITE, 0);
+        lv_obj_set_style_align(in_current_item, LV_ALIGN_LEFT_MID, 0);
+        lv_obj_set_style_width(in_current_item, AEM_SIZE_FACTOR_466(VOLT_CURR_WIDTH), 0);
         activity_ui_data->in_current_value = lv_obj_get_child(in_current_item, 0);
     }
 
@@ -248,7 +245,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
     lv_obj_t *arc_bg = aem_bg_create(par, DEF_UI_WIDTH, DEF_UI_HEIGHT, lv_color_black());
     if (arc_bg)
     {
-        lv_obj_clear_flag(arc_bg, LV_OBJ_FLAG_CLICKABLE);
+        //lv_obj_clear_flag(arc_bg, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_bg_opa(arc_bg, LV_OPA_TRANSP, 0);
         lv_obj_set_style_transform_pivot_x(arc_bg, DEF_UI_WIDTH / 2, 0);
         lv_obj_set_style_transform_pivot_y(arc_bg, DEF_UI_HEIGHT / 2, 0);
@@ -264,7 +261,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_icon = lv_img_create(arc_bg);
         if (in_icon)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_icon, &IMG_SCENE_IN_OUT_POWER_PIC_IN);
             lv_obj_align(in_icon, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(75), AEM_SIZE_VER_FACTOR_466(0));
         }
@@ -272,7 +269,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *voltage_icon = lv_img_create(arc_bg);
         if (voltage_icon)
         {
-            lv_obj_clear_flag(voltage_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(voltage_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(voltage_icon, &IMG_SCENE_IN_OUT_POWER_PIC_VOLTAGE_ICON);
             lv_obj_align(voltage_icon, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(150), AEM_SIZE_VER_FACTOR_466(60));
         }
@@ -280,7 +277,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *current_icon = lv_img_create(arc_bg);
         if (current_icon)
         {
-            lv_obj_clear_flag(current_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(current_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(current_icon, &IMG_SCENE_IN_OUT_POWER_PIC_CURRENT_ICON);
             lv_obj_align(current_icon, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(150), AEM_SIZE_VER_FACTOR_466(110));
         }
@@ -288,7 +285,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon1 = lv_img_create(arc_bg);
         if (in_bg_icon1)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon1, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align(in_bg_icon1, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(145), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon1, BG_ICON1_IMG_OPA, 0);
@@ -297,7 +294,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon2 = lv_img_create(in_bg_icon1);
         if (in_bg_icon2)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon2, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon2, in_bg_icon1, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon2, BG_ICON2_IMG_OPA, 0);
@@ -306,7 +303,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon3 = lv_img_create(in_bg_icon2);
         if (in_bg_icon3)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon3, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon3, in_bg_icon2, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon3, BG_ICON3_IMG_OPA, 0);
@@ -315,7 +312,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon4 = lv_img_create(in_bg_icon3);
         if (in_bg_icon4)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon4, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon4, in_bg_icon3, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon4, BG_ICON4_IMG_OPA, 0);
@@ -324,7 +321,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon5 = lv_img_create(in_bg_icon4);
         if (in_bg_icon5)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon5, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon5, in_bg_icon4, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon5, BG_ICON5_IMG_OPA, 0);
@@ -333,7 +330,7 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_bg_icon6 = lv_img_create(in_bg_icon5);
         if (in_bg_icon6)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_bg_icon6, &IMG_SCENE_IN_OUT_POWER_PIC_DEEPBLUE_ARROW);
             lv_obj_align_to(in_bg_icon6, in_bg_icon5, LV_ALIGN_OUT_RIGHT_MID, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
             lv_obj_set_style_img_opa(in_bg_icon6, BG_ICON6_IMG_OPA, 0);
@@ -343,7 +340,6 @@ static lv_obj_t *aem_input_power_arc_show_create(lv_obj_t *par)
         lv_obj_t *link_icon = lv_img_create(arc_bg);
         if (link_icon)
         {
-            lv_obj_clear_flag(link_icon, LV_OBJ_FLAG_CLICKABLE);
             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));
         } 
@@ -391,8 +387,6 @@ static lv_obj_t *create_chart(lv_obj_t *par, int type)
         return NULL;
     }
 
-    lv_obj_clear_flag(chart, LV_OBJ_FLAG_CLICKABLE); 
-
     // 设置图表对象的大小为 360x120
     lv_obj_set_size(chart, AEM_SIZE_HOR_FACTOR_466(in_chart_width), AEM_SIZE_VER_FACTOR_466(in_chart_hight));
     // 设置图表对象的内边距为0
@@ -468,7 +462,6 @@ static void aem_create_input_point_page(lv_obj_t *par)
     s_power_point->bg = arc_bg_create(par);
     if (s_power_point->bg)
     {
-        lv_obj_clear_flag(s_power_point->bg, LV_OBJ_FLAG_CLICKABLE); 
         s_power_point->input_power_blue_chart = create_chart(par, 0);
     }
 }
@@ -485,8 +478,6 @@ lv_obj_t *aem_input_power_screen_create(lv_obj_t *par, bool widget_start)
     lv_obj_t *screen = aem_bg_create(par, DEF_UI_WIDTH, DEF_UI_HEIGHT, lv_color_black());
     if (screen)
     {
-        lv_obj_clear_flag(screen, LV_OBJ_FLAG_CLICKABLE); 
-
         lv_obj_set_user_data(screen, ext_data);
 
         aem_input_power_arc_show_create(screen);

+ 0 - 10
application/aem_watch/src/application/in_out_power/aem_widget_in_out_power.c

@@ -49,8 +49,6 @@ static void timer_cb(lv_timer_t *t)
     lv_obj_t *par = lv_obj_get_parent(s_wf_in_out_power->bg);
     if (par == NULL)
         return;
-
-    lv_obj_clear_flag(par, LV_OBJ_FLAG_CLICKABLE);    
         
     bool b_temp_flag = aem_in_out_value_show();
 
@@ -96,9 +94,6 @@ 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_obj_add_flag(s_wf_in_out_power->bg, LV_OBJ_FLAG_CLICKABLE);       //给背景添加LV_OBJ_FLAG_CLICKABLE标志
-        lv_obj_clear_flag(s_wf_in_out_power->bg, LV_OBJ_FLAG_EVENT_BUBBLE);  //去除把事件同步给父对象LV_OBJ_FLAG_EVENT_BUBBLE
-
         lv_timer_resume(s_wf_in_out_power->timer);
 
         return;
@@ -125,8 +120,6 @@ static lv_obj_t *on_start(lv_obj_t *par)
 
             in_out_value_show_flag = aem_in_out_value_show();
 
-            lv_obj_clear_flag(par, LV_OBJ_FLAG_CLICKABLE);
-
             if (in_out_value_show_flag)
             {
                 s_wf_in_out_power->bg = aem_in_out_power_screen_create(par, true);
@@ -135,9 +128,6 @@ static lv_obj_t *on_start(lv_obj_t *par)
             {
                 s_wf_in_out_power->bg = aem_input_power_screen_create(par, true);
             }
-
-            lv_obj_add_flag(s_wf_in_out_power->bg, LV_OBJ_FLAG_CLICKABLE);       //给背景添加LV_OBJ_FLAG_CLICKABLE标志
-            lv_obj_clear_flag(s_wf_in_out_power->bg, LV_OBJ_FLAG_EVENT_BUBBLE);  //去除把事件同步给父对象LV_OBJ_FLAG_EVENT_BUBBLE
             return s_wf_in_out_power->bg;
         }
     }

+ 0 - 3
application/aem_watch/src/application/profile_photo/aem_profile_photo.c

@@ -72,8 +72,6 @@ lv_obj_t *profile_photo_ui_init(lv_obj_t *par)
         return NULL;
     }
 
-    lv_obj_clear_flag(bg, LV_OBJ_FLAG_CLICKABLE);
-
     lv_obj_set_user_data(bg, activity_ui_data);
     activity_ui_data->s_app_bg = bg;
     aem_page_set_auto_align(bg, true);
@@ -81,7 +79,6 @@ lv_obj_t *profile_photo_ui_init(lv_obj_t *par)
     lv_obj_t *screen1 = aem_bg_create(bg, DEF_UI_WIDTH, DEF_UI_HEIGHT, lv_color_black());
     if (screen1)
     {
-        lv_obj_clear_flag(screen1, LV_OBJ_FLAG_CLICKABLE);
         activity_ui_data->arc_screen = aem_profile_photo_screen_create(screen1);
     }
 

+ 11 - 22
application/aem_watch/src/application/profile_photo/aem_profile_photo_screen.c

@@ -67,7 +67,7 @@ static lv_obj_t *activity_value_item_create(lv_obj_t *par, lv_color_t value_colo
     }
 
     lv_obj_set_style_bg_opa(bg, LV_OPA_TRANSP, LV_PART_MAIN);  //设置背景透明度
-    lv_obj_clear_flag(bg, LV_OBJ_FLAG_CLICKABLE);
+    //lv_obj_clear_flag(bg, LV_OBJ_FLAG_CLICKABLE);
 
     lv_obj_t *value_label = text_canvas_create(bg);
     if (value_label)
@@ -75,7 +75,7 @@ static lv_obj_t *activity_value_item_create(lv_obj_t *par, lv_color_t value_colo
         lv_obj_set_width(value_label, AEM_SIZE_HOR_FACTOR_466(140));
         text_canvas_set_long_mode(value_label, LV_LABEL_LONG_SCROLL_CIRCULAR);
         lv_obj_set_style_text_align(value_label, LV_TEXT_ALIGN_LEFT, 0);
-        lv_obj_clear_flag(value_label, LV_OBJ_FLAG_CLICKABLE);
+        //lv_obj_clear_flag(value_label, LV_OBJ_FLAG_CLICKABLE);
         lv_obj_set_style_text_color(value_label, value_color, 0);
         lv_obj_set_style_text_font(value_label, value_font, 0);
         text_canvas_set_text(value_label, value);
@@ -95,8 +95,6 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
     lv_obj_t *arc_bg = aem_bg_create(par, DEF_UI_WIDTH, DEF_UI_HEIGHT, lv_color_black());
     if (arc_bg)
     {
-        lv_obj_clear_flag(arc_bg, LV_OBJ_FLAG_CLICKABLE);
-
         lv_obj_t *photo_icon = lv_img_create(arc_bg);
         if (photo_icon)
         {
@@ -167,23 +165,20 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
             else
         #endif    
             {
-                
+                //lv_obj_clear_flag(photo_icon, LV_OBJ_FLAG_CLICKABLE);
                 lv_img_set_src(photo_icon, &IMG_SCENE_PROFILE_PHOTO_PIC_PHOTO_MALE);
             }
 
-            lv_obj_clear_flag(photo_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_obj_align(photo_icon, LV_ALIGN_CENTER, AEM_SIZE_HOR_FACTOR_466(0), AEM_SIZE_VER_FACTOR_466(0));
         }
 
         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_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_clear_flag(in_power_item, LV_OBJ_FLAG_CLICKABLE);
-        lv_obj_set_style_width(in_power_item, AEM_SIZE_FACTOR_466(POWER_WIDTH), 0);
-
         if (in_power_item)
         {
+            //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);
             activity_ui_data->in_power_value = lv_obj_get_child(in_power_item, 0);
         }
 
@@ -192,7 +187,6 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_power_unit_label = text_canvas_create(in_power_item);
         if (in_power_unit_label)
         {
-            lv_obj_clear_flag(in_power_unit_label, LV_OBJ_FLAG_CLICKABLE);
             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_BLUE, 0);
@@ -201,13 +195,11 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
 
         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_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_clear_flag(out_power_item, LV_OBJ_FLAG_CLICKABLE);
-        lv_obj_set_style_width(out_power_item, AEM_SIZE_FACTOR_466(POWER_WIDTH), 0);
-
         if (out_power_item)
         {
+            //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);
             activity_ui_data->out_power_value = lv_obj_get_child(out_power_item, 0);
         }
 
@@ -216,7 +208,6 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_power_unit_label = text_canvas_create(out_power_item);
         if (out_power_unit_label)
         {
-            lv_obj_clear_flag(out_power_unit_label, LV_OBJ_FLAG_CLICKABLE);
             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_GREEN, 0);
@@ -226,7 +217,7 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
         lv_obj_t *in_icon = lv_img_create(arc_bg);
         if (in_icon)
         {
-            lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(in_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(in_icon, &IMG_SCENE_PROFILE_PHOTO_PIC_IN);
             lv_obj_align(in_icon, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(150), AEM_SIZE_VER_FACTOR_466(135));
         }
@@ -234,7 +225,7 @@ static lv_obj_t *aem_profile_photo_arc_show_create(lv_obj_t *par)
         lv_obj_t *out_icon = lv_img_create(arc_bg);
         if (out_icon)
         {
-            lv_obj_clear_flag(out_icon, LV_OBJ_FLAG_CLICKABLE);
+            //lv_obj_clear_flag(out_icon, LV_OBJ_FLAG_CLICKABLE);
             lv_img_set_src(out_icon, &IMG_SCENE_PROFILE_PHOTO_PIC_OUT);
             lv_obj_align(out_icon, LV_ALIGN_LEFT_MID, AEM_SIZE_HOR_FACTOR_466(150), AEM_SIZE_VER_FACTOR_466(185));
         } 
@@ -254,8 +245,6 @@ lv_obj_t *aem_profile_photo_screen_create(lv_obj_t *par)
     lv_obj_t *screen1 = aem_bg_create(par, DEF_UI_WIDTH, DEF_UI_HEIGHT, lv_color_black());
     if (screen1)
     {
-        lv_obj_clear_flag(screen1, LV_OBJ_FLAG_CLICKABLE);
-
         lv_obj_set_user_data(screen1, ext_data);
 
         aem_profile_photo_arc_show_create(screen1);

+ 0 - 2
application/aem_watch/src/application/profile_photo/aem_widget_profile_photo.c

@@ -51,8 +51,6 @@ static lv_obj_t *on_start(lv_obj_t *par)
         {
             memset(s_wf_profile_photo, 0, sizeof(aem_wf_profile_photo_t));
             s_wf_profile_photo->bg = aem_profile_photo_screen_create(par);
-            lv_obj_add_flag(s_wf_profile_photo->bg, LV_OBJ_FLAG_CLICKABLE);       //给背景添加LV_OBJ_FLAG_CLICKABLE标志
-            lv_obj_clear_flag(s_wf_profile_photo->bg, LV_OBJ_FLAG_EVENT_BUBBLE);  //去除把事件同步给父对象LV_OBJ_FLAG_EVENT_BUBBLE
             return s_wf_profile_photo->bg;
         }
     }

+ 1 - 1
application/aem_watch/src/application/settings/aem_set_language.c

@@ -63,7 +63,7 @@ static void create_ui(void)
 		if (s_ui->page)
         {
 
-            aem_title_create(s_ui->page, true, "language");
+            aem_title_create(s_ui->page, true, res_manager_get_string_from_id(ID_KEY_SETUPWIZARD_LANGUAGE));
             lv_obj_set_style_pad_bottom(s_ui->page, SETTINGS_PAD_BOTTOM, LV_PART_MAIN);
         }
     }

+ 2 - 2
application/aem_watch/src/user_cfg/device_info_cfg.h

@@ -8,11 +8,11 @@
 #if DMG_LCM
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 1
-#define MICRO_VERSION 7
+#define MICRO_VERSION 9
 #else
 #define MAJOR_VERSION 2
 #define MINOR_VERSION 0
-#define MICRO_VERSION 7
+#define MICRO_VERSION 9
 #endif
 
 #define DEVICE_ID "CJ01"//3085

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