From: CCC <2393524978@qq.com> Date: Tue, 21 Nov 2023 09:01:19 +0000 (+0800) Subject: i7 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=35762fcf963b9f9c667e334e90bd4dd3b5732ba7;p=mirrors%2FASR3603_Z5.git i7 --- diff --git a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VIDEO_BTN.png b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VIDEO_BTN.png index c4a7fd0b..989b9dc6 100644 Binary files a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VIDEO_BTN.png and b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VIDEO_BTN.png differ diff --git a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOICE_BTN.png b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOICE_BTN.png index 9bf1af89..4888bc69 100644 Binary files a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOICE_BTN.png and b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOICE_BTN.png differ diff --git a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png index a286fbf0..2458276d 100644 Binary files a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png and b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png differ diff --git a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png index d575753c..2217967c 100644 Binary files a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png and b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png differ diff --git a/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index ff56e212..41b37cdf 100644 --- a/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -186,6 +186,7 @@ #if 0 != USE_LV_WATCH_WEATHER #define __MMI_WEATHER_MENU_SUPPORT__ +#define __MMI_WEATHER_MENU_NOT_DISPLAY_TEMPERATURE_RANGE__ #endif diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c index 4f5f6567..817f06a0 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c @@ -882,6 +882,9 @@ const void * lang_text_ch[] = { "该起床了", // WATCH_TEXT_ID_WAKE_UP_PROMPT, "上传照片？", // WATCH_TEXT_ID_UPLOAD_PHOTO_Q, "发送", // WATCH_TEXT_ID_COMMON_SEND, + "发送中", // WATCH_TEXT_ID_COMMON_SENDING, + "发送成功", // WATCH_TEXT_ID_COMMON_SEND_SUCCESS, + "发送失败", // WATCH_TEXT_ID_COMMON_SEND_FAILED, "重拍", // WATCH_TEXT_ID_RECAPTURE, "AI语音", // WATCH_TEXT_ID_AI_TALK, "请按住说话", // WATCH_TEXT_ID_PRESS_TO_TALK, diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c index 66e693cb..dad5b606 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c @@ -152,7 +152,7 @@ const void * lang_text_en[] = { "Km", /*sos.c*/ - "No Contacts", + "No contacts", /*lowbattery.c*/ "Dailing,please wait", @@ -253,7 +253,7 @@ const void * lang_text_en[] = { "LCD test", /*factory_mode_reset.c*/ - "Make sure to reset all settings and clean user data?", + "Confirm to reset all settings & clean user data?", "Restoring factory settings", /*factory_mode_hwtest.c*/ @@ -840,17 +840,17 @@ const void * lang_text_en[] = { "Measuring", "Measure done", "Measure fail", - "Not wearing correctly", + "Not wear", "Please keep wearing", "Body temperature", "Wrist temperature", "SPO2", "Temperature", "C", // WATCH_TEXT_ID_TEMPERATURE_UNIT ℃ - "App is looking for this device\ntap the screen to turn off the reminder", // WATCH_TEXT_ID_SERVER_SEARCH_PROMPT + "Device being searched\nClick screen to stop", // WATCH_TEXT_ID_SERVER_SEARCH_PROMPT "Device qrcode", // WATCH_TEXT_ID_DEVICE_QRCODE "APP qrcode", // WATCH_TEXT_ID_APP_QRCODE, - "Scan qrcode to download APP", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT + "Scan qrcode to download", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT "No number", // WATCH_TEXT_ID_NO_NUM "Scan with mobile Alipay", // WATCH_TEXT_ID_ZFB_BIND_PROMPT, "Cashier scans to complete payment", // WATCH_TEXT_ID_ZFB_PAY_PROMPT, @@ -883,6 +883,9 @@ const void * lang_text_en[] = { "time to wake up", // WATCH_TEXT_ID_WAKE_UP_PROMPT, "Upload photo?", // WATCH_TEXT_ID_UPLOAD_PHOTO_Q, "Send", // WATCH_TEXT_ID_COMMON_SEND, + "Sending", // WATCH_TEXT_ID_COMMON_SENDING, + "Send success", // WATCH_TEXT_ID_COMMON_SEND_SUCCESS, + "Send failed", // WATCH_TEXT_ID_COMMON_SEND_FAILED, "Re-capture", // WATCH_TEXT_ID_RECAPTURE, "AI talk", // WATCH_TEXT_ID_AI_TALK, "Press to talk", // WATCH_TEXT_ID_PRESS_TO_TALK, diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h index 53062848..6acf6a03 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -251,7 +251,7 @@ enum WATCH_TEXT_ID_LCDTEST, /* "LCD测试" "LCD Test" */ /*factory_mode_reset.c*/ - WATCH_TEXT_ID_FACTORY_RESET_Q, /* "确定重置设备并清除全部用户数据" "Make sure to reset all settings and clean user data?"*/ + WATCH_TEXT_ID_FACTORY_RESET_Q, /* "确定重置设备并清除全部用户数据" "Confirm to reset all settings & clean user data?"*/ WATCH_TEXT_ID_FACTORY_RESETING, /* "正在恢复出厂设置" "Restoring factory settings"*/ /*factory_mode_hwtest.c*/ @@ -846,17 +846,17 @@ enum WATCH_TEXT_ID_MEASURING, /*"正在测量" "Measuring"*/ WATCH_TEXT_ID_MEASURE_DONE, /*"测量完成" "Measure done"*/ WATCH_TEXT_ID_MEASURE_FAIL, /*"测量失败" "Measure fail"*/ - WATCH_TEXT_ID_NOT_WEAR, /*"未正确佩戴" "Not wearing correctly"*/ + WATCH_TEXT_ID_NOT_WEAR, /*"未正确佩戴" "Not wear"*/ WATCH_TEXT_ID_KEEP_WEAR, /*"请保持佩戴" "Please keep wearing"*/ WATCH_TEXT_ID_CURRENT_BODY_TEMPERATURE, // 当前体温 WATCH_TEXT_ID_CURRENT_WRIST_TEMPERATURE, // 当前腕温 WATCH_TEXT_ID_SPO2, /* "血氧" "SPO2" */ WATCH_TEXT_ID_TEMPERATURE, /* "体温" "Temperature" */ WATCH_TEXT_ID_TEMPERATURE_UNIT, /* "℃" "℃" */ - WATCH_TEXT_ID_SERVER_SEARCH_PROMPT, /* "App正在寻找此设备，点击屏幕关闭提醒" "App is looking for this device, tap the screen to turn off the reminder" */ + WATCH_TEXT_ID_SERVER_SEARCH_PROMPT, /* "App正在寻找此设备\n点击屏幕关闭提醒" "Device being searched\nClick screen to stop" */ WATCH_TEXT_ID_DEVICE_QRCODE, /* "设备二维码" "Device qrcode" */ WATCH_TEXT_ID_APP_QRCODE, /* "APP二维码" "APP qrcode" */ - WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT, /* "手机扫码下载APP" "Scan qrcode to download APP" */ + WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT, /* "手机扫码下载APP" "Scan qrcode to download" */ WATCH_TEXT_ID_NO_NUM, /* "未设置号码" "No number" */ WATCH_TEXT_ID_ZFB_BIND_PROMPT, /* "手机支付宝扫一扫" "Scan with mobile Alipay" */ WATCH_TEXT_ID_ZFB_PAY_PROMPT, /* "收银员扫一扫完成付款" "Cashier scans to complete payment" */ @@ -889,6 +889,9 @@ enum WATCH_TEXT_ID_WAKE_UP_PROMPT, /* "该起床了" "time to wake up" */ WATCH_TEXT_ID_UPLOAD_PHOTO_Q, /* "上传照片？" "Upload photo?" */ WATCH_TEXT_ID_COMMON_SEND, /* "发送" "Send" */ + WATCH_TEXT_ID_COMMON_SENDING, /* "发送中" "Sending" */ + WATCH_TEXT_ID_COMMON_SEND_SUCCESS, /* "发送成功" "Send success" */ + WATCH_TEXT_ID_COMMON_SEND_FAILED, /* "发送失败" "Send failed" */ WATCH_TEXT_ID_RECAPTURE, /* "重拍" "Re-capture" */ WATCH_TEXT_ID_AI_TALK, /* "AI语音" "AI talk" */ WATCH_TEXT_ID_PRESS_TO_TALK, /* "请按住说话" "Press to talk" */ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c index df2064e6..c894ac35 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c @@ -71,21 +71,32 @@ lv_obj_t * factorymode_reset_create(lv_obj_t * activity_obj) lv_label_set_long_mode(label_tip, LV_LABEL_LONG_BREAK); //lv_obj_set_width(label_tip, LV_HOR_RES * 3 / 4); //lv_obj_align(label_tip, label, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); - lv_obj_set_width(label_tip, LV_HOR_RES * 2 / 3); + if(LANG_EN == lv_lang_act()) + lv_obj_set_width(label_tip, LV_HOR_RES - 40); + else + lv_obj_set_width(label_tip, LV_HOR_RES * 2 / 3); lv_obj_align(label_tip, obj, LV_ALIGN_IN_TOP_MID, 0, 50); lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font26); lv_obj_t * 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, factoryreset_yes_btn_event_cb); lv_watch_obj_add_element(btn_yes); lv_obj_t * 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, factoryreset_no_btn_event_cb); lv_watch_obj_add_element(btn_no); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c index 064a28ef..43996b1f 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c @@ -111,7 +111,7 @@ static void health_heart_rate_measure_cycle_timeout(void * para) uint16_t value = 0; mmi_health_measure_heart_data_ui_get(&value); - if(value) + if(MMI_HEART_RATE_VALUE_MIN <= value) // (value) { sprintf(ext->heart_rate, "%d bpm", value); } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h index 103d19f5..5ab71482 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h @@ -31,6 +31,8 @@ extern "C" { #define MMI_HEALTH_MEASURE_CYCLE_DURATION (1 * 1000) // ms +#define MMI_HEART_RATE_VALUE_MIN (45) + typedef enum { diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c index d924e5ad..85cb6b3b 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.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, -40); + } 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, -40); + 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/mmi_wechat/wechat.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h index 0c5fed9e..6696fc08 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 @@ -54,6 +54,8 @@ typedef struct { lv_watch_obj_ext_t old_ext; lv_anim_t sending_anim; + lv_obj_t * sending_img; + lv_obj_t * sending_label; TIMER_ID sending_timer_id, result_timer_id; bool send_result; } lv_wechat_msg_sending_ext_t; 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 77d5f2a2..277351ad 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 @@ -50,6 +50,103 @@ static lv_obj_t * weather_content_no_info_create(lv_obj_t * par) return(content); } +#ifdef __MMI_WEATHER_MENU_NOT_DISPLAY_TEMPERATURE_RANGE__ +static lv_obj_t * weather_content_info_create(lv_obj_t * par, app_adaptor_weather_t * weather) +{ + //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 * content = lv_cont_create(par, NULL); + //lv_cont_set_fit2(content, LV_FIT_NONE, LV_FIT_TIGHT); + //lv_obj_set_width(content, lv_obj_get_width(par)); + lv_obj_set_size(content, LV_HOR_RES, LV_VER_RES); + lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_style_transp_fit); + lv_obj_set_click(content, false); + + lv_obj_t * img = lv_img_create(content, NULL); + + 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_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 0); + + lv_obj_t * label_describe = lv_label_create(content, NULL); + lv_obj_add_style(label_describe, LV_LABEL_PART_MAIN, &lv_watch_font26_yellow); + + char label_str[32] = ""; + char * uincode_str = "2103"; // \u2103 + char utf8_str[8] = {0}; + uint8_t output_len = 0; + + mmi_unicode_hex_str_to_utf8_str(uincode_str, strlen(uincode_str), utf8_str, &output_len); + sprintf(label_str, "%s %d %s", + lang_get_text_by_id(s_weather_list[i].txtId), + weather->current_temperature, + utf8_str); // lang_get_text_by_id(WATCH_TEXT_ID_TEMPERATURE_UNIT)); // temp_unit); + lv_label_set_text(label_describe, label_str); + lv_obj_set_click(label_describe, false); + lv_obj_align(label_describe, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 5); + + lv_obj_t * label_city = lv_label_create(content, NULL); + lv_obj_add_style(label_city, LV_LABEL_PART_MAIN, &lv_watch_font26); + lv_label_set_text(label_city, weather->city); + lv_label_set_long_mode(label_city, LV_LABEL_LONG_SROLL_CIRC); + lv_obj_set_click(label_city, false); + lv_obj_align(label_city, label_describe, LV_ALIGN_OUT_BOTTOM_MID, 0, 25); + + return(content); +} + +void weather_update(lv_obj_t * cont) +{ + app_adaptor_weather_t weather_info = {0}; + + app_adaptor_get_weather_req(&weather_info); + + lv_watch_png_cache_all_free(); + + lv_weather_ext_t * weather_ext = (lv_weather_ext_t *)lv_obj_get_ext_attr(cont); + if(weather_ext->content1 != NULL) { + lv_obj_del(weather_ext->content1); + weather_ext->content1 = NULL; + } + + if(weather_ext->content2 != NULL) { + lv_obj_del(weather_ext->content2); + weather_ext->content2 = NULL; + } + + if(weather_ext->content3 != NULL) { + lv_obj_del(weather_ext->content3); + weather_ext->content3 = NULL; + } + + printf("[@CHENG_DEBUG][%s][%d]: %s\n", __FUNCTION__, __LINE__, weather_info.city); + + if(0 == strlen(weather_info.city)) + { + weather_ext->content1 = weather_content_no_info_create(cont); + lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 20); + } + else + { + weather_ext->content1 = weather_content_info_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, 5); + #else + lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 30); + #endif + } +} +#else static lv_obj_t * weather_image_content_create(lv_obj_t * par, app_adaptor_weather_t * weather) { lv_obj_t * content = lv_watch_cont_create(par, LV_LAYOUT_COLUMN_MID, &lv_style_transp_fit, lv_obj_get_width(par)); @@ -187,6 +284,7 @@ void weather_update(lv_obj_t * cont) #endif } } +#endif lv_obj_t * weather_create(lv_obj_t * tileview, uint16_t id) { diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_sms.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_sms.c index 7909aa07..d1e6e4ec 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_sms.c +++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_sms.c @@ -18,7 +18,7 @@ static MMI_PROTOCOL_SMS_PARSE_STRUCT s_sms_parse_info[] = {"SETREBOOT", 9, mmi_protocol_sms_parse_set_reboot}, {"GETIMEI", 7, mmi_protocol_sms_parse_get_imei}, {"UNBIND", 6, mmi_protocol_sms_parse_unbind}, - {"SETAPN:", 7, mmi_protocol_sms_parse_set_apn}, + /* Function not verified */ {"SETAPN:", 7, mmi_protocol_sms_parse_set_apn}, /* Function not verified */ /*******add before this line*******/