From: @CHENG <2393524978@qq.com> Date: Mon, 29 Apr 2024 06:31:14 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=7ae3d05df9fba7c62d46dadf4fd1a77709c700fd;p=mirrors%2FASR3603_Z5_DS.git gengxin --- diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_conf_CUSTOM.h index e47cfd67..908000fe 100644 --- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_conf_CUSTOM.h +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_conf_CUSTOM.h @@ -12,7 +12,7 @@ //drv -#define DRV_PROJECT_Z5_DS_Z11_COMMON 1 +//#define DRV_PROJECT_Z5_DS_Z11_COMMON 1 #define DRV_PROJECT_Z5_DS_Z11XG_DTM_FZD 1 diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c index 4007895b..d7256839 100644 --- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c +++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c @@ -60,6 +60,13 @@ void mmi_health_info_get(nv_watch_health_info_t * health_info) s_health_info_init = 1; } +#ifdef __DEBUG_DIAL__ + health_info->heart_value = 56; //s_health_info.heart_value; + health_info->blood_high_value = 120; //s_health_info.blood_high_value; + health_info->blood_low_value = 80; //s_health_info.blood_low_value; + health_info->spo2_value = 98; //s_health_info.spo2_value; + health_info->body_value = 37.2; //s_health_info.body_value; +#else health_info->heart_value = s_health_info.heart_value; health_info->blood_high_value = s_health_info.blood_high_value; health_info->blood_low_value = s_health_info.blood_low_value; @@ -69,6 +76,7 @@ void mmi_health_info_get(nv_watch_health_info_t * health_info) health_info->bp_calibrate_high_value = s_health_info.bp_calibrate_high_value; health_info->bp_calibrate_low_value = s_health_info.bp_calibrate_low_value; #endif +#endif } void mmi_health_info_set(nv_watch_health_info_t * health_info) diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c index 84edb5d4..1b5a5a38 100644 --- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c +++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c @@ -77,6 +77,10 @@ void asl_pedometer_poweron_on_init(void) uint32_t asl_pedometer_steps_get(void) { +#ifdef __DEBUG_DIAL__ + return 23456; +#endif + return s_pedometer_data.step; } diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_update_ui.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_update_ui.c index 2faec03b..1260a0eb 100644 --- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_update_ui.c +++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_update_ui.c @@ -217,4 +217,22 @@ void app_adaptor_sos_key_send_ui_msg(void) UI_Send_Inter_Msg(UI_SUB_MODULE_WATCH_UI, MMI_APP_ADAPTOR_SOS_KEY_UI_HANDLE_CMD, NULL); } +#if defined(MMI_PROJECT_Z5_DS_Z11_COMMON) +static bool s_reset_flag = true; +static void mmi_tp_home_key_reset_flag_cb(void *para) +{ + s_reset_flag = true; +} + +void app_tp_home_key_send_ui_msg(void) +{ + if(true == s_reset_flag) + { + s_reset_flag = false; + Hal_Timer_Start(800, mmi_tp_home_key_reset_flag_cb, NULL, false); + UI_Send_Inter_Msg(UI_SUB_MODULE_WATCH_UI, MMI_MSG_HOME_BACK, NULL); + } +} +#endif + diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_update_ui.h b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_update_ui.h index 5589acbb..e673e83e 100644 --- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_update_ui.h +++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_update_ui.h @@ -25,7 +25,6 @@ void app_adaptor_SensorHub_xyz_data_notify(void); void app_adaptor_SensorHub_raise_hand_event_notify(void); void app_adaptor_SensorHub_sedentary_event_notify(void); void app_adaptor_SensorHub_sleep_event_notify(uint8_t sleep_type); - void app_adaptor_SensorHub_hr_bp_bo_notify(void); void app_adaptor_SensorHub_sport_hr_record_notify(void); void app_adaptor_SensorHub_wear_state_notify(void); @@ -38,6 +37,10 @@ void app_adaptor_fota_notify_curr_download_percent(int percent); void app_adaptor_fota_notify_restart(void); void app_adaptor_fota_notify_result(int result); #endif +#if defined(MMI_PROJECT_Z5_DS_Z11_COMMON) +void app_tp_home_key_send_ui_msg(void); +#endif + #ifdef __cplusplus } #endif /* __cpluscplus */ diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c index d7072873..03cafcfd 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c +++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c @@ -388,6 +388,14 @@ void watch_ui_message_handle(uint16_t msgid, void * msg) mmi_ui_msg_update_falldwon(); break; + case MMI_MSG_HOME_BACK: + mmi_ui_msg_tp_go_back(); + break; + // case MMI_MSG_CALL_OFF: + // //mmi_ui_msg_update_falldwon(); + // call_log_confirm_msg(); + // break; + #ifdef __MMI_WECHAT_SUPPORT__ case MMI_MSG_WECHAT_INCOMING: //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -437,7 +445,6 @@ void watch_ui_message_handle(uint16_t msgid, void * msg) mmi_ui_msg_update_remind(); break; case MMI_drop_down_bar_create: - mmi_ui_msg_drop_down_bar(); break; #ifdef __MMI_CUSTOM_HENG_AI__ diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h index 7b9b774e..a7cd7540 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h +++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h @@ -124,7 +124,8 @@ enum #endif MMI_MSG_FALLDOWN, - + MMI_MSG_HOME_BACK, + //MMI_MSG_CALL_OFF, MMI_MSG_REMIND, MMI_drop_down_bar_create, #ifdef __MMI_CUSTOM_HENG_AI__ 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 29e4b2a9..25c8fc0d 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 @@ -191,6 +191,22 @@ void Default_system_alarm_init(void) app_adaptor_alarm_t app_alarm[2]; Hal_Mem_Set(app_alarm, 0, sizeof(app_adaptor_alarm_t) * 2); +#if 1 + // off + app_alarm[0].valid = MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH; + app_alarm[0].on_off = MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH; + app_alarm[0].hour = MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR; + app_alarm[0].min = MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE; + app_alarm[0].repeat_bitmap = 0x01ff; + + // on + app_alarm[1].valid = MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH; + app_alarm[1].on_off = MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH; + app_alarm[1].hour = MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR; + app_alarm[1].min = MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE; + app_alarm[1].repeat_bitmap = 0x03ff; + +#else app_alarm[0].valid = 1; app_alarm[0].on_off = 1; app_alarm[0].hour = 23; @@ -202,6 +218,8 @@ void Default_system_alarm_init(void) app_alarm[1].hour = 6; app_alarm[1].min = 0; app_alarm[1].repeat_bitmap = 0x03ff; +#endif + alarm_set_shutdwon_alarm(app_alarm, 2); } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c index 422089d9..f02fd7e7 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c @@ -45,10 +45,14 @@ static void setting_main_menu_switch_event_cb(lv_obj_t * obj, lv_event_t event) printf("[@CHENG_DEBUG][%s][%d]: style0=0x%x,style1=0x%x\n", __FUNCTION__, __LINE__, ext->style0, ext->style1); if((MMI_MAIN_MENU_STYLE_ONE_PAGE == style_value) && (ext->style1 == obj)) { + #if defined(__MMI_MAIN_MENU_LIST_STYLE__) mmi_main_menu_style_set(MMI_MAIN_MENU_STYLE_LIST); + #elif defined(__MMI_MAIN_MENU_FOUR_GRID_STYLE__) + mmi_main_menu_style_set(MMI_MAIN_MENU_STYLE_FOUR_GRID); + #endif is_change_style = true; } - else if((MMI_MAIN_MENU_STYLE_LIST == style_value) && (ext->style0 == obj)) + else if((MMI_MAIN_MENU_STYLE_LIST == style_value || MMI_MAIN_MENU_STYLE_FOUR_GRID == style_value) && (ext->style0 == obj)) { mmi_main_menu_style_set(MMI_MAIN_MENU_STYLE_ONE_PAGE); is_change_style = true; @@ -128,7 +132,7 @@ static lv_obj_t * setting_main_menu_switch_create(lv_obj_t * activity_obj) MMI_MAIN_MENU_STYLE_E style_value = mmi_main_menu_style_get(); if(MMI_MAIN_MENU_STYLE_ONE_PAGE == style_value) lv_img_set_src(style_img_0, ICON_ITEM_SELECTED); - else if(MMI_MAIN_MENU_STYLE_LIST == style_value) + else if(MMI_MAIN_MENU_STYLE_LIST == style_value || MMI_MAIN_MENU_STYLE_FOUR_GRID == style_value) lv_img_set_src(style_img_1, ICON_ITEM_SELECTED); lv_obj_align(style_btn_0, obj, LV_ALIGN_CENTER, -20, -40); diff --git a/2.sdk/sdk/gui/lv_watch/mmi_default.h b/2.sdk/sdk/gui/lv_watch/mmi_default.h index f1f00e67..139a11bf 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_default.h +++ b/2.sdk/sdk/gui/lv_watch/mmi_default.h @@ -391,7 +391,42 @@ extern "C" #define MMI_USER_PROFILE_INDEX_3_VOLUME_REMIND_DEFAULT (0) // 0-10 #endif +// schedule power on/off +#ifdef MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH +#define MMI_SCHEDULE_POWER_ON_SWITCH_DEFAULT MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH +#else +#define MMI_SCHEDULE_POWER_ON_SWITCH_DEFAULT (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open +#endif + +#ifdef MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR +#define MMI_SCHEDULE_POWER_ON_HOUR_DEFAULT MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR +#else +#define MMI_SCHEDULE_POWER_ON_HOUR_DEFAULT (6) // 0-23 +#endif + +#ifdef MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE +#define MMI_SCHEDULE_POWER_ON_MINUTE_DEFAULT MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE +#else +#define MMI_SCHEDULE_POWER_ON_MINUTE_DEFAULT (0) // 0-59 +#endif +#ifdef MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH +#define MMI_SCHEDULE_POWER_OFF_SWITCH_DEFAULT MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH +#else +#define MMI_SCHEDULE_POWER_OFF_SWITCH_DEFAULT (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open +#endif + +#ifdef MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR +#define MMI_SCHEDULE_POWER_OFF_HOUR_DEFAULT MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR +#else +#define MMI_SCHEDULE_POWER_OFF_HOUR_DEFAULT (23) // 0-23 +#endif + +#ifdef MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE +#define MMI_SCHEDULE_POWER_OFF_MINUTE_DEFAULT MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE +#else +#define MMI_SCHEDULE_POWER_OFF_MINUTE_DEFAULT (59) // 0-59 +#endif diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c index 2cc57fdd..69232906 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c +++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c @@ -517,6 +517,13 @@ void mmi_ui_msg_update_falldwon(void) } +void mmi_ui_msg_tp_go_back(void) +{ + lv_watch_go_back(); +} + + + void mmi_watch_searching_aciton(void) { SUNDRY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h index a3dfadf3..ca4d1af1 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h +++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h @@ -71,9 +71,6 @@ void mmi_center_number_dialing_action(void); #define NO_SIM_POWER_OFF_INTERVAL (15 * 60 * 1000) // ms #define NO_SIM_POWER_OFF_PROMPT_INTERVAL (15) // s -#define NO_SIM_POWER_OFF_TASK_CHECK (5 * 1000) // ms - - void mmi_ui_msg_update_no_sim_power_off(void); void mmi_watch_no_sim_power_off_check_action(void); void mmi_watch_no_sim_power_off_check_mission(void); diff --git a/2.sdk/sdk/gui/lvgl/src/lv_core/lv_indev.c b/2.sdk/sdk/gui/lvgl/src/lv_core/lv_indev.c index be5d7064..50d9c3ed 100644 --- a/2.sdk/sdk/gui/lvgl/src/lv_core/lv_indev.c +++ b/2.sdk/sdk/gui/lvgl/src/lv_core/lv_indev.c @@ -424,6 +424,14 @@ static void indev_pointer_proc(lv_indev_t * i, lv_indev_data_t * data) if(i->proc.state == LV_INDEV_STATE_PR) { indev_proc_press(&i->proc); + + //printf("[@CHENG_DEBUG][%s][%d]: x=%d,y=%d\n", __FUNCTION__, __LINE__, data->point.x, data->point.y); + #if defined(MMI_PROJECT_Z5_DS_Z11_COMMON) + if(data->point.x >= 180 && data->point.y >= 480) + { + app_tp_home_key_send_ui_msg(); + } + #endif } else { indev_proc_release(&i->proc);