From: CCC <2393524978@qq.com>
Date: Tue, 10 Oct 2023 08:56:59 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=87f5f633051e8de84d59e8e7bd0dd21e293421ba;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 9cb2c8f8..15eb8ac8 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
@@ -77,14 +77,17 @@
 #define MMI_CUSTOMER_STEP_GOAL		(10000)
 
 // dial pad
-#define MMI_CUSTOMER_DIAL_PAD_SWITCH		(1)
+#define MMI_CUSTOMER_DIAL_PAD_SWITCH		(MMI_WATCH_SWITCH_ON)
 
 // white list
-#define MMI_CUSTOMER_WHITE_LIST_SWITCH		(0) // 1-open
+#define MMI_CUSTOMER_WHITE_LIST_SWITCH		(MMI_WATCH_SWITCH_OFF)
 
 //main menu style
 #define MMI_CUSTOMER_MAIN_MENU_STYLE		(MMI_MAIN_MENU_STYLE_LIST)
 
+// sim unbind
+#define MMI_CUSTOMER_SIM_UNBIND_SWITCH		(MMI_WATCH_SWITCH_OFF)
+
 
 
 #endif
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_OFF.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_OFF.png
new file mode 100644
index 00000000..e6a934f0
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_OFF.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png
new file mode 100644
index 00000000..a89c8bf1
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/0.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/0.png
index 107ebb9b..3cff90e6 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/0.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/0.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/1.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/1.png
index d9b24846..07ad0f3e 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/1.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/1.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/2.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/2.png
index 6626142e..9653562c 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/2.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/2.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/3.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/3.png
index a4de1f27..56c02ef5 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/3.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/3.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/4.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/4.png
index c0acb3f0..19dceb72 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/4.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/4.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/5.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/5.png
index 6641b3a0..9b7bd33a 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/5.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/5.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/6.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/6.png
index fe577709..bfe6cec2 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/6.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/6.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/7.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/7.png
index de2ae6d1..9f6acc42 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/7.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/7.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/8.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/8.png
index d5047068..6b2057bd 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/8.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/8.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/9.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/9.png
index f54ed4ea..67ca313e 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/9.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/9.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/colon.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/colon.png
index e6cdfc5a..95a7722e 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/colon.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/colon.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/dial_style4.json b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/dial_style4.json
index c818d44a..16f3da17 100644
--- a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/dial_style4.json
+++ b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/dial_style4.json
@@ -7,7 +7,7 @@
     {
       "element_pos": {
         "x": 0,
-        "y": 30
+        "y": 40
       },
       "element_cnt": 1,
       "act_type": 1,
@@ -21,7 +21,7 @@
             {
               "img_type": 10,
               "img_pos": {
-                "x": 5,
+                "x": 14,
                 "y": 0
               },
               "sub_img_cnt": 10,
@@ -61,7 +61,7 @@
 			      {
               "img_type": 11,
               "img_pos": {
-                "x": 57,
+                "x": 62,
                 "y": 0
               },
               "sub_img_cnt": 10,
@@ -101,7 +101,7 @@
 			      {
               "img_type": 12,
               "img_pos": {
-                "x": 131,
+                "x": 130,
                 "y": 0
               },
               "sub_img_cnt": 10,
@@ -141,7 +141,7 @@
 			      {
               "img_type": 13,
               "img_pos": {
-                "x": 183,
+                "x": 178,
                 "y": 0
               },
               "sub_img_cnt": 10,
@@ -181,7 +181,7 @@
             {
               "img_type": 16,
               "img_pos": {
-                "x": 109,
+                "x": 110,
                 "y": 0
               },
               "sub_img_cnt": 1,
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png
new file mode 100644
index 00000000..2764d8a1
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png
index 2764d8a1..94027a6d 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png
new file mode 100644
index 00000000..5a9ef650
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_TOOLS.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_TOOLS.png
deleted file mode 100644
index df78ee91..00000000
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_TOOLS.png and /dev/null differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png
index 5a9ef650..d62e8b53 100644
Binary files a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_ALARM.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_ALARM.png
new file mode 100644
index 00000000..d3ee74fd
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_ALARM.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_STOPWATCH.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_STOPWATCH.png
new file mode 100644
index 00000000..6c3ad924
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_STOPWATCH.png differ
diff --git a/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_TIMER.png b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_TIMER.png
new file mode 100644
index 00000000..431c4c2e
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_TIMER.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 50317b27..bf62a452 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
@@ -131,7 +131,7 @@
 #endif
 
 #ifdef USE_OEM_ZFB
-#define USE_LV_WATCH_ALIPAY 1
+#define USE_LV_WATCH_ALIPAY 0 // 1
 #else
 #define USE_LV_WATCH_ALIPAY 0
 #endif
@@ -176,10 +176,15 @@
 
 #define __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
 
-//#define __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
+#define __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
 
 #define __MMI_ZHSX_SUPPORT_PHONEBOOK_LIST_STYLE__
 
+#define __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__
+
+#define __MMI_TOOL_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 c621ef89..fea8fcd8 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
@@ -77,14 +77,17 @@
 #define MMI_CUSTOMER_STEP_GOAL		(10000)
 
 // dial pad
-#define MMI_CUSTOMER_DIAL_PAD_SWITCH		(1)
+#define MMI_CUSTOMER_DIAL_PAD_SWITCH		(MMI_WATCH_SWITCH_ON)
 
 // white list
-#define MMI_CUSTOMER_WHITE_LIST_SWITCH		(0) // 1-open
+#define MMI_CUSTOMER_WHITE_LIST_SWITCH		(MMI_WATCH_SWITCH_OFF)
 
 //main menu style
 #define MMI_CUSTOMER_MAIN_MENU_STYLE		(MMI_MAIN_MENU_STYLE_FOUR_GRID)
 
+// sim unbind
+#define MMI_CUSTOMER_SIM_UNBIND_SWITCH		(MMI_WATCH_SWITCH_OFF)
+
 
 
 #endif
diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/alarm/ICON_ALARM_OFF.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/alarm/ICON_ALARM_OFF.png
new file mode 100644
index 00000000..e6a934f0
Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/alarm/ICON_ALARM_OFF.png differ
diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png
new file mode 100644
index 00000000..a89c8bf1
Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.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 a5ee0776..373d207a 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
@@ -174,10 +174,12 @@
 
 #define __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
 
-//#define __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
+#define __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
 
 #define __MMI_ZHSX_SUPPORT_PHONEBOOK_LIST_STYLE__
 
+#define __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__
+
 
 
 #endif
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
new file mode 100644
index 00000000..a5149543
--- /dev/null
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
@@ -0,0 +1,52 @@
+
+
+
+#include "lv_watch.h"
+
+#ifdef __MMI_TOOL_MENU_SUPPORT__
+
+extern lv_watch_Activity_Id_t g_watch_list_actId;
+
+static const mmi_watch_list_item_t s_tool_menu_list[] = 
+{
+	{ ICON_TOOL_ALARM, WATCH_TEXT_ID_ALARM, alarm_create_event_cb },
+	{ ICON_TOOL_STOPWATCH, WATCH_TEXT_ID_STOPWATCH, stopwatch_create_event_cb },
+	{ ICON_TOOL_TIMER, WATCH_TEXT_ID_TIMER, timer_create_event_cb },
+};
+
+lv_obj_t * mmi_tool_menu_create(lv_obj_t * activity_obj)
+{
+	g_watch_list_actId = ACT_ID_TOOL_MENU;
+	lv_obj_t * obj = lv_watch_list_create(activity_obj);
+	LV_ASSERT_MEM(obj);
+	if(obj == NULL)
+		return NULL;
+
+	lv_watch_list_set_name_txt(obj, WATCH_TEXT_ID_TOOL);
+
+	uint8_t i = 0;
+	uint8_t count = sizeof(s_tool_menu_list) / sizeof(s_tool_menu_list[0]);
+	for(i = 0; i < count; i++)
+	{
+		lv_watch_list_add(obj, (void *)s_tool_menu_list[i].img_src, s_tool_menu_list[i].txtId, s_tool_menu_list[i].event_cb);
+	}
+
+	return obj;
+}
+
+void mmi_tool_menu_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_tool_menu_create(NULL);
+        LV_ASSERT_MEM(obj);
+        if(obj == NULL)
+			return;
+    }
+}
+
+#endif
+
+
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.h b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.h
new file mode 100644
index 00000000..86581545
--- /dev/null
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.h
@@ -0,0 +1,34 @@
+
+
+
+#ifndef __TOOL_H__
+#define __TOOL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lvgl.h"
+#include "lv_watch_conf.h"
+#else
+#include "../../../lvgl/lvgl.h"
+#include "../../../lv_watch_conf.h"
+#endif
+#include <stdio.h>
+
+
+#ifdef __MMI_TOOL_MENU_SUPPORT__
+
+void mmi_tool_menu_create_event_cb(lv_obj_t * btn, lv_event_t e);
+
+
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
+