gengxin
authorCCC <2393524978@qq.com>
Sat, 14 Oct 2023 06:20:35 +0000 (14:20 +0800)
committerCCC <2393524978@qq.com>
Sat, 14 Oct 2023 06:20:35 +0000 (14:20 +0800)
42 files changed:
2.sdk/project/Z5_D12/gui/lv_watch/mmi_default_CUSTOM.h
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_back.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_back_blue.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_check.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_del_all_bg.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_del_preview_bg.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_delete_blue.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_delete_gray.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_more_setting.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_no_photo.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_select.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_selected.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_share.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/imgviewer/icon_tabview_bg.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_WEATHER.png [new file with mode: 0644]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_barcode.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_fail.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_bind_timeout.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_1.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_2.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_menu_3.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/upay/upay_qrcode.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png [new file with mode: 0644]
2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_back.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_back_blue.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_check.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_del_all_bg.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_del_preview_bg.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_delete_blue.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_delete_gray.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_more_setting.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_no_photo.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_select.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_selected.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_share.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/imgviewer/icon_tabview_bg.png [deleted file]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/primary_function/icon_weather.png [new file with mode: 0644]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png [new file with mode: 0644]
2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h

index 15eb8ac..a60e0da 100644 (file)
@@ -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 (file)
index 30c179e..0000000
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 (file)
index ce4fbe9..0000000
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 (file)
index f11f35d..0000000
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 (file)
index 6dc8f8e..0000000
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 (file)
index c427b4d..0000000
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 (file)
index 7879f2a..0000000
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 (file)
index 31ddaea..0000000
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 (file)
index fcbdbd9..0000000
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 (file)
index 04ac413..0000000
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 (file)
index 8c120a9..0000000
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 (file)
index 06bb6e3..0000000
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 (file)
index 2c9cb66..0000000
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 (file)
index e08ea2e..0000000
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 (file)
index 0000000..e3f8b7b
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_WEATHER.png differ
index b394dd7..fed867e 100644 (file)
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
index 589bc9b..2e9a9be 100644 (file)
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
index c227531..6842baa 100644 (file)
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
index d9629ec..ccc7996 100644 (file)
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
index 40c7eee..0c72b81 100644 (file)
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
index 97c3908..fa5e68a 100644 (file)
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
index c02a35f..621320e 100644 (file)
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
index ddf9a9e..99df857 100644 (file)
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 (file)
index 0000000..a029d9c
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png differ
index b62cd5c..b8c3b28 100644 (file)
@@ -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
 
 #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
 
 #define __MMI_ZHSX_SUPPORT_SMS__
 
-#if 1 == USE_LV_WATCH_ALIPAY
+#if 0 != USE_LV_WATCH_ALIPAY
 #define __MMI_ZHSX_SUPPORT_ALIPAY__
 #endif
 
 
 #define __MMI_TOOL_MENU_SUPPORT__
 
+#if 0 != USE_LV_WATCH_WEATHER
+#define __MMI_WEATHER_MENU_SUPPORT__
+#endif
 
 
 
index fea8fcd..677577f 100644 (file)
@@ -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 (file)
index 30c179e..0000000
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 (file)
index ce4fbe9..0000000
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 (file)
index f11f35d..0000000
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 (file)
index 6dc8f8e..0000000
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 (file)
index c427b4d..0000000
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 (file)
index 7879f2a..0000000
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 (file)
index 31ddaea..0000000
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 (file)
index fcbdbd9..0000000
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 (file)
index 04ac413..0000000
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 (file)
index 8c120a9..0000000
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 (file)
index 06bb6e3..0000000
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 (file)
index 2c9cb66..0000000
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 (file)
index e08ea2e..0000000
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 (file)
index 0000000..67be8cc
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 (file)
index 0000000..a029d9c
Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png differ
index 759646f..c387705 100644 (file)
@@ -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
 
 #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
 
 #define __MMI_ZHSX_SUPPORT_SMS__
 
-#if 1 == USE_LV_WATCH_ALIPAY
+#if 0 != USE_LV_WATCH_ALIPAY
 #define __MMI_ZHSX_SUPPORT_ALIPAY__
 #endif
 
 
 #define __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__
 
+#if 0 != USE_LV_WATCH_WEATHER
+#define __MMI_WEATHER_MENU_SUPPORT__
+#endif
+
 
 
 #endif