From: CCC <2393524978@qq.com> Date: Tue, 29 Aug 2023 08:12:38 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=07626f6a634c0efd18a103fbdc31b67831c32c3d;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c index 7d679510..201202bd 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c @@ -870,7 +870,9 @@ const void * lang_text_ch[] = { "设备无网络", // WATCH_TEXT_ID_DEVICE_NO_NETWORK, "设备未绑定", // WATCH_TEXT_ID_DEVICE_NOT_BIND, "拨号盘已关闭\n请在APP上打开", // WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT, - + "删除选中", // WATCH_TEXT_ID_DELETE_CURRENT_ITEM, + "删除全部", // WATCH_TEXT_ID_DELETE_ALL_ITEM, + "无网络", // WATCH_TEXT_ID_NO_NETWORK, //CHENG_MODIFY diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c index 77aee06f..e05a7a5d 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c @@ -870,6 +870,9 @@ const void * lang_text_en[] = { "No network", // WATCH_TEXT_ID_DEVICE_NO_NETWORK, "Not bind", // WATCH_TEXT_ID_DEVICE_NOT_BIND, "Dial pad switch off", // WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT, + "Delete current", // WATCH_TEXT_ID_DELETE_CURRENT_ITEM, + "Delete all", // WATCH_TEXT_ID_DELETE_ALL_ITEM, + "No SIM or no network", // WATCH_TEXT_ID_NO_NETWORK, //CHENG_MODIFY diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h index 7ff25968..354def9d 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -64,7 +64,7 @@ enum WATCH_TEXT_ID_IMSVOPS, /* "VoLTE业务未开通,请检查SIM卡并且当前网络已支持VoLTE" "The volte service is not enabled,Please check the SIM card and the current network supports volte" */ /*weather.c*/ - WATCH_TEXT_ID_NO_NETWORK, /* "暂无数据，请稍候" "No network, please wait" */ + WATCH_TEXT_ID_WEATHER_NO_NETWORK, /* "暂无数据，请稍候" "No network, please wait" */ WATCH_TEXT_ID_SUNNY, /* "晴" "Sunny" */ WATCH_TEXT_ID_CLOUDY, /* "多云" "Cloudy" */ WATCH_TEXT_ID_LIGHT_RAIN, /* "小雨" "Light rain" */ @@ -877,6 +877,9 @@ enum WATCH_TEXT_ID_DEVICE_NO_NETWORK, /* "设备无网络" "No network" */ WATCH_TEXT_ID_DEVICE_NOT_BIND, /* "设备未绑定" "Not bind" */ WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT, /* "拨号盘已关闭\n请在APP上打开" "Dial pad switch off" */ + WATCH_TEXT_ID_DELETE_CURRENT_ITEM, /* "删除选中" "Delete current" */ + WATCH_TEXT_ID_DELETE_ALL_ITEM, /* "删除全部" "Delete all" */ + WATCH_TEXT_ID_NO_NETWORK, /* "无网络" "No SIM or no network" */ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c index b4c8a56a..3c048b23 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c @@ -178,7 +178,7 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj) lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_label_set_text_id(label, WATCH_TEXT_ID_NO_ALARM); - lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0); + lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10); lv_obj_set_click(label, false); } #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c b/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c index a29d3e35..37f251ee 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c @@ -114,7 +114,7 @@ static lv_obj_t * call_log_no_log_info_create(lv_obj_t * obj) lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_obj_set_click(label, false); lv_label_set_text_id(label, WATCH_TEXT_ID_NO_CALL_LOG_INFO); - lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, 0); + lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10); return label; } @@ -210,8 +210,8 @@ static void call_log_content_create(lv_obj_t * list, uint8_t call_log_num, nv_wa label_number = lv_label_create(cont, NULL); lv_obj_add_style(label_number, LV_OBJ_PART_MAIN, &lv_watch_font24); lv_label_set_text(label_number, info->number); - lv_label_set_long_mode(label_number, LV_LABEL_LONG_DOT); - lv_obj_set_width(label_number, lv_obj_get_width(btn[i]) - 20); + lv_label_set_long_mode(label_number, LV_LABEL_LONG_SROLL_CIRC); + lv_obj_set_width(label_number, lv_obj_get_width(btn[i]) - 40); if(contact_info) { if(contact_info->contact_name) @@ -228,10 +228,10 @@ static void call_log_content_create(lv_obj_t * list, uint8_t call_log_num, nv_wa lv_watch_obj_add_element(cont_status_time); if(LV_BIDI_DIR_RTL == lv_obj_get_base_dir(btn[i])) { - lv_obj_align(label_number, cont, LV_ALIGN_IN_TOP_RIGHT, -10, 5); + lv_obj_align(label_number, cont, LV_ALIGN_IN_TOP_RIGHT, -20, 5); lv_obj_align(cont_status_time, cont, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -5); } else { - lv_obj_align(label_number, cont, LV_ALIGN_IN_TOP_LEFT, 10, 5); + lv_obj_align(label_number, cont, LV_ALIGN_IN_TOP_LEFT, 20, 5); lv_obj_align(cont_status_time, cont, LV_ALIGN_IN_BOTTOM_LEFT, 20, -5); } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c index 8f65788a..c39382d7 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c @@ -116,15 +116,15 @@ bool mmi_health_measure_heart_data_process(uint16_t * heart_value) srand(Hal_Timer_Get_Counter()); t_value = 50 + rand() % 150; -#else - mmi_hsensor_heart_value_get(&t_value); -#endif - if(220 < t_value) t_value = 220; else if(50 > t_value) t_value = 50; +#else + mmi_hsensor_heart_value_get(&t_value); +#endif + HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, t_value); * heart_value = t_value; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c b/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c index 7e342eae..f1e524b8 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c @@ -104,10 +104,10 @@ lv_obj_t * restart_and_reset_create(lv_obj_t * activity_obj) if(lv_obj_get_base_dir(obj) == LV_BIDI_DIR_RTL){ lv_obj_align(btn_restart, obj, LV_ALIGN_CENTER, 20, -50); // -20); - lv_obj_align(btn_reset, btn_restart, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 40); // 10); + lv_obj_align(btn_reset, btn_restart, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 50); // 10); } else { lv_obj_align(btn_restart, obj, LV_ALIGN_CENTER, -20, -50); // -20); - lv_obj_align(btn_reset, btn_restart, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 40); // 10); + lv_obj_align(btn_reset, btn_restart, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 50); // 10); } return obj; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c index ccb636bf..0612b082 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c @@ -515,7 +515,7 @@ static void sms_msg_no_network_or_sim_create(lv_obj_t * obj) lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26); lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_obj_set_click(label, false); - lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_CARD); + lv_label_set_text_id(label, WATCH_TEXT_ID_NO_NETWORK); // WATCH_TEXT_ID_NO_SIM_CARD); lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10); #else diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c index 51c65eb0..df5d1b28 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c @@ -24,7 +24,7 @@ const watch_weather_list weather_list[] = { { ICON_FOG, WATCH_TEXT_ID_FOG }, /* WATCH_WEATHER_ID_FOG, */ { ICON_HAZE, WATCH_TEXT_ID_HAZE }, /* WATCH_WEATHER_ID_HAZE, */ { ICON_WEATHER_OTHERS, WATCH_TEXT_ID_OTHER_WEATHER }, /* WATCH_WEATHER_ID_OTHERS = 99, */ - { ICON_NO_NETWORK, WATCH_TEXT_ID_NO_NETWORK }, /* WATCH_WEATHER_ID_NO_INFO = 255*/ + { ICON_NO_NETWORK, WATCH_TEXT_ID_WEATHER_NO_NETWORK }, /* WATCH_WEATHER_ID_NO_INFO = 255*/ }; static lv_obj_t * weather_content_no_info_create(lv_obj_t * par) @@ -238,7 +238,7 @@ const watch_weather_list weather_list[] = { { ICON_FOG, WATCH_TEXT_ID_FOG }, /* WATCH_WEATHER_ID_FOG, */ { ICON_HAZE, WATCH_TEXT_ID_HAZE }, /* WATCH_WEATHER_ID_HAZE, */ { ICON_WEATHER_OTHERS, WATCH_TEXT_ID_OTHER_WEATHER }, /* WATCH_WEATHER_ID_OTHERS = 99, */ - { ICON_NO_NETWORK, WATCH_TEXT_ID_NO_NETWORK }, /* WATCH_WEATHER_ID_NO_INFO = 255*/ + { ICON_NO_NETWORK, WATCH_TEXT_ID_WEATHER_NO_NETWORK }, /* WATCH_WEATHER_ID_NO_INFO = 255*/ }; /**********************