From: CCC <2393524978@qq.com> Date: Wed, 9 Aug 2023 02:52:30 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=5e156c52d551e5ee103b88c173527ee1f53f3b9b;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/common/watch_simulator.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/common/watch_simulator.png deleted file mode 100644 index c78510c0..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/common/watch_simulator.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/common/watch_simulator_360.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/common/watch_simulator_360.png deleted file mode 100644 index a9a33b57..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/common/watch_simulator_360.png and /dev/null differ diff --git a/2.sdk/sdk/gui/lv_drivers/indev/crane_onkey.c b/2.sdk/sdk/gui/lv_drivers/indev/crane_onkey.c index b1c8ef43..dba5a2ce 100644 --- a/2.sdk/sdk/gui/lv_drivers/indev/crane_onkey.c +++ b/2.sdk/sdk/gui/lv_drivers/indev/crane_onkey.c @@ -66,6 +66,8 @@ void handle_onkey(struct keypad_param *val) static int poweron_press = 0; static uint32_t press_start = 0; + //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + data->key = LV_KEY_END; val->key_event = KEY_EVENT_NONE; get_onkey_queue(&onkey_curr); diff --git a/2.sdk/sdk/gui/lv_drivers/indev/crane_watch_keypad.c b/2.sdk/sdk/gui/lv_drivers/indev/crane_watch_keypad.c index 907ffff1..056c7360 100644 --- a/2.sdk/sdk/gui/lv_drivers/indev/crane_watch_keypad.c +++ b/2.sdk/sdk/gui/lv_drivers/indev/crane_watch_keypad.c @@ -61,6 +61,8 @@ bool keypad_watch_read(lv_indev_drv_t *indev_drv, lv_indev_data_t *data) handle_vk(&val); } + //printf("[@CHENG_DEBUG][%s][%d]: %d,%d\n", __FUNCTION__, __LINE__, data->key, val.data.key); + if(user_cb) { user_cb(&val); } diff --git a/2.sdk/sdk/gui/lv_drivers/indev/gh3018.c b/2.sdk/sdk/gui/lv_drivers/indev/gh3018.c index 55f6c196..85feef98 100644 --- a/2.sdk/sdk/gui/lv_drivers/indev/gh3018.c +++ b/2.sdk/sdk/gui/lv_drivers/indev/gh3018.c @@ -111,6 +111,8 @@ static void gh3018_stop(void) gh30x_module_stop(); Timer0_Switch(0); gh3018_en_gpio_enable(false); + + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); } void gh3018_init(void) diff --git a/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c b/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c index 6bac8b23..2c3314ec 100644 --- a/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c +++ b/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c @@ -212,6 +212,8 @@ static void sos_key_task(void *param) btn_state = LV_INDEV_STATE_PR; } else { //long press + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + sos_btn_action(NULL); break; } } 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 4342ec24..b4c8a56a 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 @@ -283,7 +283,11 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u lv_page_glue_obj(btn, true); lv_obj_add_protect(btn, LV_PROTECT_PRESS_LOST); +#ifdef __MMI_ZHSX_SUPPORT__ + lv_obj_set_event_cb(btn, NULL); +#else lv_obj_set_event_cb(btn, alarm_list_edit_btn_action); +#endif lv_watch_set_free_num(btn, index); lv_watch_obj_add_element(btn); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c index baebd64c..0fad4446 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c @@ -24,6 +24,12 @@ #define DIAL_PAD_TEST 0 //for test code +#ifdef __MMI_ZHSX_SUPPORT__ +#define MMI_DIAL_PAD_MAX_LENGTH (15) +#else +#define MMI_DIAL_PAD_MAX_LENGTH (12) +#endif + /********************** * STATIC PROTOTYPES **********************/ @@ -77,7 +83,7 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj) ext->ta = lv_textarea_create(obj, NULL); lv_textarea_set_cursor_hidden(ext->ta, true); lv_textarea_set_one_line(ext->ta, true); - lv_textarea_set_max_length(ext->ta, 12); + lv_textarea_set_max_length(ext->ta, MMI_DIAL_PAD_MAX_LENGTH); // lv_textarea_set_max_length(ext->ta, 12); lv_textarea_set_text(ext->ta, ""); lv_textarea_set_text_align(ext->ta, LV_LABEL_ALIGN_CENTER); lv_obj_set_size(ext->ta, DIAL_PAD_TA_W, DIAL_PAD_TA_H); diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h index 5fb88f81..16d69e93 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h +++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h @@ -650,6 +650,13 @@ LV_IMG_DECLARE(img_poweron_logo); #define MESSAGE_BG1 "R:/png/sms_msg/message_bg1.png" #define MES_SHORTMES "R:/png/sms_msg/mes_shortmes.png" +//#if LV_WATCH_SIMULATOR_360 +//#define ICON_WATCH_SIMULATOR "R:/png/common/watch_simulator_360.png" +//#else +//#define ICON_WATCH_SIMULATOR "R:/png/common/watch_simulator.png" +//#endif + + #ifdef __MMI_ZHSX_SUPPORT__ //common @@ -663,12 +670,6 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_BACKGROUND ICON_COMMON_BG_BLACK #endif -#if LV_WATCH_SIMULATOR_360 -#define ICON_WATCH_SIMULATOR "R:/png/common/watch_simulator_360.png" -#else -#define ICON_WATCH_SIMULATOR "R:/png/common/watch_simulator.png" -#endif - //video call #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ 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 20e0b8e1..be5d7064 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 @@ -439,9 +439,7 @@ static void indev_pointer_proc(lv_indev_t * i, lv_indev_data_t * data) * @param data pointer to the data read from the input device */ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) -{ - //printf("[@CHENG_DEBUG][%s][%d]: key=%d\n", __FUNCTION__, __LINE__, data->key); - +{ #if LV_USE_GROUP if(data->state == LV_INDEV_STATE_PR && i->proc.wait_until_release) return; @@ -471,6 +469,9 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) uint32_t prev_state = i->proc.types.keypad.last_state; i->proc.types.keypad.last_state = data->state; + //printf("[@CHENG_DEBUG][%s][%d]: prev_key=%d,key=%d\n", __FUNCTION__, __LINE__, prev_key, data->key); + //LV_LOG_WARN("[@CHENG_DEBUG]: prev_key=%d,key=%d\n", prev_key, data->key); + /*Key press happened*/ if(data->state == LV_INDEV_STATE_PR && prev_state == LV_INDEV_STATE_REL) { i->proc.pr_timestamp = lv_tick_get(); diff --git a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c index c2fb249a..40d5c405 100644 --- a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c +++ b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c @@ -926,7 +926,10 @@ static void keypad_watch_cb(struct keypad_param *arg) if(!watch_is_ready()) return; // in start procedure - if(arg->data.key == LV_KEY_END) { + //printf("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, arg->data.key); + + if(arg->data.key == LV_KEY_END) + { lv_obj_t * facau_obj = lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_AUTOTEST); lv_obj_t * emht_obj = lv_watch_get_activity_obj(ACT_ID_ENGINEER_MODE_ITEM_HWT); if(NULL != facau_obj) { @@ -937,6 +940,7 @@ static void keypad_watch_cb(struct keypad_param *arg) #endif } else { if(arg->key_event == KEY_EVENT_CLICK) { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(set_lcd_only) { set_lcd_only = false; } else { @@ -950,7 +954,8 @@ static void keypad_watch_cb(struct keypad_param *arg) set_lcd_only = false; // sos if(1 != is_in_poweroff_chg_mode()) { - sos_btn_action(NULL); + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + //sos_btn_action(NULL); } } else if(arg->key_event == KEY_EVENT_POWER_ON) { set_lcd_only = false; @@ -959,16 +964,21 @@ static void keypad_watch_cb(struct keypad_param *arg) if(((HAL_POWERUP_BAT == reason)||(HAL_POWERUP_USB == reason))&&(0 != Hal_Battery_Get_Status())) { // from power off charging to power up restarted_flag = true; + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); watch_restart_req(); } } else if(arg->key_event == KEY_EVENT_PRESS) { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(!watch_get_lcd_status()) { watch_set_lcd_status(true); set_lcd_only = true; } } } - } else if(arg->data.key == LV_KEY_ESC) { + } + else if(arg->data.key == LV_KEY_ESC) + { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(arg->key_event == KEY_EVENT_CLICK) { lv_watch_go_back(); }