From: @CHENG <2393524978@qq.com> Date: Wed, 17 Apr 2024 07:04:32 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=23352ae1c7a6735d7918bc972c26752fefe5fba3;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json index 6338ede8..dfd2fe87 100644 --- a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json +++ b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json @@ -50,7 +50,7 @@ ] } ], - "label_cnt": 1, + "label_cnt": 2, "label_ll": [ { "label_type": 27, @@ -61,10 +61,24 @@ "b": 255 }, "text_pos": { - "x": 87, + "x": 80, "y": 0 }, "font_size": 20 + }, + { + "label_type": 28, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 110, + "y": 3 + }, + "font_size": 10 } ], "bar": { diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_1.png b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_1.png index 2d23fbf0..74e81936 100644 Binary files a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_1.png and b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_1.png differ diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_2.png b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_2.png index 4d1f2b5a..ba173aa2 100644 Binary files a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_2.png and b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_2.png differ diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_3.png b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_3.png index 0c79fc07..9033179a 100644 Binary files a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_3.png and b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_3.png differ diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_4.png b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_4.png index e98ab174..58fa52b0 100644 Binary files a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_4.png and b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/dial_dolphin/icon_signal_4.png differ diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_1.png b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_1.png index 2d23fbf0..74e81936 100644 Binary files a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_1.png and b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_1.png differ diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_2.png b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_2.png index 4d1f2b5a..ba173aa2 100644 Binary files a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_2.png and b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_2.png differ diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_3.png b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_3.png index 0c79fc07..9033179a 100644 Binary files a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_3.png and b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_3.png differ diff --git a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_4.png b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_4.png index e98ab174..58fa52b0 100644 Binary files a/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_4.png and b/2.sdk/project/Z5_LT_K7/gui/lv_watch/resource/png/signal/icon_signal_4.png differ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial.c b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial.c index 8a903052..3aecb7f7 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial.c @@ -68,14 +68,6 @@ static void dial_update_display(lv_obj_t * clock_cont) lv_clock_ext_t * clock_ext = (lv_clock_ext_t *)lv_obj_get_ext_attr(clock_cont); watch_dial_t * watch_dial = clock_ext->watch_dial; clock_ext->sec++; - -#ifdef __MMI_DIAL_WITH_SIGNAL_SUPPORT__ - if(0 == clock_ext->sec % 5) //update every 5 sec - { - dial_update_element(watch_dial, ELEMENT_TYPE_SIGNAL); - } -#endif - if(60 == clock_ext->sec) { clock_ext->sec = 0; clock_ext->min++; @@ -114,6 +106,21 @@ static void dial_update_display(lv_obj_t * clock_cont) #endif } + else + { + #ifdef __MMI_DIAL_WITH_SIGNAL_SUPPORT__ + if(0 == (clock_ext->sec % 10)) + { + dial_clean_canvas(false); + uint8_t i = 0; + for(i = ELEMENT_TYPE_MAX - 2; i > ELEMENT_TYPE_INVILID; i--) + { + dial_update_element(watch_dial, i); + } + } + #endif + } + #if DIAL_USE_CANVAS == 0 dial_update_element(watch_dial, ELEMENT_TYPE_TIME_HAND); dial_update_element(watch_dial, ELEMENT_TYPE_TIME_DIGIT);//update every 1 sec diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial.h b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial.h index a20328db..752080d3 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial.h @@ -181,9 +181,9 @@ typedef uint8_t watch_img_type_t; enum { LABEL_TYPE_TIME_HOUR= 0, //0 - LABEL_TYPE_TIME_MIN, //1 - LABEL_TYPE_TIME_SEC, //2 - LABEL_TYPE_TIME_CONNECTOR, //3 ":" "/" + LABEL_TYPE_TIME_MIN, // //1 + LABEL_TYPE_TIME_SEC, // //2 + LABEL_TYPE_TIME_CONNECTOR, // //3 ":" "/" LABEL_TYPE_AM_PM, //4 LABEL_TYPE_WEEK, //5 周一/Mon LABEL_TYPE_WEEK_EN, //6 Mon @@ -208,6 +208,7 @@ enum { LABEL_TYPE_HEART_RATE_BPM, //25 LABEL_TYPE_BLOOD_OXYGEN, //26 LABEL_TYPE_SIGNAL, //27 + LABEL_TYPE_SIGNAL_REGISTER_STATE, // 28 }; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c index 888d6a1a..4b8927c5 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c @@ -504,8 +504,8 @@ static void dial_update_canvas_label(watch_element_base_t * base) { watch_element_label_dsc_t * label_dsc; hal_rtc_t tm; - uint8_t len = 10; - char infotxt[len]; + uint8_t len = 15; + char infotxt[15] = {0}; // infotxt[len] app_adaptor_weather_t weather; app_adaptor_pedometer_record_t record; //app_adaptor_health_info_t health; @@ -655,23 +655,49 @@ static void dial_update_canvas_label(watch_element_base_t * base) /* 2G/4G icon */ if(MMI_MODEM_PLMN_RAT_LTE == rat) - { - #ifdef MMI_PROJECT_Z5_DS_Z12_COMMON - sprintf(infotxt, "5G"); - #else sprintf(infotxt, "4G"); - #endif - } else if(MMI_MODEM_PLMN_RAT_UMTS == rat) sprintf(infotxt, "3G"); else if(MMI_MODEM_PLMN_RAT_GSM == rat) sprintf(infotxt, "2G"); - else - sprintf(infotxt, ""); } - else + + dial_create_canvas_text(infotxt, label_dsc->label_font, label_dsc->text_color, pos.x + label_dsc->text_pos.x, pos.y + label_dsc->text_pos.y); + #endif + break; + + case LABEL_TYPE_SIGNAL_REGISTER_STATE: + #ifdef __MMI_DIAL_WITH_SIGNAL_SUPPORT__ + if(true == watch_modem_sim_present_check_req()) { - sprintf(infotxt, ""); + MMI_MODEM_PLMN_RAT rat; + watch_modem_get_operator_req(&rat); + + if(MMI_MODEM_PLMN_RAT_LTE == rat) + { + /* IMS register state */ + uint8_t ims_reg_state = watch_modem_get_ims_reg_state_req(); + if(1 == ims_reg_state) + sprintf(infotxt, "HD"); + } + else if(MMI_MODEM_PLMN_RAT_UMTS == rat) + { + /* UMTS register state */ + uint8_t umts_reg_state = watch_modem_get_umts_reg_state_req(); + if(0 == umts_reg_state) + sprintf(infotxt, "W"); + else if(1 == umts_reg_state) + sprintf(infotxt, "TD"); + else if(2 == umts_reg_state) + sprintf(infotxt, "H"); + } + else if(MMI_MODEM_PLMN_RAT_GSM == rat) + { + /* GSM register state */ + uint8_t gsm_reg_state = watch_modem_get_gsm_reg_state_req(); + if(1 == gsm_reg_state) + sprintf(infotxt, "E"); + } } dial_create_canvas_text(infotxt, label_dsc->label_font, label_dsc->text_color, pos.x + label_dsc->text_pos.x, pos.y + label_dsc->text_pos.y); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c b/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c index 72e2f40e..8ac8027d 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c @@ -206,11 +206,7 @@ static void status_update(lv_anim_t * anim) lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20); #endif if(MMI_MODEM_PLMN_RAT_LTE == rat) { - #ifdef MMI_PROJECT_Z5_DS_Z12_COMMON - lv_label_set_text(label, "5G"); - #else lv_label_set_text(label, "4G"); - #endif lv_img_set_src(status_ext->phone_signal_img, phone_signal_img[watch_modem_get_signal_bar_req()]); if(!is_wifi_connected) { /* IMS register state */ @@ -274,11 +270,12 @@ static void status_update(lv_anim_t * anim) lv_obj_set_click(label, false); } else { - img = lv_img_create(status_ext->network_status_cont, NULL); - LV_ASSERT_MEM(img); - if(img == NULL) return; - lv_img_set_src(img, ICON_STATUS_NO_SIM_CARD); - lv_img_set_src(status_ext->phone_signal_img, phone_signal_img[0]); + //img = lv_img_create(status_ext->network_status_cont, NULL); + //LV_ASSERT_MEM(img); + //if(img == NULL) return; + //lv_img_set_src(img, ICON_STATUS_NO_SIM_CARD); + //lv_img_set_src(status_ext->phone_signal_img, phone_signal_img[0]); + lv_img_set_src(status_ext->phone_signal_img, ICON_STATUS_NO_SIM_CARD); } // update charging status