From: CCC <2393524978@qq.com> Date: Fri, 1 Sep 2023 06:22:47 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=32e1b8cc8813d485cd6e9c25b373c7da422d164e;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/new_gui.sh b/2.sdk/new_gui.sh index c22391de..ddf9bc4b 100644 --- a/2.sdk/new_gui.sh +++ b/2.sdk/new_gui.sh @@ -5,7 +5,18 @@ echo "new gui !!!" # cp project/$1/* sdk/ -r # echo "cp project/$1/* sdk/ -r" cd sdk -# export PS_MODE=LTEGSM -# make craneg_modem_watch PS_MODE=LTEGSM -j8 + + +build_time=$(date "+%Y%m%d_%H%M%S") +echo $build_time + +read first_line < build_info.h +echo $first_line + +echo $first_line > build_info.h +echo >> build_info.h +echo "#define MMI_BUILD_TIME \"$build_time\"" >> build_info.h + + make craneg_modem_watch -j8 cd .. \ No newline at end of file diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_alarm.gif b/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_alarm.gif index 475208d7..ec1e426c 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_alarm.gif and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_alarm.gif differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png index 515ca029..ef1b1dd2 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png index a8b30953..a286fbf0 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png index a968a738..d575753c 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png differ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c index 814051b0..d93200d2 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c @@ -36,6 +36,24 @@ void alarm_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority); /********************** * GLOBAL FUNCTIONS ***********************/ + +#ifdef __MMI_ZHSX_SUPPORT__ +void mmi_alarm_ring_click_stop(lv_obj_t * obj, lv_event_t e) +{ + if(LV_EVENT_CLICKED == e) + { + lv_alarm_obj_ext_t * ext = alarm_get_ext(); + if(ext) + { + ext->timer_running = false; + ext->timer_id = NULL; + } + + alarm_cleanup(); + } +} +#endif + lv_obj_t * alarm_create(lv_obj_t * activity_obj) { /* activity obj */ @@ -53,8 +71,38 @@ lv_obj_t * alarm_create(lv_obj_t * activity_obj) lv_watch_obj_set_anim_mode(obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE); lv_alarm_obj_ext_t * ext = lv_obj_allocate_ext_attr(obj, sizeof(lv_alarm_obj_ext_t)); +#ifdef __MMI_ZHSX_SUPPORT__ + lv_obj_t * cont = lv_cont_create(obj, NULL); + lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES); + lv_obj_set_style_local_bg_color(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); + //lv_obj_set_style_local_bg_color(cont, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); + lv_obj_set_click(cont, true); + lv_obj_set_event_cb(cont, mmi_alarm_ring_click_stop); + + lv_obj_t * cont_gif = lv_cont_create(cont, NULL); + lv_obj_set_size(cont_gif, 170, 170); // gif size + lv_obj_align(cont_gif, cont, LV_ALIGN_CENTER, 0, -30); + + hal_rtc_t cur_time; + char time_str[8] = {0}; + + Hal_Rtc_Gettime(&cur_time); + sprintf(time_str, "%02d:%02d", cur_time.tm_hour, cur_time.tm_min); + lv_obj_t * label = lv_label_create(cont, NULL); + lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26); + lv_label_set_text(label, time_str); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label, cont_gif, LV_ALIGN_OUT_BOTTOM_MID, 0, 20); + + ext->gif_info = gif_open(cont_gif, ANIM_ALARM, 0); + //lv_obj_set_style_local_bg_color(ext->gif_info->container, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); + //lv_obj_add_style(ext->gif_info->container, LV_OBJ_PART_MAIN, &lv_style_transp_tight); + lv_obj_set_click(ext->gif_info->container, true); + lv_obj_set_event_cb(ext->gif_info->container, mmi_alarm_ring_click_stop); +#else /* gif open */ ext->gif_info = gif_open(obj, ANIM_ALARM, 0); +#endif if(!ext->gif_info) { printf("open anim_alarm gif failed.\n"); return(NULL); @@ -305,6 +353,13 @@ static void alarm_ring(void) /* set recent alarm to rtc */ alarm_set_recent_to_rtc(alarms); +#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ + if(true == mmi_watch_is_in_do_not_disturb_time()) + { + return; + } +#endif + lv_obj_t * alarm_obj = lv_watch_get_activity_obj(ACT_ID_ALARM); if(NULL != alarm_obj) { return; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c index a47e27ed..8a412a81 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c @@ -822,7 +822,13 @@ lv_obj_t * wechat_msg_sending_screen_create(lv_obj_t * activity_obj) lv_obj_t * img_sending = lv_img_create(img_bkg, NULL); lv_img_set_src(img_sending, ICON_WECHAT_SENDING_PROMPT3); +#if USE_LV_WATCH_UI_240_320 + lv_obj_align(img_sending, img_bkg, LV_ALIGN_IN_BOTTOM_MID, 0, -20); +#elif USE_LV_WATCH_UI_240_280 + lv_obj_align(img_sending, img_bkg, LV_ALIGN_IN_BOTTOM_MID, 0, -40); +#else lv_obj_align(img_sending, img_bkg, LV_ALIGN_IN_BOTTOM_MID, 0, -20); +#endif lv_anim_t * a = &(sending_ext->sending_anim); lv_anim_init(a); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c index 184c6506..741502f1 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c @@ -16,7 +16,7 @@ * DEFINES *********************/ #ifdef __MMI_ZHSX_SUPPORT__ -#define QRCODE_BG_WIDTH (190+8) +#define QRCODE_BG_WIDTH (190+12) #define QRCODE_WIDTH (188) #else #define QRCODE_BG_WIDTH 136 diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c index 9af6f0c6..60db7775 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c +++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c @@ -13,6 +13,7 @@ static void * s_watch_timed_mission_timer_id = NULL; static uint32_t s_watch_timed_location_time_stamp = 0, s_watch_timed_weather_time_stamp = 0; static void * s_watch_heartbeat_action_timer_id = NULL; static uint32_t s_watch_heartbeat_action_time_stamp = 0; +static uint32_t s_watch_timed_location_last_steps = 0; static void mmi_protocol_watch_timed_mission_timer_cb(uint32_t para); static void mmi_protocol_watch_heartbeat_timer_cb(uint32_t para); @@ -209,8 +210,13 @@ static void mmi_protocol_watch_timed_mission_timer_cb(uint32_t para) //location if(mmi_protocol_watch_location_upload_interval_get() <= (cur_time_stamp - s_watch_timed_location_time_stamp)) { - mmi_protocol_action_location(); + uint32_t current_steps = asl_pedometer_steps_get(); + if(20 <= MMI_ABS(current_steps - s_watch_timed_location_last_steps)) + { + mmi_protocol_action_location(); + } s_watch_timed_location_time_stamp = cur_time_stamp; + s_watch_timed_location_last_steps = current_steps; } //weather @@ -241,6 +247,7 @@ void mmi_protocol_watch_timed_mission_action(void) mmi_watch_location_mission_list_init(); mmi_protocol_action_location(); s_watch_timed_location_time_stamp = cur_time_stamp; + s_watch_timed_location_last_steps = asl_pedometer_steps_get(); mmi_protocol_action_get_weather(); s_watch_timed_weather_time_stamp = cur_time_stamp; @@ -307,17 +314,22 @@ bool mmi_protocol_check_state_before_send_action(void) { if(false == watch_modem_sim_present_check_req()) { - PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: no sim\n", __FUNCTION__, __LINE__); + return false; + } + if(MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req()) + { + PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: no signal\n", __FUNCTION__, __LINE__); return false; } if(false == mmi_watch_tcp_connect_state_get()) { - PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: tcp not connect\n", __FUNCTION__, __LINE__); return false; } if(false == mmi_protocol_watch_bind_state_get()) { - PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: watch no bind\n", __FUNCTION__, __LINE__); return false; }