From: @CHENG <2393524978@qq.com> Date: Mon, 13 May 2024 08:47:10 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=30f7583f5058a20af4a49afc5eab84839c27b545;p=mirrors%2FASR3603_Z5_DS.git gengxin --- 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 1260a0eb..90df648b 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,7 +217,7 @@ 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) +#if defined(MMI_PROJECT_Z5_DS_Z11_COMMON) || defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH) static bool s_reset_flag = true; static void mmi_tp_home_key_reset_flag_cb(void *para) { 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 e673e83e..4025da5b 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 @@ -37,7 +37,7 @@ 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) +#if defined(MMI_PROJECT_Z5_DS_Z11_COMMON) || defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH) void app_tp_home_key_send_ui_msg(void); #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c index 723c1a6a..f14cfe62 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c @@ -102,7 +102,7 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj) lv_obj_set_width(info_label, LV_HOR_RES - 20); lv_label_set_align(info_label, LV_LABEL_ALIGN_CENTER); -#if defined(MMI_PROJECT_Z5_DS_Z12_COMMON) || defined(MMI_PROJECT_Z5_DS_Z11_COMMON) +#if defined(MMI_PROJECT_Z5_DS_Z12_COMMON) || defined(MMI_PROJECT_Z5_DS_Z11_COMMON) || defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH) // snprintf(info_str, 96, "%s:Z5_Z12\n%s:%s_V1.0_Release_%s", // (char *)lv_lang_get_text(WATCH_TEXT_ID_MODE), // (char *)lv_lang_get_text(WATCH_TEXT_ID_VERSION_NUM), diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c index bd886b94..dd8cb271 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c @@ -86,6 +86,7 @@ static bool watch_ambient = false; #ifdef __MMI_ZHSX_SUPPORT__ static void mmi_data_init_before_watch_create(void) { + // mmi_watch_common_task_create(); mmi_sos_number_nv_read(); mmi_center_number_nv_read(); #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ @@ -568,10 +569,6 @@ static lv_obj_t * watch_create(bool silentReset) #ifdef __MMI_ZHSX_SUPPORT__ mmi_data_init_after_watch_create(); #endif -#ifdef __MMI_REMIND_WAKE_UP_take_off_SUPPORT__ -printf("123456789"); - mmi_take_off_remind_init(); -#endif return obj; } 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 20097fec..582bd9df 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 @@ -434,8 +434,8 @@ 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); - #if defined(MMI_PROJECT_Z5_DS_Z11_COMMON) - 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) || defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH) + //printf("[@CHENG_DEBUG][%s][%d]: x=%d,y=%d\n", __FUNCTION__, __LINE__, data->point.x, data->point.y); if(data->point.x >= 180 && data->point.y >= 480) { app_tp_home_key_send_ui_msg();