From: CCC <2393524978@qq.com> Date: Sat, 14 Oct 2023 06:20:35 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/script.js?a=commitdiff_plain;h=92e61847a1b9d20c918e722be937f6f99b9f0a1a;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_D12/gui/lv_watch/mmi_default_CUSTOM.h index 15eb8ac8..a60e0dae 100644 --- a/2.sdk/project/Z5_D12/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/Z5_D12/gui/lv_watch/mmi_default_CUSTOM.h @@ -86,7 +86,7 @@ #define MMI_CUSTOMER_MAIN_MENU_STYLE (MMI_MAIN_MENU_STYLE_LIST) // sim unbind -#define MMI_CUSTOMER_SIM_UNBIND_SWITCH (MMI_WATCH_SWITCH_OFF) +#define MMI_CUSTOMER_SIM_UNBIND_SWITCH (MMI_WATCH_SWITCH_ON) diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_back.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_back.png deleted file mode 100644 index 30c179e5..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_back.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_back_blue.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_back_blue.png deleted file mode 100644 index ce4fbe9a..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_back_blue.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_check.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_check.png deleted file mode 100644 index f11f35dd..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_check.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_del_all_bg.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_del_all_bg.png deleted file mode 100644 index 6dc8f8e5..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_del_all_bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_del_preview_bg.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_del_preview_bg.png deleted file mode 100644 index c427b4d7..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_del_preview_bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_delete_blue.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_delete_blue.png deleted file mode 100644 index 7879f2a5..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_delete_blue.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_delete_gray.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_delete_gray.png deleted file mode 100644 index 31ddaea1..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_delete_gray.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_more_setting.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_more_setting.png deleted file mode 100644 index fcbdbd90..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_more_setting.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_no_photo.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_no_photo.png deleted file mode 100644 index 04ac4139..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_no_photo.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_select.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_select.png deleted file mode 100644 index 8c120a90..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_select.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_selected.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_selected.png deleted file mode 100644 index 06bb6e3e..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_selected.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_share.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_share.png deleted file mode 100644 index 2c9cb666..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_share.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_tabview_bg.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_tabview_bg.png deleted file mode 100644 index e08ea2ed..00000000 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_tabview_bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_WEATHER.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_WEATHER.png new file mode 100644 index 00000000..e3f8b7b7 Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_WEATHER.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_barcode.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_barcode.png index b394dd78..fed867e4 100644 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_barcode.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_barcode.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_fail.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_fail.png index 589bc9b6..2e9a9be7 100644 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_fail.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_fail.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_timeout.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_timeout.png index c227531a..6842baa0 100644 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_timeout.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_timeout.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png index d9629ec2..ccc7996d 100644 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_1.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_1.png index 40c7eeed..0c72b815 100644 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_1.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_1.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_2.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_2.png index 97c39080..fa5e68ab 100644 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_2.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_2.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_3.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_3.png index c02a35f7..621320eb 100644 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_3.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_3.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_qrcode.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_qrcode.png index ddf9a9e2..99df857c 100644 Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_qrcode.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_qrcode.png differ diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png new file mode 100644 index 00000000..a029d9cf Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png differ diff --git a/2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index b62cd5c2..b8c3b285 100644 --- a/2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -57,7 +57,7 @@ #define USE_LV_WATCH_VIDEOCALL 0 // 1 #define USE_LV_WATCH_CALENDAR 1 #define USE_LV_WATCH_AUDIO_PLAYER 0 // 1 -#define USE_LV_WATCH_IMGVIEWER 1 +#define USE_LV_WATCH_IMGVIEWER 0 // 1 #define USE_LV_WATCH_DUAL_SIM 0 #define USE_LV_WATCH_DIAL_AMBIENT 0 #define USE_LV_WATCH_HEART_RATE 0 // 1 @@ -117,7 +117,7 @@ #define USE_LV_WATCH_CALL_LOG 1 -#define USE_LV_WATCH_MESSAGE 1 +#define USE_LV_WATCH_MESSAGE 0 // 1 //simware add start #if USE_GPS @@ -153,7 +153,7 @@ #define __MMI_ZHSX_SUPPORT_SMS__ -#if 1 == USE_LV_WATCH_ALIPAY +#if 0 != USE_LV_WATCH_ALIPAY #define __MMI_ZHSX_SUPPORT_ALIPAY__ #endif @@ -186,6 +186,9 @@ #define __MMI_TOOL_MENU_SUPPORT__ +#if 0 != USE_LV_WATCH_WEATHER +#define __MMI_WEATHER_MENU_SUPPORT__ +#endif diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h index fea8fcd8..677577fa 100644 --- a/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h @@ -86,7 +86,7 @@ #define MMI_CUSTOMER_MAIN_MENU_STYLE (MMI_MAIN_MENU_STYLE_FOUR_GRID) // sim unbind -#define MMI_CUSTOMER_SIM_UNBIND_SWITCH (MMI_WATCH_SWITCH_OFF) +#define MMI_CUSTOMER_SIM_UNBIND_SWITCH (MMI_WATCH_SWITCH_ON) diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_back.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_back.png deleted file mode 100644 index 30c179e5..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_back.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_back_blue.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_back_blue.png deleted file mode 100644 index ce4fbe9a..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_back_blue.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_check.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_check.png deleted file mode 100644 index f11f35dd..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_check.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_del_all_bg.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_del_all_bg.png deleted file mode 100644 index 6dc8f8e5..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_del_all_bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_del_preview_bg.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_del_preview_bg.png deleted file mode 100644 index c427b4d7..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_del_preview_bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_delete_blue.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_delete_blue.png deleted file mode 100644 index 7879f2a5..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_delete_blue.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_delete_gray.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_delete_gray.png deleted file mode 100644 index 31ddaea1..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_delete_gray.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_more_setting.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_more_setting.png deleted file mode 100644 index fcbdbd90..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_more_setting.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_no_photo.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_no_photo.png deleted file mode 100644 index 04ac4139..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_no_photo.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_select.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_select.png deleted file mode 100644 index 8c120a90..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_select.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_selected.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_selected.png deleted file mode 100644 index 06bb6e3e..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_selected.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_share.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_share.png deleted file mode 100644 index 2c9cb666..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_share.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_tabview_bg.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_tabview_bg.png deleted file mode 100644 index e08ea2ed..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_tabview_bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/primary_function/icon_weather.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/primary_function/icon_weather.png new file mode 100644 index 00000000..67be8ccf Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/primary_function/icon_weather.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png new file mode 100644 index 00000000..a029d9cf Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png differ diff --git a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 759646fb..c3877053 100644 --- a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -57,7 +57,7 @@ #define USE_LV_WATCH_VIDEOCALL 0 // 1 #define USE_LV_WATCH_CALENDAR 1 #define USE_LV_WATCH_AUDIO_PLAYER 0 // 1 -#define USE_LV_WATCH_IMGVIEWER 1 +#define USE_LV_WATCH_IMGVIEWER 0 // 1 #define USE_LV_WATCH_DUAL_SIM 0 #define USE_LV_WATCH_DIAL_AMBIENT 0 #define USE_LV_WATCH_HEART_RATE 0 // 1 @@ -117,7 +117,7 @@ #define USE_LV_WATCH_CALL_LOG 1 -#define USE_LV_WATCH_MESSAGE 1 +#define USE_LV_WATCH_MESSAGE 0 // 1 //simware add start #if USE_GPS @@ -153,7 +153,7 @@ #define __MMI_ZHSX_SUPPORT_SMS__ -#if 1 == USE_LV_WATCH_ALIPAY +#if 0 != USE_LV_WATCH_ALIPAY #define __MMI_ZHSX_SUPPORT_ALIPAY__ #endif @@ -182,6 +182,10 @@ #define __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ +#if 0 != USE_LV_WATCH_WEATHER +#define __MMI_WEATHER_MENU_SUPPORT__ +#endif + #endif