From: CCC <2393524978@qq.com> Date: Sat, 14 Oct 2023 07:54:25 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1421a5c8691b6950e789614086a8d9f5369f97db;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h index c3cb9c92..1382d2a0 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h +++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h @@ -34,22 +34,30 @@ extern "C" { #define NV_SECTION_UI_AGNSS_LEN (sizeof(nv_watch_agnss_t)) #define NV_SECTION_UI_SMSMSG_LEN (sizeof(nv_watch_sms_msg_t)) #define NV_SECTION_UI_GPS_AIDPOS_LEN (sizeof(nv_watch_gps_aidpos_t)) -//#if __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_WECHAT_SUPPORT__ #define NV_SECTION_UI_WEHAT_MSG_LEN (sizeof(nv_watch_wechat_msg_info_t)) +#endif #define NV_SECTION_UI_HEALTH_MEASURE_LEN (sizeof(nv_watch_health_measure_timed_t)) #define NV_SECTION_UI_PROTOCOL_DATA_LEN (sizeof(nv_watch_protocol_data_t)) #define NV_SECTION_UI_HEALTH_INFO_LEN (sizeof(nv_watch_health_info_t)) #define NV_SECTION_UI_SOS_NUMBER_LEN (sizeof(nv_watch_sos_number_t)) #define NV_SECTION_UI_CENTER_NUMBER_LEN (sizeof(nv_watch_center_number_t)) +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ #define NV_SECTION_UI_VC_CONTACT_LEN (sizeof(nv_watch_vc_contact_t)) +#endif +#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ #define NV_SECTION_UI_DO_NOT_DISTURB_LEN (sizeof(nv_watch_do_not_disturb_t)) +#endif #define NV_SECTION_UI_DIAL_PAD_SWITCH_LEN (sizeof(nv_watch_switch_t)) #define NV_SECTION_UI_WHITE_LIST_SWITCH_LEN (sizeof(nv_watch_switch_t)) #define NV_SECTION_UI_MAIN_MENU_STYLE_LEN (sizeof(nv_watch_main_menu_style_t)) +#ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ +#define NV_SECTION_UI_SIM_UNBIND_SWITCH_LEN (sizeof(nv_watch_switch_t)) +#define NV_SECTION_UI_SIM_ICCID_DATA_LEN (sizeof(nv_watch_sim_iccid_t)) +#endif - - -//#endif +#endif #define NV_SECTION_LEN(sectionid) (sectionid ## _LEN) @@ -128,22 +136,30 @@ typedef lv_fs_dir_t ui_dir_t; #define NV_SECTION_UI_AGNSS_FILE "ui_agnss.nv" #define NV_SECTION_UI_SMSMSG_FILE "ui_smsmsg.nv" #define NV_SECTION_UI_GPS_AIDPOS_FILE "ui_gps_aidpos.nv" -//#if __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_WECHAT_SUPPORT__ #define NV_SECTION_UI_WEHAT_MSG_FILE "ui_wechat_msg.nv" +#endif #define NV_SECTION_UI_HEALTH_MEASURE_FILE "ui_health_measure.nv" #define NV_SECTION_UI_PROTOCOL_DATA_FILE "ui_protocol_data.nv" #define NV_SECTION_UI_HEALTH_INFO_FILE "ui_health_info.nv" #define NV_SECTION_UI_SOS_NUMBER_FILE "ui_sos_number.nv" #define NV_SECTION_UI_CENTER_NUMBER_FILE "ui_center_number.nv" +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ #define NV_SECTION_UI_VC_CONTACT_FILE "ui_vc_contact.nv" +#endif +#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ #define NV_SECTION_UI_DO_NOT_DISTURB_FILE "ui_do_not_disturb.nv" +#endif #define NV_SECTION_UI_DIAL_PAD_SWITCH_FILE "ui_dial_pad_switch.nv" #define NV_SECTION_UI_WHITE_LIST_SWITCH_FILE "ui_white_list_switch.nv" #define NV_SECTION_UI_MAIN_MENU_STYLE_FILE "ui_main_menu_style.nv" +#ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ +#define NV_SECTION_UI_SIM_UNBIND_SWITCH_FILE "ui_sim_unbind_switch.nv" +#define NV_SECTION_UI_SIM_ICCID_DATA_FILE "ui_sim_iccid_data.nv" +#endif - - -//#endif +#endif #define NV_SECTION_FILE_PATH(sectionid) (sectionid ## _FILE) diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c index 91f87ed7..fbfee9f7 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c +++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c @@ -71,10 +71,11 @@ uint32_t UI_NV_Get_Section_Len(NV_UI_SECTION_ID SectionId) case NV_SECTION_UI_GPS_AIDPOS: return(NV_SECTION_LEN(NV_SECTION_UI_GPS_AIDPOS)); - //#ifdef __MMI_ZHSX_SUPPORT__ + #ifdef __MMI_ZHSX_SUPPORT__ + #ifdef __MMI_WECHAT_SUPPORT__ case NV_SECTION_UI_WEHAT_MSG: return (NV_SECTION_LEN(NV_SECTION_UI_WEHAT_MSG)); - + #endif case NV_SECTION_UI_HEALTH_MEASURE: return (NV_SECTION_LEN(NV_SECTION_UI_HEALTH_MEASURE)); case NV_SECTION_UI_PROTOCOL_DATA: @@ -85,19 +86,29 @@ uint32_t UI_NV_Get_Section_Len(NV_UI_SECTION_ID SectionId) return (NV_SECTION_LEN(NV_SECTION_UI_SOS_NUMBER)); case NV_SECTION_UI_CENTER_NUMBER: return (NV_SECTION_LEN(NV_SECTION_UI_CENTER_NUMBER)); + #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ case NV_SECTION_UI_VC_CONTACT: return (NV_SECTION_LEN(NV_SECTION_UI_VC_CONTACT)); + #endif + #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ case NV_SECTION_UI_DO_NOT_DISTURB: return (NV_SECTION_LEN(NV_SECTION_UI_DO_NOT_DISTURB)); + #endif case NV_SECTION_UI_DIAL_PAD_SWITCH: return (NV_SECTION_LEN(NV_SECTION_UI_DIAL_PAD_SWITCH)); case NV_SECTION_UI_WHITE_LIST_SWITCH: return (NV_SECTION_LEN(NV_SECTION_UI_WHITE_LIST_SWITCH)); case NV_SECTION_UI_MAIN_MENU_STYLE: return (NV_SECTION_LEN(NV_SECTION_UI_MAIN_MENU_STYLE)); + #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ + case NV_SECTION_UI_SIM_UNBIND_SWITCH: + return (NV_SECTION_LEN(NV_SECTION_UI_SIM_UNBIND_SWITCH)); + case NV_SECTION_UI_SIM_ICCID_DATA: + return (NV_SECTION_LEN(NV_SECTION_UI_SIM_ICCID_DATA)); + #endif - //#endif + #endif default: printf("SectionId wrong\n"); @@ -167,10 +178,11 @@ char * UI_NV_Get_Section_path(NV_UI_SECTION_ID SectionId) case NV_SECTION_UI_GPS_AIDPOS: return(NV_SECTION_FILE_PATH(NV_SECTION_UI_GPS_AIDPOS)); - //#ifdef __MMI_ZHSX_SUPPORT__ + #ifdef __MMI_ZHSX_SUPPORT__ + #ifdef __MMI_WECHAT_SUPPORT__ case NV_SECTION_UI_WEHAT_MSG: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_WEHAT_MSG)); - + #endif case NV_SECTION_UI_HEALTH_MEASURE: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_HEALTH_MEASURE)); case NV_SECTION_UI_PROTOCOL_DATA: @@ -181,19 +193,29 @@ char * UI_NV_Get_Section_path(NV_UI_SECTION_ID SectionId) return (NV_SECTION_FILE_PATH(NV_SECTION_UI_SOS_NUMBER)); case NV_SECTION_UI_CENTER_NUMBER: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_CENTER_NUMBER)); + #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ case NV_SECTION_UI_VC_CONTACT: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_VC_CONTACT)); + #endif + #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ case NV_SECTION_UI_DO_NOT_DISTURB: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_DO_NOT_DISTURB)); + #endif case NV_SECTION_UI_DIAL_PAD_SWITCH: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_DIAL_PAD_SWITCH)); case NV_SECTION_UI_WHITE_LIST_SWITCH: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_WHITE_LIST_SWITCH)); case NV_SECTION_UI_MAIN_MENU_STYLE: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_MAIN_MENU_STYLE)); + #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ + case NV_SECTION_UI_SIM_UNBIND_SWITCH: + return (NV_SECTION_FILE_PATH(NV_SECTION_UI_SIM_UNBIND_SWITCH)); + case NV_SECTION_UI_SIM_ICCID_DATA: + return (NV_SECTION_FILE_PATH(NV_SECTION_UI_SIM_ICCID_DATA)); + #endif - //#endif + #endif default: printf("SectionId wrong\n"); @@ -230,20 +252,28 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId) nv_watch_agnss_t * agnss; nv_watch_sms_msg_t * smsmsg; nv_watch_gps_aidpos_t * gps_aidpos; -//#ifdef __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_WECHAT_SUPPORT__ nv_watch_wechat_msg_info_t * wechat_msg; +#endif nv_watch_health_measure_timed_t * health_measure; nv_watch_protocol_data_t * protocol_data; nv_watch_health_info_t * health_info; nv_watch_sos_number_t * sos_number; nv_watch_center_number_t * center_number; +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ nv_watch_vc_contact_t * vc_contact; +#endif +#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ nv_watch_do_not_disturb_t * do_not_disturb; - nv_watch_switch_t * dial_pad_switch; - nv_watch_switch_t * white_list_switch; +#endif + nv_watch_switch_t * mmi_switch_data; nv_watch_main_menu_style_t * main_menu_style; +#ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ + nv_watch_sim_iccid_t * sim_iccid_data; +#endif -//#endif +#endif switch(SectionId) { case NV_SECTION_UI_SETTINGS: @@ -394,12 +424,14 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId) TempData = (char *)gps_aidpos; break; - //#ifdef __MMI_ZHSX_SUPPORT__ + #ifdef __MMI_ZHSX_SUPPORT__ + #ifdef __MMI_WECHAT_SUPPORT__ case NV_SECTION_UI_WEHAT_MSG: wechat_msg = lv_mem_alloc(SectionLen); memset(wechat_msg, 0x0, SectionLen); TempData = (char *)wechat_msg; break; + #endif case NV_SECTION_UI_HEALTH_MEASURE: health_measure = lv_mem_alloc(SectionLen); @@ -433,29 +465,34 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId) TempData = (char *)center_number; break; + #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ case NV_SECTION_UI_VC_CONTACT: vc_contact = lv_mem_alloc(SectionLen); memset(vc_contact, 0x0, SectionLen); TempData = (char *)vc_contact; break; + #endif + #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ case NV_SECTION_UI_DO_NOT_DISTURB: do_not_disturb = lv_mem_alloc(SectionLen); memset(do_not_disturb, 0x0, SectionLen); TempData = (char *)do_not_disturb; break; + #endif case NV_SECTION_UI_DIAL_PAD_SWITCH: - dial_pad_switch = lv_mem_alloc(SectionLen); - memset(dial_pad_switch, 0x0, SectionLen); - mmi_dial_pad_switch_nv_default(dial_pad_switch); - TempData = (char *)dial_pad_switch; + mmi_switch_data = lv_mem_alloc(SectionLen); + memset(mmi_switch_data, 0x0, SectionLen); + mmi_dial_pad_switch_nv_default(mmi_switch_data); + TempData = (char *)mmi_switch_data; break; case NV_SECTION_UI_WHITE_LIST_SWITCH: - white_list_switch = lv_mem_alloc(SectionLen); - memset(white_list_switch, 0x0, SectionLen); - TempData = (char *)white_list_switch; + mmi_switch_data = lv_mem_alloc(SectionLen); + memset(mmi_switch_data, 0x0, SectionLen); + mmi_white_list_switch_nv_default(mmi_switch_data); + TempData = (char *)mmi_switch_data; break; case NV_SECTION_UI_MAIN_MENU_STYLE: @@ -465,9 +502,23 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId) TempData = (char *)main_menu_style; break; + #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ + case NV_SECTION_UI_SIM_UNBIND_SWITCH: + mmi_switch_data = lv_mem_alloc(SectionLen); + memset(mmi_switch_data, 0x0, SectionLen); + mmi_watch_sim_unbind_switch_nv_default(mmi_switch_data); + TempData = (char *)mmi_switch_data; + break; + + case NV_SECTION_UI_SIM_ICCID_DATA: + sim_iccid_data = lv_mem_alloc(SectionLen); + memset(sim_iccid_data, 0x0, SectionLen); + TempData = (char *)sim_iccid_data; + break; + #endif - //#endif + #endif default: TempData = NULL; diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h index 3b8f6ad4..872cef08 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h @@ -204,6 +204,9 @@ enum #ifdef __MMI_TOOL_MENU_SUPPORT__ ACT_ID_TOOL_MENU, #endif +#ifdef __MMI_WEATHER_MENU_SUPPORT__ + ACT_ID_WEATHER_MENU, +#endif ACT_ID_MAX, diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/calculator/calculator.c b/2.sdk/sdk/gui/lv_watch/lv_apps/calculator/calculator.c index e57f87e4..a0fd9a16 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/calculator/calculator.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/calculator/calculator.c @@ -130,136 +130,7 @@ static void calc_warn_task(lv_task_t * task) ext->warn_task_p = NULL; } -#if 0//def __MMI_ZHSX_SUPPORT__ -char * mmi_strtok(char ** str1, uint8_t len1, char * str2, uint8_t len2) -{ - char * t_str = NULL; - uint8_t t_index = 0; - uint8_t i = 0; - - t_str = *str1; - for(i = 0; i < len1; i++) - { - if(strncmp(* str1 + i, str2, len2) == 0) - { - * str1 += (i + len2); - - t_str[i] = '\0'; - return t_str; - } - } - - return NULL; -} -#endif - -static void calc_add_oper(char * ptr) -{ - lv_calculator_obj_ext_t * ext = calc_get_ext(); - printf("[@CHENG_DEBUG][%s][%d]: %s\n", __FUNCTION__, __LINE__, ext->oper); - if(ext->oper) { - if(ext->point == false && ext->input_len == 0) { - calc_label_del_char(ext); - } - else - { - printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - #if 0//def __MMI_ZHSX_SUPPORT__ - char * fac1 = NULL; - char * fac2 = NULL; - char * temp = NULL; - const char * text = lv_label_get_text(ext->label); - uint8_t len = strlen(text); - - if(ext->oper && ((ext->point == true) || (ext->point == false && ext->input_len > 0))) - { - if(text[len - 1] == '.') { - calc_label_del_char(ext); - } - calc_label_add_text(ext, ptr); - - text = lv_label_get_text(ext->label); - temp = (char *)text; - if(temp[0] == '-') { - temp = &temp[1]; - } - char * sn = strchr(text, 'e'); - if(sn) { - temp = &sn[2]; - } - - printf("[@CHENG_DEBUG][%s][%d]: temp=%s\n", __FUNCTION__, __LINE__, temp); - #if 1 - strtok(temp, ext->oper); - printf("[@CHENG_DEBUG][%s][%d]: temp=%s\n", __FUNCTION__, __LINE__, temp); - fac2 = strtok(NULL, ptr); - printf("[@CHENG_DEBUG][%s][%d]: temp=%s\n", __FUNCTION__, __LINE__, temp); - #if CALC_LATIN_SYMBOL_MUL_AND_DIV_SUP != 0 - if(strcmp(ext->oper, CALC_MUL) == 0 || strcmp(ext->oper, CALC_DIV) == 0) { - fac2 = &fac2[1]; - } - #endif - fac1 = (char *)text; - - #else - - fac1 = mmi_strtok(&temp, strlen(temp), ext->oper, strlen(ext->oper)); - printf("[@CHENG_DEBUG][%s][%d]: temp=%s\n", __FUNCTION__, __LINE__, temp); - fac2 = mmi_strtok(&temp, strlen(temp), ptr, strlen(ptr)); - printf("[@CHENG_DEBUG][%s][%d]: temp=%s\n", __FUNCTION__, __LINE__, temp); - #endif - - printf("[@CHENG_DEBUG][%s][%d]: fac1=%s,fac2=%s\n", __FUNCTION__, __LINE__, fac1, fac2); - calc_get_result(fac1, fac2); - - ext->oper = ptr; - calc_label_add_text(ext, ptr); - ext->finish_flag = false; - text = lv_label_get_text(ext->label); - char * point = strchr(text, '.'); - if(point) - { - ext->point = true; - ext->input_len = strlen(point) - 1; - - printf("[@CHENG_DEBUG][%s][%d]: input_len=%d\n", __FUNCTION__, __LINE__, ext->input_len); - } - else - { - ext->point = false; - ext->input_len = strlen(text); - if(text[0] == '-') { - ext->input_len--; - } - printf("[@CHENG_DEBUG][%s][%d]: input_len=%d\n", __FUNCTION__, __LINE__, ext->input_len); - } - } - #endif - - return; - } - } else { - if(ext->input_len == 0) { - if(ext->point) { - calc_label_del_char(ext); - } else { - if(strcmp(ptr, CALC_MINUS) == 0) { - calc_label_add_text(ext, ptr); - ext->finish_flag = false; - } - return; - } - } - } - printf("[@CHENG_DEBUG][%s][%d]: %s\n", __FUNCTION__, __LINE__, ext->oper); - - ext->oper = ptr; - calc_label_add_text(ext, ptr); - ext->finish_flag = false; - ext->input_len = 0; - ext->point = false; -} static void calc_get_number_string(uint8_t * str, char * result) { @@ -1097,6 +968,325 @@ static void calc_clear_event_cb(lv_obj_t * obj, lv_event_t event) } } + +#ifdef __MMI_ZHSX_SUPPORT__ +char * mmi_strtok(char ** str1, uint8_t len1, char * str2, uint8_t len2) +{ + char * t_str = NULL; + uint8_t t_index = 0; + uint8_t i = 0; + + t_str = *str1; + for(i = 0; i < len1; i++) + { + if(strncmp(* str1 + i, str2, len2) == 0) + { + * str1 += (i + len2); + + t_str[i] = '\0'; + return t_str; + } + } + + return NULL; +} + +static bool s_last_char_is_oper = false; +static void calc_add_oper(char * ptr) +{ + lv_calculator_obj_ext_t * ext = calc_get_ext(); + + printf("[@CHENG_DEBUG][%s][%d]: oper=%s,point=%d,len=%d,finish=%d\n", __FUNCTION__, __LINE__, ext->oper, ext->point, ext->input_len, ext->finish_flag); + + if(ext->oper) + { + if(ext->point == false && ext->input_len == 0 + || true == s_last_char_is_oper + ) + { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + calc_label_del_char(ext); + s_last_char_is_oper = false; + } + else + { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + char * fac1 = NULL; + char * fac2 = NULL; + char * temp = NULL; + const char * text = lv_label_get_text(ext->label); + uint8_t len = strlen(text); + + if((ext->point == true) || (ext->point == false && ext->input_len > 0)) + { + if(text[len - 1] == '.') { + calc_label_del_char(ext); + } + calc_label_add_text(ext, ptr); + + text = lv_label_get_text(ext->label); + temp = (char *)text; + if(temp[0] == '-') { + temp = &temp[1]; + } + char * sn = strchr(text, 'e'); + if(sn) { + temp = &sn[2]; + } + + printf("[@CHENG_DEBUG][%s][%d]: temp=%s\n", __FUNCTION__, __LINE__, temp); + fac1 = mmi_strtok(&temp, strlen(temp), ext->oper, strlen(ext->oper)); + printf("[@CHENG_DEBUG][%s][%d]: temp=%s\n", __FUNCTION__, __LINE__, temp); + fac2 = mmi_strtok(&temp, strlen(temp), ptr, strlen(ptr)); + printf("[@CHENG_DEBUG][%s][%d]: temp=%s\n", __FUNCTION__, __LINE__, temp); + printf("[@CHENG_DEBUG][%s][%d]: fac1=%s,fac2=%s\n", __FUNCTION__, __LINE__, fac1, fac2); + calc_get_result(fac1, fac2); + + s_last_char_is_oper = true; + ext->oper = ptr; + calc_label_add_text(ext, ptr); + ext->finish_flag = false; + text = lv_label_get_text(ext->label); + char * point = strchr(text, '.'); + if(point) + { + ext->point = true; + ext->input_len = strlen(point) - 1; + + printf("[@CHENG_DEBUG][%s][%d]: input_len=%d\n", __FUNCTION__, __LINE__, ext->input_len); + } + else + { + ext->point = false; + ext->input_len = strlen(text); + if(text[0] == '-') { + ext->input_len--; + } + printf("[@CHENG_DEBUG][%s][%d]: input_len=%d\n", __FUNCTION__, __LINE__, ext->input_len); + } + } + + return; + } + } + else + { + if(ext->input_len == 0) + { + if(ext->point) + { + calc_label_del_char(ext); + } + else + { + if(strcmp(ptr, CALC_MINUS) == 0) { + calc_label_add_text(ext, ptr); + ext->finish_flag = false; + } + return; + } + } + } + printf("[@CHENG_DEBUG][%s][%d]: %s\n", __FUNCTION__, __LINE__, ext->oper); + + ext->oper = ptr; + calc_label_add_text(ext, ptr); + ext->finish_flag = false; + ext->input_len = 0; + ext->point = false; +} + +static void calc_set_oper(char * ptr) +{ + char * fac1 = NULL; + char * fac2 = NULL; + char * temp = NULL; + lv_calculator_obj_ext_t * ext = calc_get_ext(); + const char * text = lv_label_get_text(ext->label); + uint8_t len = strlen(text); + + const char * inf = lv_lang_get_text(WATCH_TEXT_ID_CALC_INF); + if(strcmp(text, inf) == 0) { + calc_label_set_text(ext, ""); + ext->finish_flag = false; + ext->oper = NULL; + ext->input_len = 0; + ext->point = false; + len = 0; + } else if(strcmp(text, "-") == 0 && strcmp(ptr, CALC_MINUS) == 0) { + return; + } + + if(strcmp(ptr, CALC_PLUS) == 0 || strcmp(ptr, CALC_MINUS) == 0 || strcmp(ptr, CALC_MUL) == 0 || strcmp(ptr, CALC_DIV) == 0) + { + calc_add_oper(ptr); + } + else if(strcmp(ptr, CALC_EQUALS) == 0) + { + s_last_char_is_oper = false; + + if(ext->oper && ((ext->point == true) || (ext->point == false && ext->input_len > 0))) { + if(text[len - 1] == '.') { + calc_label_del_char(ext); + } + calc_label_add_text(ext, ptr); + + text = lv_label_get_text(ext->label); + temp = (char *)text; + if(temp[0] == '-') { + temp = &temp[1]; + } + char * sn = strchr(text, 'e'); + if(sn) { + temp = &sn[2]; + } + strtok(temp, ext->oper); + fac2 = strtok(NULL, "="); + #if CALC_LATIN_SYMBOL_MUL_AND_DIV_SUP != 0 + if(strcmp(ext->oper, CALC_MUL) == 0 || strcmp(ext->oper, CALC_DIV) == 0) { + fac2 = &fac2[1]; + } + #endif + fac1 = (char *)text; + calc_get_result(fac1, fac2); + + ext->oper = NULL; + ext->finish_flag = true; + text = lv_label_get_text(ext->label); + char * point = strchr(text, '.'); + if(point) { + ext->point = true; + ext->input_len = strlen(point) - 1; + } else { + ext->point = false; + ext->input_len = strlen(text); + if(text[0] == '-') { + ext->input_len--; + } + } + } + } + else if(strcmp(ptr, ".") == 0) + { + printf("[@CHENG_DEBUG][%s][%d]: oper=%s,point=%d,len=%d,finish=%d\n", __FUNCTION__, __LINE__, ext->oper, ext->point, ext->input_len, ext->finish_flag); + text = lv_label_get_text(ext->label); + uint8_t text_len = strlen(text); + + if(len == 0 || ext->finish_flag || (ext->oper == NULL && strchr(text, 'e'))) + { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + calc_label_set_text(ext, "0."); + ext->finish_flag = false; + ext->point = true; + ext->input_len = 0; + } + else if(strcmp(text, "-") == 0) + { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + calc_label_set_text(ext, "-0."); + ext->finish_flag = false; + ext->point = true; + ext->input_len = 0; + } + else if(ext->point == false + || (true == ext->point && true == s_last_char_is_oper) + || (true == ext->point && '0' == text[text_len - 1] && ('0' > text[text_len - 2] || '9' < text[text_len - 2]) && '.' != text[text_len - 2]) + ) + { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + if(ext->oper && ext->input_len == 0 || (true == s_last_char_is_oper)) + calc_label_add_text(ext, "0."); + else + calc_label_add_text(ext, ptr); + + ext->point = true; + ext->input_len = 0; + } + + s_last_char_is_oper = false; + } + else + { + printf("[@CHENG_DEBUG][%s][%d]: oper=%s,point=%d,len=%d,finish=%d\n", __FUNCTION__, __LINE__, ext->oper, ext->point, ext->input_len, ext->finish_flag); + + if(ext->finish_flag || (ext->oper == NULL && strchr(text, 'e'))) + { + calc_label_set_text(ext, ""); + ext->input_len = 0; + ext->finish_flag = false; + ext->point = false; + } + else if(ext->input_len == 10) + { + lv_obj_set_hidden(ext->cont_warn, false); + if(ext->warn_task_p) + lv_task_reset(ext->warn_task_p); + else + ext->warn_task_p = lv_task_create(calc_warn_task, + CALC_WARNING_TIME_OUT, + LV_TASK_PRIO_MID, + NULL); + return; + } + + text = lv_label_get_text(ext->label); + uint8_t text_len = strlen(text); + if((ext->input_len == 1) && (text[text_len - 1] == '0') && (ext->point == false) + || ext->oper && ('0' == text[text_len - 1]) && ('0' > text[text_len - 2] || '9' < text[text_len - 2]) && '.' != text[text_len - 2] + ) + { + if(ptr[0] == '0') + return; + else + { + calc_label_del_char(ext); + ext->input_len = 0; + } + } + + calc_label_add_text(ext, ptr); + ext->input_len++; + + s_last_char_is_oper = false; + } +} + +#else + +static void calc_add_oper(char * ptr) +{ + lv_calculator_obj_ext_t * ext = calc_get_ext(); + + if(ext->oper) { + if(ext->point == false && ext->input_len == 0) { + calc_label_del_char(ext); + } + else + { + return; + } + } else { + if(ext->input_len == 0) { + if(ext->point) { + calc_label_del_char(ext); + } else { + if(strcmp(ptr, CALC_MINUS) == 0) { + calc_label_add_text(ext, ptr); + ext->finish_flag = false; + } + return; + } + } + } + + ext->oper = ptr; + calc_label_add_text(ext, ptr); + ext->finish_flag = false; + ext->input_len = 0; + ext->point = false; +} + static void calc_set_oper(char * ptr) { char * fac1 = NULL; @@ -1214,6 +1404,7 @@ static void calc_set_oper(char * ptr) ext->input_len++; } } +#endif static void calc_num_btn_rel_action(lv_obj_t * 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 35401c9a..eb94b6c7 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 @@ -20,7 +20,11 @@ #define DIAL_PAD_Y_NUM 4 #define DIAL_PAD_NUM (DIAL_PAD_X_NUM * DIAL_PAD_Y_NUM) #define DIAL_PAD_CONT_W DIAL_PAD_TA_W +#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#define DIAL_PAD_CONT_H (LV_VER_RES - DIAL_PAD_TA_H - 25 - 25) +#else #define DIAL_PAD_CONT_H (LV_VER_RES - DIAL_PAD_TA_H - 25) +#endif #define DIAL_PAD_TEST 0 //for test code @@ -47,7 +51,6 @@ static lv_res_t dialpad_btn_short_click_action(lv_obj_t * btn); #ifdef __MMI_ZHSX_SUPPORT__ static nv_watch_switch_t s_dial_pad_switch = {0}; -static uint8_t s_dial_pad_switch_init = 0; void mmi_dial_pad_switch_nv_write(void) { @@ -77,11 +80,6 @@ void mmi_dial_pad_switch_nv_default(nv_watch_switch_t * data) // 0-close; 1-open uint8_t mmi_dial_pad_switch_get(void) { - if(0 == s_dial_pad_switch_init) - { - s_dial_pad_switch_init = 1; - mmi_dial_pad_switch_nv_read(); - } return (s_dial_pad_switch.switch_flag); } @@ -152,13 +150,37 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj) 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); +#ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_set_style_local_bg_opa(ext->ta, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); + lv_obj_align(ext->ta, NULL, LV_ALIGN_IN_TOP_MID, 0, 10 + 5); + lv_obj_set_base_dir(ext->ta, LV_BIDI_DIR_LTR); + lv_watch_obj_add_element(ext->ta); + + static lv_point_t s_line_points[2] = {0}; + lv_obj_t * line = lv_line_create(obj, NULL); + lv_obj_set_style_local_line_color(line, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); + lv_obj_set_style_local_line_opa(line, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_50); + lv_obj_set_style_local_line_width(line, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 1); + s_line_points[0].x = 10; + s_line_points[0].y = lv_obj_get_y(ext->ta) + lv_obj_get_height(ext->ta) + 3; + s_line_points[1].x = lv_obj_get_width(obj) - s_line_points[0].x; + s_line_points[1].y = s_line_points[0].y; + lv_line_set_points(line, s_line_points, 2); + lv_obj_set_x(line, 0); + +#else lv_obj_align(ext->ta, NULL, LV_ALIGN_IN_TOP_MID, 0, 10); lv_obj_set_base_dir(ext->ta, LV_BIDI_DIR_LTR); lv_watch_obj_add_element(ext->ta); +#endif //circle ext->cont_circle = lv_cont_create(obj, NULL); +#ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_set_size(ext->cont_circle, 50, 50 - 10); +#else lv_obj_set_size(ext->cont_circle, 50, 50); +#endif lv_obj_set_hidden(ext->cont_circle, true); lv_obj_set_style_local_bg_opa(ext->cont_circle, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_50); @@ -292,7 +314,11 @@ static lv_res_t dialpad_btn_press_action(lv_obj_t * btn) if((9 != free_num) && (11 != free_num)) { //not back or dial button //show circle lv_obj_set_hidden(ext->cont_circle, false); + #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_set_pos(ext->cont_circle, lv_obj_get_x(btn) + 19, lv_obj_get_y(btn) + 48 + 5); + #else lv_obj_set_pos(ext->cont_circle, lv_obj_get_x(btn) + 19, lv_obj_get_y(btn) + 48); + #endif } return LV_RES_OK; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c b/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c index 9364f4d0..e357a9b2 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c @@ -578,7 +578,9 @@ static void launcher_drop_down_bar_create(lv_obj_t * activity_obj) {1, 0}, #endif #if USE_LV_WATCH_WEATHER != 0 +#ifndef __MMI_WEATHER_MENU_SUPPORT__ {2, 0}, +#endif #endif }; @@ -616,10 +618,15 @@ static void launcher_drop_down_bar_create(lv_obj_t * activity_obj) ancestor_launcher_tileview_scrl_signal = lv_obj_get_signal_cb(lv_page_get_scrollable(tileview)); lv_obj_set_signal_cb(lv_page_get_scrollable(tileview), launcher_drop_down_tileview_scrl_signal); - +#if USE_LV_WATCH_QUICK_FUNCTION != 0 quick_function_create(tileview, 0); +#endif status_and_setting_create(tileview, 1); +#if USE_LV_WATCH_WEATHER != 0 +#ifndef __MMI_WEATHER_MENU_SUPPORT__ weather_create(tileview, 2); +#endif +#endif lv_tileview_set_valid_positions(tileview, dd_valid_pos, sizeof(dd_valid_pos) / sizeof(dd_valid_pos[0])); launcher_drop_pull_leds_create(tileview); lv_tileview_set_tile_act(tileview, 1, 0, false); @@ -710,6 +717,13 @@ static void launcher_drop_pull_leds_create(lv_obj_t * tileview) } lv_obj_set_pos(ext->leds_content, (LV_HOR_RES - lv_obj_get_width(ext->leds_content)) / 2, LV_VER_RES - lv_obj_get_height(ext->leds_content)); + +#ifdef __MMI_ZHSX_SUPPORT__ + if(1 == ext->old_ext.valid_pos_cnt) + { + lv_obj_set_hidden(ext->leds_content, true); + } +#endif } static lv_res_t launcher_pull_up_tileview_scrl_signal(lv_obj_t * scrl, lv_signal_t sign, void * param) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c index 1b96c9a1..21965a08 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c @@ -60,6 +60,284 @@ extern phone_call_params_t call_params; ***********************/ #ifdef __MMI_ZHSX_SUPPORT__ +#ifdef USE_LV_WATCH_UI_240_240_CIRCLE + +#define MMI_PHONE_CALL_BTN_Y_OFFSET (-30) +#define MMI_PHONE_CALL_LEFT_BTN_X_OFFSET (30) +#define MMI_PHONE_CALL_RIGHT_BTN_X_OFFSET (-30) + +static void phone_dialing(lv_obj_t * content) +{ + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + lv_phone_obj_ext_t * ext = phone_get_ext(); + LV_ASSERT_MEM(ext); + if(ext == NULL) + return; + + lv_bidi_dir_t bidi_dir = lv_obj_get_base_dir(content); + + //label dialing + lv_obj_t * label = lv_label_create(content, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_label_set_text_id(label, WATCH_TEXT_ID_DAILING); + lv_obj_set_click(label, false); + lv_obj_align(label, content, LV_ALIGN_IN_TOP_MID, 0, 0); + lv_obj_set_hidden(label, true); + ext->phone_status_label = label; + + //img + lv_obj_t * img = lv_img_create(content, NULL); + lv_img_set_src(img, ICON_CALL_OUTGOING); + lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 10); + + //name or number + label = lv_label_create(content, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL); + lv_obj_set_width(label, lv_obj_get_width(content) - 10); + char txt[NV_CONTACTS_MAX_NAME_LEN] = {0}; + if(LV_BIDI_DIR_RTL == bidi_dir) + lv_obj_set_base_dir(label, LV_BIDI_DIR_LTR); + + if(strlen(call_params.name) > 0) + strcpy(txt, call_params.name); + else + strcpy(txt, call_params.number); + + lv_label_set_text(label, txt); + lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); + + //btn volume + lv_obj_t * btn; + btn = lv_imgbtn_create(content, NULL); + lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_PHONE_RING_VOLUME); + lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_PHONE_RING_VOLUME); + lv_obj_set_event_cb(btn, volume_btn_action); + lv_obj_align(btn, content, LV_ALIGN_IN_BOTTOM_LEFT, MMI_PHONE_CALL_LEFT_BTN_X_OFFSET, MMI_PHONE_CALL_BTN_Y_OFFSET); + + //btn ring off + btn = lv_imgbtn_create(content, NULL); + lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_PHONE_RING_OFF); + lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_PHONE_RING_OFF); + lv_obj_set_event_cb(btn, ring_off_action); + lv_obj_align(btn, content, LV_ALIGN_IN_BOTTOM_RIGHT, MMI_PHONE_CALL_RIGHT_BTN_X_OFFSET, MMI_PHONE_CALL_BTN_Y_OFFSET); +} + +static void phone_ring(lv_obj_t * content) +{ + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + lv_watch_indev_reset(); + + lv_phone_obj_ext_t * ext = phone_get_ext(); + LV_ASSERT_MEM(ext); + if(ext == NULL) return; + lv_obj_t * label; + + lv_bidi_dir_t bidi_dir = lv_obj_get_base_dir(content); + + //label ringing + label = lv_label_create(content, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_label_set_text_id(label, WATCH_TEXT_ID_RINGING); + lv_obj_set_click(label, false); + lv_obj_align(label, content, LV_ALIGN_IN_TOP_MID, 0, 0); + lv_obj_set_hidden(label, true); + ext->phone_status_label = label; + + //img + lv_obj_t * img = lv_img_create(content, NULL); + lv_img_set_src(img, ICON_CALL_INCOMING); + lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 10); + + //name or number + label = lv_label_create(content, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL); + lv_obj_set_width(label, lv_obj_get_width(content) - 10); + char txt[NV_CONTACTS_MAX_NAME_LEN] = {0}; + if(LV_BIDI_DIR_RTL == bidi_dir) + lv_obj_set_base_dir(label, LV_BIDI_DIR_LTR); + + if(strlen(call_params.name) > 0) + strcpy(txt, call_params.name); + else + strcpy(txt, call_params.number); + + lv_label_set_text(label, txt); + lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); + ext->num_label = label; + + //btn ring off + lv_obj_t * btn; + btn = lv_imgbtn_create(content, NULL); + lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_PHONE_RING_OFF); + lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_PHONE_RING_OFF); + lv_obj_set_event_cb(btn, ring_off_action); + lv_obj_align(btn, content, LV_ALIGN_IN_BOTTOM_LEFT, MMI_PHONE_CALL_LEFT_BTN_X_OFFSET, MMI_PHONE_CALL_BTN_Y_OFFSET); + + //btn ring hook + btn = lv_imgbtn_create(content, NULL); + lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_PHONE_HOOK); + lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_PHONE_HOOK); + lv_obj_set_event_cb(btn, ring_hook_action); + lv_obj_align(btn, content, LV_ALIGN_IN_BOTTOM_RIGHT, MMI_PHONE_CALL_RIGHT_BTN_X_OFFSET, MMI_PHONE_CALL_BTN_Y_OFFSET); +} + +static void phone_connected(lv_obj_t * content) +{ + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + lv_phone_obj_ext_t * ext = phone_get_ext(); + LV_ASSERT_MEM(ext); + if(ext == NULL) + return; + + lv_bidi_dir_t bidi_dir = lv_obj_get_base_dir(content); + + //img + lv_obj_t * img = lv_img_create(content, NULL); + lv_img_set_src(img, ICON_CALL_CALLING); + lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 10); + + //name or number + lv_obj_t * label = lv_label_create(content, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL); + lv_obj_set_width(label, lv_obj_get_width(content) - 10); + char txt[NV_CONTACTS_MAX_NAME_LEN] = {0}; + if(LV_BIDI_DIR_RTL == bidi_dir) + lv_obj_set_base_dir(label, LV_BIDI_DIR_LTR); + + if(strlen(call_params.name) > 0) + strcpy(txt, call_params.name); + else + strcpy(txt, call_params.number); + + lv_label_set_text(label, txt); + lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 5); + ext->num_label = label; + + //duration + label = lv_label_create(content, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_label_set_text(label, "00:00"); + lv_obj_set_click(label, false); + lv_obj_set_base_dir(label, LV_BIDI_DIR_LTR); + lv_obj_align(label, ext->num_label, LV_ALIGN_OUT_BOTTOM_MID, 0, 3); + ext->phone_status_label = label; + + //btn volume + lv_obj_t * btn; + btn = lv_imgbtn_create(content, NULL); + lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_PHONE_RING_VOLUME); + lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_PHONE_RING_VOLUME); + lv_obj_set_event_cb(btn, volume_btn_action); + lv_obj_align(btn, content, LV_ALIGN_IN_BOTTOM_LEFT, MMI_PHONE_CALL_LEFT_BTN_X_OFFSET, MMI_PHONE_CALL_BTN_Y_OFFSET); + + //btn ring off + btn = lv_imgbtn_create(content, NULL); + lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_PHONE_RING_OFF); + lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_PHONE_RING_OFF); + lv_obj_set_event_cb(btn, ring_off_action); + lv_obj_align(btn, content, LV_ALIGN_IN_BOTTOM_RIGHT, MMI_PHONE_CALL_RIGHT_BTN_X_OFFSET, MMI_PHONE_CALL_BTN_Y_OFFSET); + + hal_rtc_t rtc_curr; // current rtc time + Hal_Rtc_Gettime(&rtc_curr); + ext->connect_start_time = time_to_seconds(&rtc_curr); + printf("%s: connect_start_time=%u, rtc_curr = %d/%d/%d, %d:%d:%d\n", __FUNCTION__, + ext->connect_start_time, + rtc_curr.tm_year, + rtc_curr.tm_mon, + rtc_curr.tm_mday, + rtc_curr.tm_hour, + rtc_curr.tm_min, + rtc_curr.tm_sec); +} + +lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id) +{ + printf("[@CHENG_DEBUG][%s][%d]: phone_ui_id=%d\n", __FUNCTION__, __LINE__, phone_ui_id); + + if(PHONE_UI_CONNECTED == phone_ui_id) { + /* set speaker volume to nv when leaving activiry's slider */ + set_volume_when_slider_act(); + } + /* cleanup phone first */ + phone_cleanup(); + + if(NULL == activity_obj) + { + lv_watch_activity_ext_t activity_ext; + memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t)); + activity_ext.actId = ACT_ID_PHONE; + activity_ext.create = NULL; + activity_ext.prepare_destory = phone_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_LEFT_OR_RIGHT_SLIDE_CALLBACK); + lv_watch_obj_set_left_slide_cb(obj, phone_left_slide_callback); + lv_watch_obj_set_right_slide_cb(obj, phone_right_slide_callback); + + lv_phone_obj_ext_t * ext = lv_obj_allocate_ext_attr(obj, sizeof(lv_phone_obj_ext_t)); + LV_ASSERT_MEM(ext); + if(ext == NULL) + return NULL; + + ext->phone_status_label = NULL; + ext->phone_animation_obj = NULL; + ext->phone_ui_id = phone_ui_id; + ext->connect_start_time = 0; + + /* content */ + lv_obj_t * content = lv_cont_create(obj, NULL); + lv_obj_set_size(content, lv_obj_get_width(obj), lv_obj_get_height(obj)); + //lv_cont_set_layout(content, LV_LAYOUT_COLUMN_MID); + LV_ASSERT_MEM(content); + if(content == NULL) + return NULL; + lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_style_transp); + /* must click false */ + lv_obj_set_click(content, false); + lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, 0); + + if(ext->phone_ui_id == PHONE_UI_DIALING) + { + phone_dialing(content); + //dialing_animation(ext->phone_status_label); + } + else if(ext->phone_ui_id == PHONE_UI_RING) + { + phone_ring(content); + //ring_animation(ext->phone_status_label); + } + else if(ext->phone_ui_id == PHONE_UI_CONNECTED) + { + phone_connected(content); + connected_animation(ext->phone_status_label); + } + + return obj; +} + +#else + #if USE_LV_WATCH_UI_240_320 #define MMI_PHONE_CALL_BTN_Y_OFFSET (-50) #define MMI_PHONE_CALL_LEFT_BTN_X_OFFSET (20) @@ -339,6 +617,7 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id) return obj; } +#endif #else @@ -742,6 +1021,29 @@ lv_obj_t * call_prompt_create(lv_obj_t * activity_obj) return NULL; } +#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_add_style(cont, LV_OBJ_PART_MAIN, &lv_watch_cont_opa2); + + lv_obj_t * label = lv_label_create(cont, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); + //lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + //lv_obj_set_size(label, LV_HOR_RES * 5 / 6, LV_VER_RES / 2); + lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_CARD); + lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -30); + + lv_obj_t * btn = lv_btn_create(cont, NULL); + lv_obj_set_size(btn, 100, 56); + lv_obj_set_event_cb(btn, call_prompt_ok_btn_action); + lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -20); + lv_obj_add_protect(btn, LV_PROTECT_PRESS_LOST); + + lv_obj_t * label_btn = lv_label_create(btn, NULL); + lv_label_set_text_id(label_btn, WATCH_TEXT_ID_OK); + lv_obj_add_style(label_btn, LV_LABEL_PART_MAIN, &lv_watch_font26); +#else lv_obj_t * cont = lv_cont_create(obj, NULL); lv_obj_set_size(cont, LV_HOR_RES * 5 / 6, LV_VER_RES / 2); lv_obj_set_pos(cont, LV_HOR_RES / 12, LV_VER_RES / 4); @@ -763,6 +1065,7 @@ lv_obj_t * call_prompt_create(lv_obj_t * activity_obj) lv_obj_t * label_btn = lv_label_create(btn, NULL); lv_label_set_text_id(label_btn, WATCH_TEXT_ID_OK); lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); +#endif return obj; } @@ -907,18 +1210,20 @@ static lv_obj_t * ring_off_content_create(lv_obj_t * par) LV_ASSERT_MEM(content); if(content == NULL) return NULL; - lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_cont_opa1); - lv_obj_set_size(content, 204, 44); - if(ext->phone_ui_id == PHONE_UI_RING || ext->phone_ui_id == PHONE_UI_DIALING) { - lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10); - } else { - lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12); - } +// lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_cont_opa1); +// lv_obj_set_size(content, 204, 44); +// if(ext->phone_ui_id == PHONE_UI_RING || ext->phone_ui_id == PHONE_UI_DIALING) { +// lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10); +// } else { +// lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12); +// } + lv_obj_set_size(content, LV_HOR_RES - 40, 50); + lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10); lv_cont_set_layout(content, LV_LAYOUT_CENTER); lv_obj_set_click(content, false); lv_obj_t * label = lv_label_create(content, NULL); - lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20); lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); if(ext->phone_ui_id == PHONE_UI_CONNECTED) { diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone_api.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone_api.c index 51f8d345..83a90d5c 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone_api.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone_api.c @@ -334,6 +334,18 @@ void watch_modem_call_response_clip(int32_t index, MMI_Modem_Call_Response_Clip_ strncpy(call_params.number, clip->number, NV_CONTACTS_MAX_NUMBER_LEN); } +#ifdef __MMI_ZHSX_SUPPORT__ + contact_info = phonebook_get_contact_info(clip->number); + if(NULL == contact_info) // not in + { + if(0 == mmi_white_list_switch_get()) // close + { + contact_info = (phonebook_contact_t *)Hal_Mem_Alloc(sizeof(phonebook_contact_t)); + Hal_Mem_Set(contact_info, 0x0, sizeof(phonebook_contact_t)); + } + } +#else + number = phonebook_get_phone_number(0); if(NULL == number) { //no contact contact_info = (phonebook_contact_t *)Hal_Mem_Alloc(sizeof(phonebook_contact_t)); @@ -346,6 +358,7 @@ void watch_modem_call_response_clip(int32_t index, MMI_Modem_Call_Response_Clip_ Hal_Mem_Free(number); contact_info = phonebook_get_contact_info(clip->number); } +#endif if(NULL != contact_info) { Hal_Mem_Copy(call_params.name, contact_info->contact_name, NV_CONTACTS_MAX_NAME_LEN); @@ -530,6 +543,7 @@ void phone_voice_call_req(char * number) strncpy(call_params.number, number, NV_CONTACTS_MAX_NUMBER_LEN); +#ifndef __MMI_ZHSX_SUPPORT__ phonebook_contact_t * contact_info = phonebook_get_contact_info(number); if(NULL != contact_info) { Hal_Mem_Copy(call_params.name, contact_info->contact_name, NV_CONTACTS_MAX_NAME_LEN); @@ -541,6 +555,7 @@ void phone_voice_call_req(char * number) call_params.img_src = ICON_FAMILY; call_params.img_src_small = ICON_FAMILY_SMALL; } +#endif //Initiate voice call dial_number = (char *)Hal_Mem_Alloc(strlen(call_params.number) + 1); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c index 1928ad59..da6e9c94 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c @@ -45,6 +45,9 @@ static watch_app_info_t s_main_menu_four_grid[] = { ICON_VIDEOCALL, WATCH_TEXT_ID_VIDEOCALL, video_call_create_event_cb }, #endif +#ifdef __MMI_WEATHER_MENU_SUPPORT__ + { ICON_WEATHER, WATCH_TEXT_ID_WEATHER, mmi_weather_create_event_cb }, +#endif { ICON_ALARM, WATCH_TEXT_ID_ALARM, alarm_create_event_cb }, { ICON_STOPWATCH, WATCH_TEXT_ID_STOPWATCH, stopwatch_create_event_cb }, { ICON_TIMER, WATCH_TEXT_ID_TIMER, timer_create_event_cb }, @@ -60,44 +63,6 @@ static watch_app_info_t s_main_menu_four_grid[] = // one page #ifdef __MMI_MAIN_MENU_ONE_PAGE_STYLE__ -#ifdef MMI_PROJECT_Z5_D12 -static watch_app_info_t s_main_menu_one_page[] = -{ - { ICON_PHONEBOOK_ONE_PAGE, WATCH_TEXT_ID_PHONEBOOK, phonebook_create_btn_event_cb}, -#if USE_LV_WATCH_SMS_MSG != 0 - { ICON_SMS_MSG_ONE_PAGE, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb}, -#endif - { ICON_DIALPAD_ONE_PAGE, WATCH_TEXT_ID_DIALPAD, dialpad_create_event_cb }, - -#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__ - { ICON_HEART_RATE_ONE_PAGE, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb}, -#endif -#ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__ - { ICON_SPO2_ONE_PAGE, WATCH_TEXT_ID_SPO2, health_spo2_create_event_cb}, -#endif -#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ - { ICON_TEMPERATURE_ONE_PAGE, WATCH_TEXT_ID_TEMPERATURE, health_temperature_create_event_cb}, -#endif -#ifdef __MMI_WECHAT_SUPPORT__ - { ICON_WECHAT_ONE_PAGE, WATCH_TEXT_ID_WECHAT, wechat_create_event_cb }, -#endif - -#if USE_LV_WATCH_CAMERA != 0 - { ICON_CAMERA_ONE_PAGE, WATCH_TEXT_ID_CAMERA, camera_create_btn_event_cb }, - { ICON_ALBUM_ONE_PAGE, WATCH_TEXT_ID_ALBUM, album_create_event_cb }, -#endif -#if USE_LV_WATCH_ALIPAY != 0 - { ICON_ALIPAY_ONE_PAGE, WATCH_TEXT_ID_ALIPAY, upay_create_event_cb }, -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ - { ICON_VIDEOCALL_ONE_PAGE, WATCH_TEXT_ID_VIDEOCALL, video_call_create_event_cb }, -#endif - - { ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb }, -}; - -#else - static watch_app_info_t s_main_menu_one_page[] = { { ICON_PHONEBOOK_ONE_PAGE, WATCH_TEXT_ID_PHONEBOOK, phonebook_create_btn_event_cb}, @@ -131,15 +96,12 @@ static watch_app_info_t s_main_menu_one_page[] = { ICON_VIDEOCALL_ONE_PAGE, WATCH_TEXT_ID_VIDEOCALL, video_call_create_event_cb }, #endif - { ICON_ALARM_ONE_PAGE, WATCH_TEXT_ID_ALARM, alarm_create_event_cb }, - { ICON_STOPWATCH_ONE_PAGE, WATCH_TEXT_ID_STOPWATCH, stopwatch_create_event_cb }, - { ICON_TIMER_ONE_PAGE, WATCH_TEXT_ID_TIMER, timer_create_event_cb }, - - { ICON_CALCULATOR_ONE_PAGE, WATCH_TEXT_ID_CALCULATOR, calculator_create_event_cb }, - { ICON_CALENDAR_ONE_PAGE, WATCH_TEXT_ID_CALENDER, calendar_create_event_cb }, +#ifdef __MMI_TOOL_MENU_SUPPORT__ + { ICON_TOOL_ONE_PAGE, WATCH_TEXT_ID_TOOL, mmi_tool_menu_create_event_cb }, +#endif { ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb }, }; -#endif + #endif @@ -154,6 +116,7 @@ static watch_app_info_t s_main_menu_list[] = { ICON_SMS_MSG_LIST, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb}, #endif { ICON_DIALPAD_LIST, WATCH_TEXT_ID_DIALPAD, dialpad_create_event_cb }, + { ICON_CALLLOG_LIST, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb }, #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__ { ICON_HEART_RATE_LIST, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb}, @@ -179,6 +142,9 @@ static watch_app_info_t s_main_menu_list[] = { ICON_VIDEOCALL_LIST, WATCH_TEXT_ID_VIDEOCALL, video_call_create_event_cb }, #endif +#ifdef __MMI_WEATHER_MENU_SUPPORT__ + { ICON_WEATHER_LIST, WATCH_TEXT_ID_WEATHER, mmi_weather_create_event_cb }, +#endif { ICON_ALARM_LIST, WATCH_TEXT_ID_ALARM, alarm_create_event_cb }, { ICON_STOPWATCH_LIST, WATCH_TEXT_ID_STOPWATCH, stopwatch_create_event_cb }, { ICON_TIMER_LIST, WATCH_TEXT_ID_TIMER, timer_create_event_cb }, diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c index 9683a4fc..d6318a1b 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c @@ -10,48 +10,49 @@ #if USE_LV_WATCH_SETTING != 0 -/********************* - * DEFINES - *********************/ - -/********************** - * TYPEDEFS - **********************/ +extern lv_watch_Activity_Id_t g_watch_list_actId; -/********************** - * STATIC PROTOTYPES - **********************/ - -/********************** - * STATIC VARIABLES - **********************/ -const struct { - void * img_src; - watchLangTxtId_t txtId; - lv_event_cb_t event_cb; -} settingList[] = { +//const struct { +// void * img_src; +// watchLangTxtId_t txtId; +// lv_event_cb_t event_cb; +//} settingList[] = { +static mmi_watch_list_item_t settingList[] = +{ #ifdef __MMI_ZHSX_SUPPORT__ //{ ICON_SETTING_LANGUAGE, WATCH_TEXT_ID_LANGUAGE_SWITCH, language_create_btn_action }, +#if USE_LV_WATCH_DIAL_SWITCH != 0 { ICON_SETTING_DAIL_FORMAT_SWITCH, WATCH_TEXT_ID_DAIL_REPLACE, dial_switch_create_btn_action }, +#endif #ifdef __MMI_MAIN_MENU_SWITCH_MENU__ { ICON_SETTING_MAIN_MENU_SWITCH, WATCH_TEXT_ID_MAIN_MENU_SWITCH, setting_main_menu_switch_create_event_cb }, #endif +#if USE_LV_WATCH_SETTING_VOLUME != 0 { ICON_SETTING_VOLUME, WATCH_TEXT_ID_VOLUME_ADJUST, setting_volume_create_btn_action }, +#endif +#if USE_LV_WATCH_SETTING_BRIGHTNESS != 0 { ICON_SETTING_BRIGHTNESS, WATCH_TEXT_ID_BRIGHTNESS_ADJUST, setting_brightness_create_btn_action }, - { ICON_SETTING_DATETIME, WATCH_TEXT_ID_DATE_AND_TIME, setting_date_time_create_btn_action}, +#endif +#if USE_LV_WATCH_SETTING_DATETIME != 0 + //{ ICON_SETTING_DATETIME, WATCH_TEXT_ID_DATE_AND_TIME, setting_date_time_create_btn_action}, +#endif #ifdef __MMI_APP_QRCODE_MENU_SUPPORT__ { ICON_SETTING_APP_QRCODE, WATCH_TEXT_ID_APP_QRCODE, app_qrcode_create_event_cb }, #endif #if USE_LV_WATCH_QRCODE != 0 { ICON_SETTING_QRCODE, WATCH_TEXT_ID_DEVICE_QRCODE, qrcode_create_event_cb }, #endif +#if USE_LV_WATCH_RESTART_AND_RESET != 0 { ICON_SETTING_RESET, WATCH_TEXT_ID_RESTART_AND_RESET, restart_and_reset_create_btn_action }, +#endif #if USE_LV_WATCH_SHUTDOWN != 0 { ICON_SETTING_SHUTDOWN, WATCH_TEXT_ID_SHUTDOWN, shutdown_create_btn_action }, #endif +#if USE_LV_WATCH_SETTING_ABOUT != 0 { ICON_SETTING_ABOUT, WATCH_TEXT_ID_ABOUT_WATCH, setting_about_create_btn_action }, +#endif #else // __MMI_ZHSX_SUPPORT__ @@ -132,6 +133,16 @@ const struct { /********************** * GLOBAL FUNCTIONS ***********************/ +#ifdef __MMI_ZHSX_SUPPORT__ +void mmi_watch_setting_data_nv_default(nv_watch_settings_t * setting) +{ + setting->ringvolume = MMI_PHONE_RING_VOLUME_DEFAULT; + setting->backlightintensity = MMI_PHONE_BACKLIGHT_LEVEL_DEFAULT; + setting->backlighttimeout = MMI_PHONE_BACKLIGHT_TIMEOUT_DEFAULT; + setting->currentlanguage = MMI_PHONE_LANGUAGE_DEFAULT; +} +#endif + void setting_init(void) { nv_watch_settings_t * nvsettings; @@ -184,6 +195,7 @@ lv_obj_t * setting_create(lv_obj_t * par) { (void)par; + g_watch_list_actId = ACT_ID_SETTING; lv_obj_t * obj = lv_watch_list_create(NULL); LV_ASSERT_MEM(obj); if(obj == NULL) return NULL; @@ -217,14 +229,4 @@ void setting_create_event_cb(lv_obj_t * btn, lv_event_t e) } } -#ifdef __MMI_ZHSX_SUPPORT__ -void mmi_watch_setting_data_nv_default(nv_watch_settings_t * setting) -{ - setting->ringvolume = MMI_PHONE_RING_VOLUME_DEFAULT; - setting->backlightintensity = MMI_PHONE_BACKLIGHT_LEVEL_DEFAULT; - setting->backlighttimeout = MMI_PHONE_BACKLIGHT_TIMEOUT_DEFAULT; - setting->currentlanguage = MMI_PHONE_LANGUAGE_DEFAULT; -} -#endif - #endif /*USE_LV_WATCH_SETTING*/ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c index 0112b6b6..77d5f2a2 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c @@ -14,17 +14,21 @@ #ifdef __MMI_ZHSX_SUPPORT__ -const watch_weather_list weather_list[] = { - { ICON_SUNNY, WATCH_TEXT_ID_SUNNY }, /* WATCH_WEATHER_ID_SUNNY = 0, */ - { ICON_CLOUDY, WATCH_TEXT_ID_CLOUDY }, /* WATCH_WEATHER_ID_CLOUDY, */ - { ICON_LIGHT_RAIN, WATCH_TEXT_ID_LIGHT_RAIN }, /* WATCH_WEATHER_ID_LIGHT_RAIN, */ - { ICON_HEAVY_RAIN, WATCH_TEXT_ID_HEAVY_RAIN }, /* WATCH_WEATHER_ID_HEAVY_RAIN, */ - { ICON_LIGHT_SNOW, WATCH_TEXT_ID_LIGHT_SNOW }, /* WATCH_WEATHER_ID_LITTLE_SNOW, */ - { ICON_HEAVY_SNOW, WATCH_TEXT_ID_HEAVY_SNOW }, /* WATCH_WEATHER_ID_HEAVY_SNOW, */ - { ICON_FOG, WATCH_TEXT_ID_FOG }, /* WATCH_WEATHER_ID_FOG, */ - { ICON_HAZE, WATCH_TEXT_ID_HAZE }, /* WATCH_WEATHER_ID_HAZE, */ - { ICON_WEATHER_OTHERS, WATCH_TEXT_ID_OTHER_WEATHER }, /* WATCH_WEATHER_ID_OTHERS = 99, */ - { ICON_NO_NETWORK, WATCH_TEXT_ID_WEATHER_NO_NETWORK }, /* WATCH_WEATHER_ID_NO_INFO = 255*/ +static const watch_weather_list s_weather_list[] = +{ + {WATCH_WEATHER_ID_SUNNY, ICON_SUNNY, WATCH_TEXT_ID_SUNNY}, + {WATCH_WEATHER_ID_CLOUDY, ICON_CLOUDY, WATCH_TEXT_ID_CLOUDY}, + {WATCH_WEATHER_ID_OVERCAST, ICON_OVERCAST, WATCH_TEXT_ID_OVERCAST}, + {WATCH_WEATHER_ID_LIGHT_RAIN, ICON_LIGHT_RAIN, WATCH_TEXT_ID_LIGHT_RAIN}, + {WATCH_WEATHER_ID_HEAVY_RAIN, ICON_HEAVY_RAIN, WATCH_TEXT_ID_HEAVY_RAIN}, + {WATCH_WEATHER_ID_LITTLE_SNOW, ICON_LIGHT_SNOW, WATCH_TEXT_ID_LIGHT_SNOW}, + {WATCH_WEATHER_ID_HEAVY_SNOW, ICON_HEAVY_SNOW, WATCH_TEXT_ID_HEAVY_SNOW}, + {WATCH_WEATHER_ID_FOG, ICON_FOG, WATCH_TEXT_ID_FOG}, + {WATCH_WEATHER_ID_HAZE, ICON_HAZE, WATCH_TEXT_ID_HAZE}, + + // add other weather info before this line + {WATCH_WEATHER_ID_OTHERS, ICON_WEATHER_OTHERS, WATCH_TEXT_ID_OTHER_WEATHER}, + {WATCH_WEATHER_ID_NO_INFO, ICON_NO_NETWORK, WATCH_TEXT_ID_WEATHER_NO_NETWORK}, }; static lv_obj_t * weather_content_no_info_create(lv_obj_t * par) @@ -35,11 +39,12 @@ static lv_obj_t * weather_content_no_info_create(lv_obj_t * par) if(img == NULL) return NULL; - lv_img_set_src(img, weather_list[9].img_src); + uint8_t count = sizeof(s_weather_list) / sizeof(s_weather_list[0]); + lv_img_set_src(img, s_weather_list[count - 1].img_src); lv_obj_t * label = lv_label_create(content, NULL); lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26); - lv_label_set_text_id(label, weather_list[9].txtId); + lv_label_set_text_id(label, s_weather_list[count - 1].txtId); lv_obj_set_click(label, false); return(content); @@ -49,23 +54,25 @@ static lv_obj_t * weather_image_content_create(lv_obj_t * par, app_adaptor_weath { lv_obj_t * content = lv_watch_cont_create(par, LV_LAYOUT_COLUMN_MID, &lv_style_transp_fit, lv_obj_get_width(par)); lv_obj_t * img = lv_img_create(content, NULL); - int8_t index; - if(weather->weather_id >= sizeof(weather_list) / sizeof(weather_list[0]) - 1) { - index = 8; - } else { - index = weather->weather_id; - } - - if(img == NULL) - return NULL; - - lv_img_set_src(img, weather_list[index].img_src); + uint8_t i = 0; + uint8_t count = sizeof(s_weather_list) / sizeof(s_weather_list[0]); + for(i = 0; i < count; i++) + { + if(weather->weather_id == s_weather_list[i].weather_id) + { + break; + } + } + if(i >= count) + i = count - 2; + + lv_img_set_src(img, s_weather_list[i].img_src); lv_obj_t * label = lv_label_create(content, NULL); lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26); - lv_label_set_text_id(label, weather_list[index].txtId); + lv_label_set_text_id(label, s_weather_list[i].txtId); lv_obj_set_click(label, false); @@ -88,12 +95,12 @@ static lv_obj_t * weather_temperature_content_create(lv_obj_t * par, app_adaptor lv_cont_set_layout(content, LV_LAYOUT_OFF); lv_obj_t * label1 = lv_label_create(content, NULL); - lv_obj_add_style(label1, LV_LABEL_PART_MAIN, &lv_watch_font30_yellow); + lv_obj_add_style(label1, LV_LABEL_PART_MAIN, &lv_watch_font26_yellow); sprintf(str, "%d %s", weather->current_temperature, lang_get_text_by_id(WATCH_TEXT_ID_TEMPERATURE_UNIT)); // temp_unit); //sprintf(str, "%d %s", 28, lang_get_text_by_id(WATCH_TEXT_ID_TEMPERATURE_UNIT)); lv_label_set_text(label1, str); lv_obj_set_click(label1, false); - lv_obj_align(label1, content, LV_ALIGN_IN_LEFT_MID, 30, 0); + lv_obj_align(label1, content, LV_ALIGN_IN_LEFT_MID, 40, 0); lv_obj_t * label2 = lv_label_create(content, NULL); lv_obj_add_style(label2, LV_LABEL_PART_MAIN, &lv_watch_font20); @@ -101,7 +108,7 @@ static lv_obj_t * weather_temperature_content_create(lv_obj_t * par, app_adaptor //sprintf(str, "%d-%d %s", 23, 32, lang_get_text_by_id(WATCH_TEXT_ID_TEMPERATURE_UNIT)); lv_label_set_text(label2, str); lv_obj_set_click(label2, false); - lv_obj_align(label2, content, LV_ALIGN_IN_RIGHT_MID, -20, 0); + lv_obj_align(label2, content, LV_ALIGN_IN_RIGHT_MID, -25, 0); return(content); } @@ -166,14 +173,18 @@ void weather_update(lv_obj_t * cont) } else { - weather_ext->content1 = weather_image_content_create(cont, &weather_info); + weather_ext->content1 = weather_image_content_create(cont, &weather_info); + weather_ext->content2 = weather_temperature_content_create(cont, &weather_info); + weather_ext->content3 = weather_city_content_create(cont, &weather_info); + #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 0); + lv_obj_align(weather_ext->content2, weather_ext->content1, LV_ALIGN_OUT_BOTTOM_MID, 0, 1); + lv_obj_align(weather_ext->content3, weather_ext->content2, LV_ALIGN_OUT_BOTTOM_MID, 0, 1); + #else lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 20); - - weather_ext->content2 = weather_temperature_content_create(cont, &weather_info); lv_obj_align(weather_ext->content2, weather_ext->content1, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); - - weather_ext->content3 = weather_city_content_create(cont, &weather_info); lv_obj_align(weather_ext->content3, weather_ext->content2, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); + #endif } } @@ -206,6 +217,80 @@ lv_obj_t * weather_create(lv_obj_t * tileview, uint16_t id) return(tab); } +#ifdef __MMI_WEATHER_MENU_SUPPORT__ +void mmi_debug_weather_data(void) +{ +#if 0 + static uint8_t flag = 0; + char data_str[] = "23-10-11,12:38:06,b6e0d4c6,1,27,-1,40,6DF157335E02"; + + if(0 == flag) + { + flag = 1; + mmi_protocol_fzd_parse_ACTION_GET_WEATHER(data_str, strlen(data_str)); + } +#endif +} + +void mmi_weather_menu_prepare_destory(lv_obj_t * activity_obj) +{ + lv_watch_png_cache_all_free(); +} + +lv_obj_t * mmi_weather_menu_create(lv_obj_t * activity_obj) +{ + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_debug_weather_data(); + + 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_WEATHER_MENU; + activity_ext.create = mmi_weather_menu_create; + activity_ext.prepare_destory = mmi_weather_menu_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); + + lv_obj_t * weather_cont = lv_cont_create(obj, NULL); + lv_weather_ext_t * weather_ext = lv_obj_allocate_ext_attr(weather_cont, sizeof(lv_weather_ext_t)); + if(weather_ext == NULL) + return NULL; + weather_ext->content1 = NULL; + weather_ext->content2 = NULL; + weather_ext->content3 = NULL; + + lv_obj_set_size(weather_cont, lv_obj_get_width(obj), lv_obj_get_height(obj)); + lv_obj_add_style(weather_cont, LV_CONT_PART_MAIN, &lv_watch_style_transp); + lv_obj_set_click(weather_cont, false); + weather_update(weather_cont); + + return obj; +} + +void mmi_weather_create_event_cb(lv_obj_t * btn, lv_event_t e) +{ + (void)btn; + if(LV_EVENT_CLICKED == e) + { + lv_watch_png_cache_all_free(); + lv_obj_t * obj = mmi_weather_menu_create(NULL); + LV_ASSERT_MEM(obj); + if(obj == NULL) + return; + } +} +#endif + #else /********************* diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.h b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.h index ebcee468..ac7a98c9 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.h @@ -30,10 +30,19 @@ extern "C" { /********************** * TYPEDEFS **********************/ +#ifdef __MMI_ZHSX_SUPPORT__ +typedef struct +{ + watch_app_adp_weather_id_t weather_id; + const void * img_src; + watchLangTxtId_t txtId; +} watch_weather_list; +#else typedef struct { const void * img_src; watchLangTxtId_t txtId; } watch_weather_list; +#endif typedef struct { @@ -47,6 +56,11 @@ typedef struct * GLOBAL PROTOTYPES **********************/ lv_obj_t * weather_create(lv_obj_t * tilevew, uint16_t id); + +#ifdef __MMI_WEATHER_MENU_SUPPORT__ +void mmi_weather_create_event_cb(lv_obj_t * btn, lv_event_t e); +#endif + /********************** * MACROS **********************/ diff --git a/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c b/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c index cabceed5..d36eb99f 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c +++ b/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c @@ -38,12 +38,19 @@ static void lv_watch_list_prepare_destory(lv_obj_t * activity_obj); /********************** * GLOBAL FUNCTIONS ***********************/ +lv_watch_Activity_Id_t g_watch_list_actId = ACT_ID_MAX; + lv_obj_t * lv_watch_list_create(lv_obj_t * activity_obj) { + if(ACT_ID_MAX == g_watch_list_actId) + { + return NULL; + } + 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_SETTING; + activity_ext.actId = g_watch_list_actId; // ACT_ID_SETTING; activity_ext.create = lv_watch_list_create; activity_ext.prepare_destory = lv_watch_list_prepare_destory; activity_obj = lv_watch_creat_activity_obj(&activity_ext); @@ -107,6 +114,12 @@ lv_obj_t * lv_watch_list_create(lv_obj_t * activity_obj) #ifdef __MMI_ZHSX_SUPPORT__ lv_list_set_scrollbar_mode(list, LV_SCROLLBAR_MODE_OFF); +#ifdef USE_LV_WATCH_UI_240_240_CIRCLE + lv_obj_set_size(list, lv_obj_get_width(content), lv_obj_get_height(content) - lv_obj_get_height(label_cont) - 35); +#else + lv_obj_set_size(list, lv_obj_get_width(content), lv_obj_get_height(content) - lv_obj_get_height(label_cont)); +#endif + #else uint8_t pad_ver = 4; lv_obj_add_style(list, LV_LIST_PART_SCROLLABLE, &lv_watch_style_transp); @@ -114,15 +127,13 @@ lv_obj_t * lv_watch_list_create(lv_obj_t * activity_obj) lv_obj_set_style_local_pad_bottom(list, LV_LIST_PART_SCROLLABLE, LV_STATE_DEFAULT, pad_ver); lv_list_set_scrollbar_mode(list, LV_SCROLLBAR_MODE_ON); -#endif + lv_obj_set_width(list, lv_obj_get_width(content)); lv_coord_t height = lv_obj_get_height(content) - lv_obj_get_height(label_cont) - ; //- pad_ver * 2; -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE - height -= 35; -#endif + - pad_ver * 2; lv_obj_set_height(list, height); +#endif return obj; } @@ -165,6 +176,7 @@ lv_obj_t * lv_watch_list_add(lv_obj_t * obj, const void * img_src, watchLangTxtI lv_obj_set_style_local_pad_left(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15+10); lv_obj_set_style_local_pad_right(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15); lv_obj_set_style_local_pad_inner(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 10); + lv_obj_set_style_local_bg_opa(btn, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_OPA_TRANSP); // press effect #else lv_obj_set_style_local_pad_top(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6); lv_obj_set_style_local_pad_bottom(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6); @@ -209,6 +221,8 @@ static void lv_watch_list_realign(lv_obj_t * obj) static void lv_watch_list_prepare_destory(lv_obj_t * activity_obj) { lv_watch_png_cache_all_free(); + + g_watch_list_actId = ACT_ID_MAX; } #endif /*USE_LV_WATCH_LIST*/ diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c index cfb58aba..4dc086f8 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c +++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c @@ -869,6 +869,11 @@ bool mmi_protocol_fzd_parse_ACTION_BIND(unsigned char * next_buff, unsigned int { mmi_protocol_watch_bind_state_set(true); + // sim unbind check + #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ + mmi_watch_sim_unbind_check(); + #endif + //heartbeat mmi_protocol_watch_heartbeat_action(); @@ -1516,7 +1521,7 @@ bool mmi_protocol_fzd_ACTION_TALK(char * data_buff, int data_buff_len) } memory_size = data_buff_len; - memory_size += FZD_MAX((data_buff_len * ENCRYPT_EXT_COEF/100), FZD_MIN(ENCRYPT_EXT_MIN, data_buff_len)); + memory_size += LV_MATH_MAX((data_buff_len * ENCRYPT_EXT_COEF/100), LV_MATH_MIN(ENCRYPT_EXT_MIN, data_buff_len)); content_buff = (unsigned char *)lv_mem_alloc(memory_size); if(NULL == content_buff) { @@ -1798,6 +1803,7 @@ bool mmi_protocol_fzd_action_send_get_weather(MMI_WATCH_LOCATION_DATA_T * locati //[XX*YYYY*009F*WT,Äê-ÔÂ-ÈÕ,ʱ:·Ö:Ãë,ÌìÆøÃèÊö,ÌìÆø±àºÅ,µ±Ç°Î¶È,×îµÍÎÂ,×î¸ßÎÂ,³ÇÊÐÃû] //ÌìÆøÃèÊöÓà GB2312 ±àÂ룬³ÇÊÐÃûʹÓà Unicode ±àÂë ÌìÆø±àºÅ£º0¡ª¡ªÇç 1¡ª¡ªÒõ 2¡ª¡ªÓê 3¡ª¡ªÑ© //[XX*YYYY*009F*WT,16-09-24,11:00:00,b6e0d4c6,2,-5,-12,22,316df15733] +//[SZKW*860132060004801*0035*WT,23-10-11,16:09:11,b6e0d4c6,1,27,-1,40,6DF157335E02] bool mmi_protocol_fzd_parse_ACTION_GET_WEATHER(unsigned char * next_buff, unsigned int next_buff_len) { bool result = false; @@ -2852,7 +2858,6 @@ bool mmi_protocol_fzd_parse_SERVER_SET_NOT_DISTURB(unsigned char * next_buff, un result = true; mmi_protocol_fzd_send_without_data(action); -#if 0 nv_watch_do_not_disturb_t not_disturb_data = {0}; char * group_str = NULL; char * group_last = NULL; @@ -2906,7 +2911,6 @@ bool mmi_protocol_fzd_parse_SERVER_SET_NOT_DISTURB(unsigned char * next_buff, un //{ // PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: %d,%d\n", __LINE__, server_set_alarm[x].on_off, server_set_alarm[x].repeat_bitmap); //} -#endif return result; } @@ -2947,12 +2951,7 @@ bool mmi_protocol_fzd_parse_SERVER_SET_WHITE_LIST_SWITCH(unsigned char * next_bu mmi_protocol_fzd_send_without_data(action); uint32_t value = atoi(next_buff); - - // - // - //mmi_protocol_watch_location_upload_interval_set(value); - // - // + mmi_white_list_switch_set(value); return result; }