gengxin
authorCCC <2393524978@qq.com>
Tue, 10 Oct 2023 08:56:59 +0000 (16:56 +0800)
committerCCC <2393524978@qq.com>
Tue, 10 Oct 2023 08:56:59 +0000 (16:56 +0800)
30 files changed:
2.sdk/project/Z5_D12/gui/lv_watch/mmi_default_CUSTOM.h
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_OFF.png [new file with mode: 0644]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png [new file with mode: 0644]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/0.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/1.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/2.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/3.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/4.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/5.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/6.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/7.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/8.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/9.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/colon.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/dial_style4/dial_style4.json
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png [new file with mode: 0644]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png [new file with mode: 0644]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_TOOLS.png [deleted file]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_ALARM.png [new file with mode: 0644]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_STOPWATCH.png [new file with mode: 0644]
2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_TIMER.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/alarm/ICON_ALARM_OFF.png [new file with mode: 0644]
2.sdk/project/Z5_K7/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png [new file with mode: 0644]
2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c [new file with mode: 0644]
2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.h [new file with mode: 0644]

index 9cb2c8f..15eb8ac 100644 (file)
 #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 (file)
index 0000000..e6a934f
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 (file)
index 0000000..a89c8bf
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png differ
index 107ebb9..3cff90e 100644 (file)
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
index d9b2484..07ad0f3 100644 (file)
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
index 6626142..9653562 100644 (file)
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
index a4de1f2..56c02ef 100644 (file)
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
index c0acb3f..19dceb7 100644 (file)
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
index 6641b3a..9b7bd33 100644 (file)
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
index fe57770..bfe6cec 100644 (file)
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
index de2ae6d..9f6acc4 100644 (file)
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
index d504706..6b2057b 100644 (file)
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
index f54ed4e..67ca313 100644 (file)
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
index e6cdfc5..95a7722 100644 (file)
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
index c818d44..16f3da1 100644 (file)
@@ -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,
                              {
               "img_type": 12,
               "img_pos": {
-                "x": 131,
+                "x": 130,
                 "y": 0
               },
               "sub_img_cnt": 10,
                              {
               "img_type": 13,
               "img_pos": {
-                "x": 183,
+                "x": 178,
                 "y": 0
               },
               "sub_img_cnt": 10,
             {
               "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 (file)
index 0000000..2764d8a
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png differ
index 2764d8a..94027a6 100644 (file)
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 (file)
index 0000000..5a9ef65
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 (file)
index df78ee9..0000000
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
index 5a9ef65..d62e8b5 100644 (file)
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 (file)
index 0000000..d3ee74f
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 (file)
index 0000000..6c3ad92
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 (file)
index 0000000..431c4c2
Binary files /dev/null and b/2.sdk/project/Z5_D12/gui/lv_watch/resource/png/tool/ICON_TOOL_TIMER.png differ
index 50317b2..bf62a45 100644 (file)
 #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
 
 #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
index c621ef8..fea8fcd 100644 (file)
 #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 (file)
index 0000000..e6a934f
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 (file)
index 0000000..a89c8bf
Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/alarm/ICON_ALARM_ON.png differ
index a5ee077..373d207 100644 (file)
 
 #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 (file)
index 0000000..a514954
--- /dev/null
@@ -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 (file)
index 0000000..8658154
--- /dev/null
@@ -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
+