From: CCC <2393524978@qq.com> Date: Thu, 23 Nov 2023 06:57:03 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=76447cbd64ed373a2116b25515554fd8006f2677;p=mirrors%2FASR3603_Z5.git gengxin --- 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 a80e8566..02c52780 100644 --- a/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c +++ b/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c @@ -295,6 +295,29 @@ void sos_key_param_set(uint8_t param)//0:sos key task -normall, 1:sos key task - void sos_key_ui_handle(void) { +#ifdef __MMI_KEY_BACK_RUN_PHONEBOOK_WHEN_IN_DIAL__ + if(lv_watch_is_activity_one_level()) + { + if(mEndKeyTimer != NULL) + Hal_Timer_Stop(mEndKeyTimer); + mEndKeyTimer = Hal_Timer_Start(300, EndKeyCountHandle, NULL, 0); + + phonebook_create_btn_event_cb(NULL, LV_EVENT_CLICKED); + } + else if(lv_watch_get_top_activity_obj() == lv_watch_get_activity_obj(ACT_ID_LOWBATTERY)) + { + if(mEndKeyTimer != NULL) + Hal_Timer_Stop(mEndKeyTimer); + mEndKeyTimer = Hal_Timer_Start(300, EndKeyCountHandle, NULL, 0); + } + else + { + handle_ResetSosPresscout(); + lv_watch_go_back(); + } + +#else + if(lv_watch_is_activity_one_level() || lv_watch_get_top_activity_obj() == lv_watch_get_activity_obj(ACT_ID_LOWBATTERY) ) { if(mEndKeyTimer != NULL) @@ -304,6 +327,7 @@ void sos_key_ui_handle(void) handle_ResetSosPresscout(); lv_watch_go_back(); } +#endif } #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h index 0e41365a..e717476e 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h @@ -72,6 +72,12 @@ typedef struct { uint8_t module; bool istest[AUTOTEST_ITEM_NUM]; lv_obj_t *label_key_state; //valid when 'module' is AUTOTEST_PRESS_KEY +#ifdef __MMI_ZHSX_SUPPORT__ + lv_obj_t * cont_key_power; + lv_obj_t * cont_key_back; + lv_obj_t * label_prompt; + TIMER_ID cycle_timer_id; +#endif uint8_t * buffer; uint32_t buffer_size; lv_task_t * record_task; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c index 40ed9b74..7b82221f 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c @@ -67,9 +67,7 @@ const struct { { AUTOTEST_CALL, WATCH_TEXT_ID_CALL, autotest_call_create }, { AUTOTEST_MEMORY, WATCH_TEXT_ID_MEMORY, autotest_memory_create }, { AUTOTEST_BACKLIGHT, WATCH_TEXT_ID_BACKLIGHT, autotest_backlight_create }, -#ifndef __MMI_ZHSX_SUPPORT__ { AUTOTEST_GRAVITY, WATCH_TEXT_ID_GRAVITY, autotest_gravity_create }, -#endif { AUTOTEST_BATTERY, WATCH_TEXT_ID_BATTERY, autotest_battery_create }, { AUTOTEST_VIBRATION, WATCH_TEXT_ID_VIBRATION, autotest_vibration_create }, { AUTOTEST_WIFI, WATCH_TEXT_ID_TR_WIFI, autotest_wifi_create }, @@ -151,11 +149,15 @@ void autotest_test_item_create(lv_obj_t * par, uint8_t num) num = num + 1; } ext->module = num; +#ifdef __MMI_ZHSX_SUPPORT__ + autotest_itemlist[num].item_create(par); +#else if(num == AUTOTEST_GPS || num == AUTOTEST_WIFI || num == AUTOTEST_SIMCARD) { autotest_connectivity_create(par); } else { autotest_itemlist[num].item_create(par); } +#endif } watchLangTxtId_t autotest_get_item_textId(uint8_t num) @@ -163,6 +165,163 @@ watchLangTxtId_t autotest_get_item_textId(uint8_t num) return autotest_itemlist[num].txtId; } +#ifdef __MMI_ZHSX_SUPPORT__ + +static uint8_t s_key_power_checked = 0; +static uint8_t s_key_back_checked = 0; +static uint8_t s_key_back_press_count = 0; + +void autotest_key_result_update(void) +{ + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if((NULL != ext_fac) && (AUTOTEST_PRESS_KEY == ext_fac->module)) + { + if(s_key_power_checked && s_key_back_checked) + { + s_key_power_checked = 0; + s_key_back_checked = 0; + s_key_back_press_count = 0; + + sos_key_fac_mode_flag_clear(); + sos_key_param_set(0); + + ext_fac->test_res[AUTOTEST_PRESS_KEY] = TEST_SUCCESS; + autotest_testresult_create(lv_obj_get_parent(ext_fac->cont_key_power), TEST_SUCCESS, AUTOTEST_PRESS_KEY + 1); + } + } +} + +void autotest_key_event(struct keypad_param * arg) +{ + static uint8_t last_event = KEY_EVENT_NONE; + static uint8_t last_state = LV_INDEV_STATE_REL; + static uint8_t long_pressed = 0; + + if((last_event == arg->key_event) && (last_state == arg->data.state)) { + return; + } + printf("%s: event=%d, state=%d\n", __func__, arg->key_event, arg->data.state); + + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if((NULL != ext_fac) && (AUTOTEST_PRESS_KEY == ext_fac->module)) + { + if((KEY_EVENT_POWER_ON == arg->key_event) || (KEY_EVENT_LONG_PRESS == arg->key_event)) + { + long_pressed = 1; + } + else + { + if(LV_INDEV_STATE_PR == arg->data.state) + { + + } + else if((KEY_EVENT_CLICK == arg->key_event && LV_INDEV_STATE_REL == arg->data.state) + || (KEY_EVENT_RELEASE == arg->key_event && long_pressed) + ) + { + long_pressed = 0; + s_key_power_checked = 1; + lv_obj_set_style_local_bg_color(ext_fac->cont_key_power, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN); + autotest_key_result_update(); + } + } + } + + last_event = arg->key_event; + last_state = arg->data.state; +} + +static void autotest_key_back_update(lv_anim_t * anim) +{ + if(0==sos_key_fac_mode_flag_get()) + { + // pressed + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + } + else if(1==sos_key_fac_mode_flag_get()) + { + // long pressed + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + } + else if(2==sos_key_fac_mode_flag_get()) + { + // released + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + s_key_back_press_count = 0; + s_key_back_checked = 1; + lv_obj_set_style_local_bg_color(anim->var, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN); + autotest_key_result_update(); + } + else + { + s_key_back_press_count++; + if(s_key_back_press_count > 100) + { + s_key_back_press_count = 0; + s_key_back_checked = 0; + sos_key_fac_mode_flag_clear(); + sos_key_param_set(0); + } + } +} + +void autotest_presskey_create(lv_obj_t * par) +{ + s_key_power_checked = 0; + s_key_back_checked = 0; + s_key_back_press_count = 0; + + sos_key_fac_mode_flag_clear(); + sos_key_param_set(1); + + lv_obj_t * title = autotest_title_create(par, WATCH_TEXT_ID_PRESS_KEY); + lv_obj_t * cont_key_power = lv_cont_create(par, NULL); + lv_obj_set_size(cont_key_power, LV_HOR_RES / 3, LV_HOR_RES / 4); + lv_obj_set_style_local_bg_color(cont_key_power, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); + lv_obj_align(cont_key_power, NULL, LV_ALIGN_CENTER, 0, -30); + + lv_obj_t * label_key_power = lv_label_create(cont_key_power, NULL); + lv_label_set_text_id(label_key_power, WATCH_TEXT_ID_KEY_POWER); + lv_obj_add_style(label_key_power, LV_LABEL_PART_MAIN, &lv_watch_font20_black); + lv_label_set_align(label_key_power, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_key_power, NULL, LV_ALIGN_CENTER, 0, 0); + + lv_obj_t * cont_key_back = lv_cont_create(par, NULL); + lv_obj_set_size(cont_key_back, LV_HOR_RES / 3, LV_HOR_RES / 4); + lv_obj_set_style_local_bg_color(cont_key_back, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); + lv_obj_align(cont_key_back, cont_key_power, LV_ALIGN_OUT_BOTTOM_MID, 0, 1); + + lv_obj_t * label_key_back = lv_label_create(cont_key_back, NULL); + lv_label_set_text_id(label_key_back, WATCH_TEXT_ID_KEY_BACK); + lv_obj_add_style(label_key_back, LV_LABEL_PART_MAIN, &lv_watch_font20_black); + lv_label_set_align(label_key_back, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_key_back, NULL, LV_ALIGN_CENTER, 0, 0); + + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(NULL != ext_fac) + { + ext_fac->module = AUTOTEST_PRESS_KEY; + ext_fac->cont_key_power = cont_key_power; + ext_fac->cont_key_back = cont_key_back; + } + + lv_anim_path_t path; + lv_anim_path_init(&path); + lv_anim_path_set_cb(&path, lv_anim_path_step); + + lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_var(&a, cont_key_back); + lv_anim_set_start_cb(&a, (lv_anim_ready_cb_t)autotest_key_back_update); + lv_anim_set_time(&a, 1); + lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); + lv_anim_set_repeat_delay(&a, 200); + lv_anim_set_delay(&a, 200); + lv_anim_start(&a); +} + +#else + #if USE_CRANE_WATCH_KEYPAD void autotest_key_event(struct keypad_param * arg) { @@ -231,6 +390,7 @@ void autotest_presskey_create(lv_obj_t * par) autotest_testresult_create(lv_obj_get_parent(ext_fac->label_key_state), TEST_SUCCESS, AUTOTEST_PRESS_KEY + 1); #endif } +#endif void autotest_versioninfo_create(lv_obj_t * par) { @@ -460,6 +620,83 @@ void autotest_connectivity_create(lv_obj_t * par) lv_obj_set_event_cb(btn, autotest_connect_stopbtn_event_cb); } +#ifdef __MMI_ZHSX_SUPPORT__ + +static uint8_t s_wifi_scan_count = 0; +static uint8_t s_wifi_scan_max_times = 0; + +static void mmi_autotest_wifi_scan_callback(app_adp_wifi_result_t result, app_adp_wifi_ap_list * ap_list); + +static void mmi_autotest_wifi_restart_callback(void * param) +{ + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(ext_fac == NULL) + return; + + if(NULL != ext_fac->cycle_timer_id) + { + Hal_Timer_Stop(ext_fac->cycle_timer_id); + ext_fac->cycle_timer_id = NULL; + } + app_adaptor_wifi_scan(1,7,8,1, mmi_autotest_wifi_scan_callback); +} + +static void mmi_autotest_wifi_scan_callback(app_adp_wifi_result_t result, app_adp_wifi_ap_list * ap_list) +{ + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(ext_fac == NULL) + return; + + if(ap_list->count > 0) + { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + MMI_Modem_Wifi_Ctrl_Req(0,1,7,8,1); + + ext_fac->test_res[AUTOTEST_WIFI] = TEST_SUCCESS; + autotest_testresult_create(lv_obj_get_parent(ext_fac->label_prompt), TEST_SUCCESS, AUTOTEST_WIFI + 1); + } + else if(ap_list->count <= 2) + { + if(s_wifi_scan_max_times <= s_wifi_scan_count) + { + MMI_Modem_Wifi_Ctrl_Req(0,1,7,8,1); + + ext_fac->test_res[AUTOTEST_WIFI] = TEST_FAILED; + autotest_testresult_create(lv_obj_get_parent(ext_fac->label_prompt), TEST_FAILED, AUTOTEST_WIFI + 1); + } + else + { + s_wifi_scan_count++; + MMI_Modem_Wifi_Ctrl_Req(0,1,7,8,1); + + ext_fac->cycle_timer_id = Hal_Timer_Start(1000, mmi_autotest_wifi_restart_callback, NULL, 0); + } + } +} + +void autotest_wifi_create(lv_obj_t * par) +{ + autotest_title_create(par, WATCH_TEXT_ID_WIFI_TEST); + + lv_obj_t * label = lv_label_create(par, NULL); + lv_label_set_text_id(label, WATCH_TEXT_ID_WIFI_SCAN_TESTING); + lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20); + lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10); + + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(NULL != ext_fac) + { + ext_fac->module = AUTOTEST_WIFI; + ext_fac->label_prompt = label; + } + + s_wifi_scan_count = 1; + s_wifi_scan_max_times = 4; + app_adaptor_wifi_scan(1,7,8,1, mmi_autotest_wifi_scan_callback); +} + +#else + void autotest_wifi_create(lv_obj_t * par) { autotest_title_create(par, WATCH_TEXT_ID_WIFI_TEST); @@ -475,6 +712,7 @@ void autotest_wifi_create(lv_obj_t * par) autotest_resultbtn_create(par, AUTOTEST_WIFI); } +#endif void autotest_gps_create(lv_obj_t * par) { @@ -660,6 +898,94 @@ void autotest_backlight_create(lv_obj_t * par) autotest_resultbtn_create(par, AUTOTEST_BACKLIGHT); } +#ifdef __MMI_ZHSX_SUPPORT__ + +static uint8_t s_gsensor_count = 0; +static uint8_t s_gsensor_max_times = 0; + +static void mmi_autotest_gsensor_status_update(lv_anim_t * anim) +{ + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(ext_fac == NULL) + return; + + char str[128] = {0}; + uint8_t id = mmi_gsensor_sensor_id_get(); + int16_t chip_x = 0, chip_y = 0, chip_z = 0; + + xMotion_Chip_Read_XYZ(&chip_x, &chip_y, &chip_z); + sprintf(str, "%s %s 0x%x\nX: %d\nY: %d\nZ: %d", + (char *)lv_lang_get_text(WATCH_TEXT_ID_GSENSOR), + "id :", + id, + chip_x, + chip_y, + chip_z); + lv_label_set_text(anim->var, str); + + s_gsensor_count++; + if(s_gsensor_max_times <= s_gsensor_count) + { + if(chip_x || chip_y || chip_z) + { + ext_fac->test_res[AUTOTEST_GRAVITY] = TEST_SUCCESS; + autotest_testresult_create(lv_obj_get_parent(ext_fac->label_prompt), TEST_SUCCESS, AUTOTEST_GRAVITY + 1); + } + else + { + ext_fac->test_res[AUTOTEST_GRAVITY] = TEST_FAILED; + autotest_testresult_create(lv_obj_get_parent(ext_fac->label_prompt), TEST_FAILED, AUTOTEST_GRAVITY + 1); + } + } +} + +void autotest_gravity_create(lv_obj_t * par) +{ + autotest_title_create(par, WATCH_TEXT_ID_GRAVITY); + + lv_obj_t * label = lv_label_create(par, NULL); + //lv_label_set_text_id(label, WATCH_TEXT_ID_WIFI_SCAN_TESTING); + lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20); + //lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10); + lv_obj_set_width(label, LV_HOR_RES - 40); + lv_obj_set_pos(label, 20, 70); + + char label_str[128] = {0}; + uint8_t id = mmi_gsensor_sensor_id_get(); + + sprintf(label_str, "%s %s 0x%x\nX: \nY: \nZ: \n", + (char *)lv_lang_get_text(WATCH_TEXT_ID_GSENSOR), + "id :", + id); + lv_label_set_text(label, label_str); + + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(NULL != ext_fac) + { + ext_fac->module = AUTOTEST_GRAVITY; + ext_fac->label_prompt = label; + } + + s_gsensor_count = 1; + s_gsensor_max_times = 4; + + lv_anim_path_t path; + lv_anim_path_init(&path); + lv_anim_path_set_cb(&path, lv_anim_path_step); + + lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_var(&a, label); + lv_anim_set_start_cb(&a, (lv_anim_ready_cb_t)mmi_autotest_gsensor_status_update); + lv_anim_set_time(&a, 1); + lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); + lv_anim_set_delay(&a,1000); + lv_anim_set_repeat_delay(&a, 1000); + lv_anim_start(&a); +} + +#else + void autotest_gravity_create(lv_obj_t * par) { autotest_title_create(par, WATCH_TEXT_ID_GRAVITY); @@ -673,6 +999,7 @@ void autotest_gravity_create(lv_obj_t * par) autotest_resultbtn_create(par, AUTOTEST_GRAVITY); } +#endif void autotest_battery_create(lv_obj_t * par) { diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_config.h b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_config.h index 96a43d23..bef1166b 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_config.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_config.h @@ -31,7 +31,11 @@ extern "C" { #define FACTORY_MODE_LCD_COLOR 1 #define FACTORY_MODE_CAMERA 1 #define FACTORY_MODE_WIFI 1 +#if USE_GPS #define FACTORY_MODE_GPS 1 +#else +#define FACTORY_MODE_GPS 0 +#endif #define FACTORY_MODE_SPEAKER 1 #define FACTORY_MODE_MICPHONE 1 #define FACTORY_MODE_SIMCARD 1 @@ -40,7 +44,11 @@ extern "C" { #define FACTORY_MODE_BACKLIGHT 0 #define FACTORY_MODE_GRAVITY 1 #define FACTORY_MODE_BATTERY 0 +#ifdef __MMI_NOT_SUPPORT_VIBRATION__ +#define FACTORY_MODE_VIBRATION 0 +#else #define FACTORY_MODE_VIBRATION 1 +#endif /********************** * TYPEDEFS diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c index b7191fc2..fd4ea995 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c @@ -137,6 +137,7 @@ lv_obj_t * factorymode_main_create(lv_obj_t * activity_obj) return NULL; } watch_set_suspend_enable(false, ACT_ID_FACTORY_MODE_MAIN, 0); + watch_set_suspend_enable(false, ACT_ID_FACTORY_MODE_TEST, 0); /*Allocate the object type specific extended data*/ lv_factory_obj_ext_t * ext = lv_obj_allocate_ext_attr(obj, sizeof(lv_factory_obj_ext_t)); LV_ASSERT_MEM(ext); @@ -147,6 +148,12 @@ lv_obj_t * factorymode_main_create(lv_obj_t * activity_obj) ext->label_key_state = NULL; ext->buffer = NULL; ext->timer = NULL; +#ifdef __MMI_ZHSX_SUPPORT__ + ext->cont_key_power = NULL; + ext->cont_key_back = NULL; + ext->label_prompt = NULL; + ext->cycle_timer_id = NULL; +#endif factorymode_init_test_res(); factorymode_init_style(); factorymode_init_testmodule(); @@ -344,6 +351,7 @@ static void factorymode_main_prepare_destory(lv_obj_t * activity_obj) lv_watch_png_cache_all_free(); watch_set_suspend_enable(true, ACT_ID_FACTORY_MODE_MAIN, 0); + watch_set_suspend_enable(true, ACT_ID_FACTORY_MODE_TEST, 0); } static void factorymode_autotest_create_btn_event_cb(lv_obj_t * btn, lv_event_t e) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c index 2149b2af..1c58b9b5 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c @@ -308,7 +308,8 @@ static void factorymode_loop_prepare_destory(lv_obj_t * activity_obj) { #if USE_LV_WATCH_MODEM_ADAPTOR != 0 #if 1 //set volume for end cgy add - Hal_Call_Speaker(HAL_CALL_SPK_ON, HAL_AUDIO_SPK_LEVEL_8); + //Hal_Call_Speaker(HAL_CALL_SPK_ON, HAL_AUDIO_SPK_LEVEL_8); + Hal_Call_Speaker(HAL_CALL_SPK_ON, HAL_AUDIO_SPK_LEVEL_MAX); #endif //AUDIOHAL_ERR_T nStatus; @@ -367,7 +368,8 @@ static lv_obj_t * factorymode_loop_create(lv_obj_t * activity_obj) #if USE_LV_WATCH_MODEM_ADAPTOR != 0 #if 1 //set volume for begin cgy add - Hal_Call_Speaker(HAL_CALL_SPK_ON, HAL_AUDIO_SPK_LEVEL_8); + //Hal_Call_Speaker(HAL_CALL_SPK_ON, HAL_AUDIO_SPK_LEVEL_8); + Hal_Call_Speaker(HAL_CALL_SPK_ON, HAL_AUDIO_SPK_LEVEL_MAX); #endif //AUDIOHAL_ERR_T nStatus; //nStatus = AudioHAL_AifLoopBack(true); @@ -1479,7 +1481,16 @@ static void factory_agetest_destory(void) static void factorymode_agetest_prepare_destory(lv_obj_t * activity_obj) { lv_watch_png_cache_all_free(); +#ifdef __MMI_ZHSX_SUPPORT__ + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(NULL != ext_fac && NULL != ext_fac->cycle_timer_id) + { + Hal_Timer_Stop(ext_fac->cycle_timer_id); + ext_fac->cycle_timer_id = NULL; + } +#else watch_set_suspend_enable(true,ACT_ID_FACTORY_MODE_TEST,0); +#endif Hal_Tone_Play_End(); factory_agetest_destory(); } @@ -2343,6 +2354,137 @@ void factory_mode_calibration_create_btn_cb(lv_obj_t * btn,lv_event_t e) } } +#ifdef __MMI_ZHSX_SUPPORT__ +static void mmi_factorymode_agetest_select_prepare_destory(lv_obj_t * activity_obj) +{ + lv_watch_png_cache_all_free(); +} + +static void mmi_factorymode_agetest_timer_cb(void * param) +{ + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(NULL == ext_fac) + return; + + if(NULL != ext_fac->cycle_timer_id) + { + Hal_Timer_Stop(ext_fac->cycle_timer_id); + ext_fac->cycle_timer_id = NULL; + } + + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_TEST); + if(NULL != activity_obj) + { + factorymode_agetest_prepare_destory(activity_obj); + lv_obj_del(activity_obj); + } +} + +static void mmi_factorymode_agetest_select_event_cb(lv_obj_t * btn, lv_event_t e) +{ + if(LV_EVENT_CLICKED != e) + return; + + lv_factory_obj_ext_t * ext_fac = factorymode_get_ext(); + if(NULL == ext_fac) + return; + + uint32_t select_minutes = lv_watch_get_free_num(btn); // minutes + + if(NULL != ext_fac->cycle_timer_id) + { + Hal_Timer_Stop(ext_fac->cycle_timer_id); + ext_fac->cycle_timer_id = NULL; + } + ext_fac->cycle_timer_id = Hal_Timer_Start(select_minutes * 60 * 1000, mmi_factorymode_agetest_timer_cb, NULL, false); + + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_TEST); + if(NULL != activity_obj) + { + mmi_factorymode_agetest_select_prepare_destory(activity_obj); + lv_obj_del(activity_obj); + } + + //watch_set_suspend_enable(false, ACT_ID_FACTORY_MODE_TEST, 0); + Hal_NFFS_File_Play_Repeat(AUDIO_INCOMING_CALL, HAL_AUDIO_SPK_LEVEL_9/*query_current_volume()*/); + factorymode_agetest_create(NULL); +} + +static lv_obj_t * mmi_factorymode_agetest_select_create(lv_obj_t * activity_obj) +{ + if(activity_obj == NULL) + { + lv_watch_activity_ext_t activity_ext; + memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t)); + activity_ext.actId = ACT_ID_FACTORY_MODE_TEST; + activity_ext.create = mmi_factorymode_agetest_select_create; + activity_ext.prepare_destory = mmi_factorymode_agetest_select_prepare_destory; + activity_obj = lv_watch_creat_activity_obj(&activity_ext); + LV_ASSERT_MEM(activity_obj); + if(NULL == activity_obj) + return NULL; + } + + lv_obj_t * obj = lv_watch_obj_create(activity_obj); + LV_ASSERT_MEM(obj); + if(NULL == obj) + return NULL; + + lv_obj_t * cont = lv_cont_create(obj, NULL); + lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES); + lv_obj_add_style(cont,LV_OBJ_PART_MAIN, &lv_watch_style_transp); + lv_watch_obj_add_element(cont); + + // + lv_obj_t * btn_120 = lv_btn_create(cont, NULL); + lv_obj_set_size(btn_120, LV_HOR_RES * 2 / 3, 40); + lv_obj_align(btn_120, NULL, LV_ALIGN_IN_TOP_MID, 0, 50); + lv_watch_set_free_num(btn_120, 120); // minutes + lv_obj_set_event_cb(btn_120, mmi_factorymode_agetest_select_event_cb); + + lv_obj_t * label_120 = lv_label_create(btn_120, NULL); + lv_obj_add_style(label_120, LV_LABEL_PART_MAIN, &lv_watch_font26); + lv_label_set_text_id(label_120, WATCH_TEXT_ID_2_HOUR); + lv_label_set_align(label_120, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_120, NULL, LV_ALIGN_CENTER, 0, 0); + + // + lv_obj_t * btn_240 = lv_btn_create(cont, btn_120); + lv_obj_align(btn_240, btn_120, LV_ALIGN_OUT_BOTTOM_MID, 0, 20); + lv_watch_set_free_num(btn_240, 240); // minutes + lv_obj_set_event_cb(btn_240, mmi_factorymode_agetest_select_event_cb); + + lv_obj_t * label_240 = lv_label_create(btn_240, NULL); + lv_obj_add_style(label_240, LV_LABEL_PART_MAIN, &lv_watch_font26); + lv_label_set_text_id(label_240, WATCH_TEXT_ID_4_HOUR); + lv_label_set_align(label_240, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_240, NULL, LV_ALIGN_CENTER, 0, 0); + + // + lv_obj_t * btn_360 = lv_btn_create(cont, btn_240); + lv_obj_align(btn_360, btn_240, LV_ALIGN_OUT_BOTTOM_MID, 0, 20); + lv_watch_set_free_num(btn_360, 360); // minutes + lv_obj_set_event_cb(btn_360, mmi_factorymode_agetest_select_event_cb); + + lv_obj_t * label_360 = lv_label_create(btn_360, NULL); + lv_obj_add_style(label_360, LV_LABEL_PART_MAIN, &lv_watch_font26); + lv_label_set_text_id(label_360, WATCH_TEXT_ID_6_HOUR); + lv_label_set_align(label_360, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_360, NULL, LV_ALIGN_CENTER, 0, 0); + + return obj; +} + +void factorymode_agetest_create_btn_cb(lv_obj_t * btn,lv_event_t e) +{ + if(LV_EVENT_CLICKED != e) + return; + + mmi_factorymode_agetest_select_create(NULL); +} + +#else + void factorymode_agetest_create_btn_cb(lv_obj_t * btn,lv_event_t e) { if(e != LV_EVENT_CLICKED) return; @@ -2350,5 +2492,6 @@ void factorymode_agetest_create_btn_cb(lv_obj_t * btn,lv_event_t e) Hal_NFFS_File_Play_Repeat(AUDIO_INCOMING_CALL, HAL_AUDIO_SPK_LEVEL_9/*query_current_volume()*/); factorymode_agetest_create(NULL); } +#endif #endif /*USE_LV_WATCH_FACTORY_MODE*/ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h index 6696fc08..febd8939 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h @@ -53,7 +53,7 @@ typedef enum typedef struct { lv_watch_obj_ext_t old_ext; - lv_anim_t sending_anim; + //lv_anim_t sending_anim; lv_obj_t * sending_img; lv_obj_t * sending_label; TIMER_ID sending_timer_id, result_timer_id; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c index 1a29d14b..3abbedc2 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c @@ -621,6 +621,7 @@ void wechat_chat_list_msg_item_delete_create(void) } } +/* void wechat_msg_sending_anim_cb(lv_anim_t * a) { lv_obj_t * img = a->var; @@ -644,6 +645,7 @@ void wechat_msg_sending_anim_cb(lv_anim_t * a) } s_wechat_play_anim_count++; } +*/ void wechat_msg_sending_result_screen_timeout(void *para) { @@ -676,6 +678,7 @@ void wechat_msg_sending_screen_timeout(void *para) sending_ext->sending_timer_id = NULL; } +/* if(NULL != sending_ext->sending_anim.var) { lv_obj_t * img_bkg = lv_obj_get_parent(sending_ext->sending_anim.var); @@ -685,6 +688,17 @@ void wechat_msg_sending_screen_timeout(void *para) lv_obj_del(sending_ext->sending_anim.var); sending_ext->sending_anim.var = NULL; } +*/ + if(NULL != sending_ext->sending_img && NULL != sending_ext->sending_label) + { + bool result = sending_ext->send_result; + + lv_img_set_src(sending_ext->sending_img, ((true == result) ? ICON_WECHAT_SENDING_SUCC : ICON_WECHAT_SENDING_FAILED)); + lv_obj_align(sending_ext->sending_img, NULL, LV_ALIGN_CENTER, 0, 0); + + lv_label_set_text_id(sending_ext->sending_label, ((true == result) ? WATCH_TEXT_ID_COMMON_SEND_SUCCESS : WATCH_TEXT_ID_COMMON_SEND_FAILED)); + lv_obj_align(sending_ext->sending_label, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -25); + } sending_ext->result_timer_id = Hal_Timer_Start(1500, wechat_msg_sending_result_screen_timeout, sending_ext, FALSE); } @@ -735,7 +749,7 @@ lv_obj_t * wechat_msg_sending_screen_create(lv_obj_t * activity_obj) return NULL; wechat_chat_list_set_slide_enable(&sending_ext->old_ext, false); /*prevent to slide out while recording*/ - _lv_memset_00(&(sending_ext->sending_anim), sizeof(lv_anim_t)); + //_lv_memset_00(&(sending_ext->sending_anim), sizeof(lv_anim_t)); sending_ext->send_result = wechat_msg_send_to_server(); sending_ext->sending_timer_id = Hal_Timer_Start(1000 * 3, wechat_msg_sending_screen_timeout, sending_ext, FALSE); sending_ext->result_timer_id = NULL; @@ -743,7 +757,18 @@ lv_obj_t * wechat_msg_sending_screen_create(lv_obj_t * activity_obj) lv_obj_t * img_bkg = lv_img_create(obj, NULL); lv_img_set_src(img_bkg, ICON_WECHAT_SENDING_BG); lv_obj_align(img_bkg, obj, LV_ALIGN_CENTER, 0, 0); + sending_ext->sending_img = img_bkg; + + lv_obj_t * label = lv_label_create(img_bkg, NULL); + lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26_black); + //lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK); + //lv_obj_set_width(label, lv_obj_get_width(obj) * 2 / 3); + lv_label_set_text_id(label, WATCH_TEXT_ID_COMMON_SENDING); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -25); + sending_ext->sending_label = label; +/* 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 @@ -763,6 +788,7 @@ lv_obj_t * wechat_msg_sending_screen_create(lv_obj_t * activity_obj) lv_anim_set_repeat_delay(a, 500); lv_anim_start(a); s_wechat_play_anim_count = 0; +*/ return obj; } 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 bd72d28a..0815e20e 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 @@ -174,14 +174,22 @@ lv_obj_t * restart_create(lv_obj_t * activity_obj) btn_yes = lv_imgbtn_create(obj, NULL); lv_imgbtn_set_src(btn_yes, LV_BTN_STATE_RELEASED, ICON_OK); lv_imgbtn_set_src(btn_yes, LV_BTN_STATE_PRESSED, ICON_OK); +#ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20+20, -20); +#else lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20, -20); +#endif lv_obj_set_event_cb(btn_yes, restart_yes_btn_action); lv_watch_obj_add_element(btn_yes); btn_no = lv_imgbtn_create(obj, NULL); lv_imgbtn_set_src(btn_no, LV_BTN_STATE_RELEASED, ICON_CANCEL); lv_imgbtn_set_src(btn_no, LV_BTN_STATE_PRESSED, ICON_CANCEL); +#ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20-20, -20); +#else lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -20); +#endif lv_obj_set_event_cb(btn_no, restart_no_btn_action); lv_watch_obj_add_element(btn_no); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c index b23a7061..2a28b0f7 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c @@ -78,14 +78,22 @@ lv_obj_t * shutdown_create(lv_obj_t * activity_obj, bool confirm) lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_CONFIRM_BIG); lv_obj_set_event_cb(btn, shutdown_confirm_btn_action); lv_watch_obj_add_element(btn); + #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_LEFT, 20+20, -20); + #else lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_LEFT, 20, -20); + #endif btn = lv_imgbtn_create(obj, NULL); lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_CANCEL_BIG); lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_CANCEL_BIG); lv_obj_set_event_cb(btn, shutdown_cancel_btn_action); lv_watch_obj_add_element(btn); + #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_RIGHT, -20-20, -20); + #else lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -20); + #endif } else { shutdown_confirm_btn_action(NULL, LV_EVENT_CLICKED); } @@ -128,7 +136,9 @@ static void shutdown_poweroff(void) void shutdown_music(void) { +#ifndef __MMI_POWER_ON_OFF_NO_RING__ Hal_NFFS_File_Play_Onetime(AUDIO_POWER_OFF, query_current_volume(), NULL, 0); +#endif printf("shutdown_music.\n"); } @@ -221,6 +231,161 @@ void mmi_watch_power_off(void) //mmi_watch_wake_up(); shutdown_confirm_btn_action(NULL, LV_EVENT_CLICKED); } + +#ifdef __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__ +static void mmi_key_power_long_press_screen_prepare_destory(lv_obj_t * activity_obj) +{ + lv_watch_png_cache_all_free(); +} + +void mmi_key_power_long_press_screen_clean(void) +{ + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_KEY_POWER_LONG_PRESS_SCREEN); + if(NULL != activity_obj) + { + mmi_key_power_long_press_screen_prepare_destory(activity_obj); + lv_obj_del(activity_obj); + } +} + +void mmi_key_power_long_press_screen_event_cb(lv_obj_t * obj, lv_event_t e) +{ + if(LV_EVENT_CLICKED != e) + return; + + //lv_watch_obj_cleanup(btn); + uint32_t index = lv_watch_get_free_num(obj); + switch(index) + { + case 0: + mmi_watch_power_off(); + break; + + case 1: + mmi_key_back_sos_btn_action(); + break; + + case 2: + mmi_watch_restart(); + break; + + case 3: + mmi_key_power_long_press_screen_clean(); + break; + + default: + printf("[@CHENG_DEBUG][%s][%d]: should not run here\n", __FUNCTION__, __LINE__); + break; + } +} + +lv_obj_t * mmi_key_power_long_press_screen_create(lv_obj_t * activity_obj) +{ + if(activity_obj == NULL) + { + lv_watch_activity_ext_t activity_ext; + memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t)); + activity_ext.actId = ACT_ID_KEY_POWER_LONG_PRESS_SCREEN; + activity_ext.create = mmi_key_power_long_press_screen_create; + activity_ext.prepare_destory = mmi_key_power_long_press_screen_prepare_destory; + activity_obj = lv_watch_creat_activity_obj(&activity_ext); + LV_ASSERT_MEM(activity_obj); + if(activity_obj == NULL) + return NULL; + } + + lv_obj_t * obj = lv_watch_obj_create(activity_obj); + LV_ASSERT_MEM(obj); + if(obj == NULL) + return NULL; + lv_watch_obj_set_anim_mode(obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE); + + // 1 + lv_obj_t * btn_sos = lv_imgbtn_create(obj, NULL); + lv_imgbtn_set_src(btn_sos, LV_BTN_STATE_RELEASED, ICON_KEY_POWER_SOS); + lv_imgbtn_set_src(btn_sos, LV_BTN_STATE_PRESSED, ICON_KEY_POWER_SOS); + lv_obj_set_event_cb(btn_sos, mmi_key_power_long_press_screen_event_cb); + lv_watch_obj_add_element(btn_sos); + lv_obj_align(btn_sos, obj, LV_ALIGN_CENTER, 0, -20); + lv_watch_set_free_num(btn_sos, 1); + + lv_obj_t * label_sos = lv_label_create(obj, NULL); + lv_obj_add_style(label_sos, LV_LABEL_PART_MAIN, &lv_watch_font20); + lv_label_set_text_id(label_sos, WATCH_TEXT_ID_SOS); + lv_label_set_align(label_sos, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_sos, btn_sos, LV_ALIGN_OUT_BOTTOM_MID, 0, 3); + + // 0 + lv_obj_t * btn_power_off = lv_imgbtn_create(obj, NULL); + lv_imgbtn_set_src(btn_power_off, LV_BTN_STATE_RELEASED, ICON_KEY_POWER_POWER_OFF); + lv_imgbtn_set_src(btn_power_off, LV_BTN_STATE_PRESSED, ICON_KEY_POWER_POWER_OFF); + lv_obj_set_event_cb(btn_power_off, mmi_key_power_long_press_screen_event_cb); + lv_watch_obj_add_element(btn_power_off); + lv_obj_align(btn_power_off, btn_sos, LV_ALIGN_OUT_LEFT_MID, -15, 0); + lv_watch_set_free_num(btn_power_off, 0); + + lv_obj_t * label_power_off = lv_label_create(obj, NULL); + lv_obj_add_style(label_power_off, LV_LABEL_PART_MAIN, &lv_watch_font20); + lv_label_set_text_id(label_power_off, WATCH_TEXT_ID_SHUTDOWN); + lv_label_set_align(label_power_off, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_power_off, btn_power_off, LV_ALIGN_OUT_BOTTOM_MID, 0, 3); + + // 2 + lv_obj_t * btn_restart = lv_imgbtn_create(obj, NULL); + lv_imgbtn_set_src(btn_restart, LV_BTN_STATE_RELEASED, ICON_KEY_POWER_RESTART); + lv_imgbtn_set_src(btn_restart, LV_BTN_STATE_PRESSED, ICON_KEY_POWER_RESTART); + lv_obj_set_event_cb(btn_restart, mmi_key_power_long_press_screen_event_cb); + lv_watch_obj_add_element(btn_restart); + lv_obj_align(btn_restart, btn_sos, LV_ALIGN_OUT_RIGHT_MID, 15, 0); + lv_watch_set_free_num(btn_restart, 2); + + lv_obj_t * label_restart = lv_label_create(obj, NULL); + lv_obj_add_style(label_restart, LV_LABEL_PART_MAIN, &lv_watch_font20); + lv_label_set_text_id(label_restart, WATCH_TEXT_ID_RESTART_SHORT); + lv_label_set_align(label_restart, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_restart, btn_restart, LV_ALIGN_OUT_BOTTOM_MID, 0, 3); + + // 3 + lv_obj_t * btn_cancel = lv_imgbtn_create(obj, NULL); + lv_imgbtn_set_src(btn_cancel, LV_BTN_STATE_RELEASED, ICON_KEY_POWER_CANCEL); + lv_imgbtn_set_src(btn_cancel, LV_BTN_STATE_PRESSED, ICON_KEY_POWER_CANCEL); + lv_obj_set_event_cb(btn_cancel, mmi_key_power_long_press_screen_event_cb); + lv_watch_obj_add_element(btn_cancel); + lv_obj_align(btn_cancel, btn_sos, LV_ALIGN_OUT_BOTTOM_MID, 0, 40); + lv_watch_set_free_num(btn_cancel, 3); + + lv_obj_t * label_cancel = lv_label_create(btn_cancel, NULL); + lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font20); + lv_label_set_text_id(label_cancel, WATCH_TEXT_ID_CANCEL); + lv_label_set_align(label_cancel, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_cancel, btn_cancel, LV_ALIGN_CENTER, 0, 0); + + return obj; +} + +void mmi_key_power_long_press_action(void) +{ + if(false == watch_modem_sim_present_check_req()) + { + return; + } + + if(NULL != lv_watch_get_activity_obj(ACT_ID_LOWBATTERY)) + { + return; + } + +#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ + if(true == mmi_watch_is_in_do_not_disturb_time()) + { + return; + } +#endif + + mmi_key_power_long_press_screen_create(NULL); +} +#endif + #endif #endif /*USE_LV_WATCH_SHUTDOWN*/ 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 ef57973f..688075af 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h +++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h @@ -12,9 +12,13 @@ extern "C" { //******** audio resource begin ******** +#ifndef __MMI_POWER_ON_OFF_NO_RING__ #define AUDIO_POWER_ON "R:/audio/audio_power_on.mid" +#endif +#ifndef __MMI_POWER_ON_OFF_NO_RING__ #define AUDIO_POWER_OFF "R:/audio/audio_power_off.mid" +#endif #define AUDIO_INCOMING_CALL "R:/audio/audio_incoming_call.mid" @@ -28,6 +32,14 @@ extern "C" { #define AUDIO_WATCH_SEARCH "R:/audio/audio_watch_search.mp3" +#ifdef __MMI_WECHAT_SUPPORT__ +#ifdef __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__ +#define AUDIO_WECHAT_RECEIVE "R:/audio/audio_wechat_receive.mp3" +#else +#define AUDIO_WECHAT_RECEIVE "R:/audio/audio_wechat_receive.mid" +#endif +#endif + #ifdef __MMI_REMIND_WAKE_UP_SUPPORT__ #define AUDIO_REMIND_WAKE_UP "R:/audio/AUDIO_REMIND_WAKE_UP.mp3" #endif @@ -822,15 +834,13 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_WECHAT_RECORDING5 "R:/png/wechat/ICON_WECHAT_RECORDING5.png" #endif #define ICON_WECHAT_SENDING_BG "R:/png/wechat/ICON_WECHAT_SENDING_BG.png" -#define ICON_WECHAT_SENDING_PROMPT1 "R:/png/wechat/ICON_WECHAT_SENDING_PROMPT1.png" -#define ICON_WECHAT_SENDING_PROMPT2 "R:/png/wechat/ICON_WECHAT_SENDING_PROMPT2.png" -#define ICON_WECHAT_SENDING_PROMPT3 "R:/png/wechat/ICON_WECHAT_SENDING_PROMPT3.png" +//#define ICON_WECHAT_SENDING_PROMPT1 "R:/png/wechat/ICON_WECHAT_SENDING_PROMPT1.png" +//#define ICON_WECHAT_SENDING_PROMPT2 "R:/png/wechat/ICON_WECHAT_SENDING_PROMPT2.png" +//#define ICON_WECHAT_SENDING_PROMPT3 "R:/png/wechat/ICON_WECHAT_SENDING_PROMPT3.png" #define ICON_WECHAT_SENDING_SUCC "R:/png/wechat/ICON_WECHAT_SENDING_SUCC.png" #define ICON_WECHAT_SENDING_FAILED "R:/png/wechat/ICON_WECHAT_SENDING_FAILED.png" #define ICON_WECHAT_SEND_EMO "R:/png/wechat/ICON_WECHAT_SEND_EMO.png" #define ICON_WECHAT_UNREAD_FLAG "R:/png/wechat/ICON_WECHAT_UNREAD_FLAG.png" - -#define AUDIO_WECHAT_RECEIVE "R:/audio/audio_wechat_receive.mid" #endif //healthy measure @@ -878,6 +888,14 @@ LV_IMG_DECLARE(img_poweron_logo); #endif #endif +#ifdef __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__ +#define ICON_KEY_POWER_POWER_OFF "R:/png/setting/ICON_KEY_POWER_POWER_OFF.png" +#define ICON_KEY_POWER_SOS "R:/png/setting/ICON_KEY_POWER_SOS.png" +#define ICON_KEY_POWER_RESTART "R:/png/setting/ICON_KEY_POWER_RESTART.png" +#define ICON_KEY_POWER_CANCEL "R:/png/setting/ICON_KEY_POWER_CANCEL.png" +#endif + + #endif 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 f616a993..4ab4d886 100644 --- a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c +++ b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c @@ -959,6 +959,9 @@ static void keypad_watch_cb(struct keypad_param *arg) if(1 != is_in_poweroff_chg_mode()) { printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); //sos_btn_action(NULL); + #ifdef __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__ + mmi_key_power_long_press_action(); + #endif } } else if(arg->key_event == KEY_EVENT_POWER_ON) { set_lcd_only = false;