gengxin

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_K12/gui/lv_watch/mmi_default_CUSTOM.h
index ffcad86..d31da71 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/mmi_default_CUSTOM.h
@@ -81,7 +81,7 @@
 
 
 //main menu style
-#define MMI_CUSTOMER_MAIN_MENU_STYLE           (MMI_MAIN_MENU_STYLE_ONE_PAGE)
+#define MMI_CUSTOMER_MAIN_MENU_STYLE           (MMI_MAIN_MENU_STYLE_LIST)
 
 
 

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_bear/bear_watch.json b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_bear/bear_watch.json
index 5a4df6f..3a475e9 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_bear/bear_watch.json
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_bear/bear_watch.json
@@ -7,7 +7,7 @@
     {
       "element_pos": {
         "x": 120,
-        "y": 20
+        "y": 0
       },
       "element_cnt": 1,
       "act_type": 2,

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_bear/icon_bear.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_bear/icon_bear.png
index 30ddb96..ca6c914 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_bear/icon_bear.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_bear/icon_bear.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
index b5b175e..be32d5e 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
@@ -7,7 +7,7 @@
     {
       "element_pos": {
         "x": 0,
-        "y": 85
+        "y": 75
       },
       "element_cnt": 1,
       "act_type": 1,

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg.png
index 9bba95c..3329c79 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
index 8def041..a4db457 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
@@ -215,8 +215,8 @@
     },
     {
       "element_pos": {
-        "x": 25,
-        "y": 210
+        "x": 45,
+        "y": 190
       },
       "element_cnt": 1,
       "act_type": 5,
@@ -293,7 +293,7 @@
        {
       "element_pos": {
         "x": 110,
-        "y": 210
+        "y": 190
       },
       "element_cnt": 1,
       "act_type": 4,

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png
index c51755b..e04e5e9 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png
index 59a7371..1edc0bc 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
index 7b6549f..c369558 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
@@ -7,7 +7,7 @@
     {
       "element_pos": {
         "x": 120,
-        "y": 60
+        "y": 40
       },
       "element_cnt": 1,
       "act_type": 1,
@@ -215,8 +215,8 @@
     },
     {
       "element_pos": {
-        "x": 100,
-        "y": 225
+        "x": 50,
+        "y": 188
       },
       "element_cnt": 1,
       "act_type": 5,
@@ -306,8 +306,8 @@
     },
        {
       "element_pos": {
-        "x": 190,
-        "y": 225
+        "x": 145,
+        "y": 188
       },
       "element_cnt": 1,
       "act_type": 4,

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/bg.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/bg.png
index e0998e6..8f2d6ba 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/bg.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/bg.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/dial_style1.json b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/dial_style1.json
index 53e39a8..15d1f2e 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/dial_style1.json
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/dial_style1.json
@@ -24,7 +24,7 @@
               "img_type": 10,
               "img_pos": {
                 "x": 40,
-                "y": 50
+                "y": 40
               },
               "sub_img_cnt": 10,
               "sub_img_ll": [
@@ -64,7 +64,7 @@
               "img_type": 11,
               "img_pos": {
                 "x": 76,
-                "y": 50
+                "y": 40
               },
               "sub_img_cnt": 10,
               "sub_img_ll": [
@@ -104,7 +104,7 @@
               "img_type": 16,
               "img_pos": {
                 "x": 116,
-                "y": 58
+                "y": 48
               },
               "sub_img_cnt": 1,
               "sub_img_ll": [
@@ -117,7 +117,7 @@
               "img_type": 12,
               "img_pos": {
                 "x": 128,
-                "y": 50
+                "y": 40
               },
               "sub_img_cnt": 10,
               "sub_img_ll": [
@@ -157,7 +157,7 @@
               "img_type": 13,
               "img_pos": {
                 "x": 164,
-                "y": 50
+                "y": 40
               },
               "sub_img_cnt": 10,
               "sub_img_ll": [
@@ -232,7 +232,7 @@
       "element_pos": 
       {
         "x": 24,
-        "y": 111
+        "y": 95
       },
       "element_cnt": 1,
       "act_type": 5,
@@ -325,7 +325,7 @@
          {
       "element_pos": {
         "x": 47,
-        "y": 143
+        "y": 125
       },
       "element_cnt": 1,
       "act_type": 4,
@@ -374,7 +374,7 @@
     {
       "element_pos": {
         "x": 130,
-        "y": 125
+        "y": 110
       },
       "element_cnt": 1,
       "act_type": 8,
@@ -436,7 +436,7 @@
     {
       "element_pos": {
         "x": 53,
-        "y": 182
+        "y": 160
       },
       "element_cnt": 1,
       "act_type": 13,
@@ -473,7 +473,7 @@
               },
               "text_pos": {
                 "x": -7,
-                "y": 37
+                "y": 31
               },
               "font_size": 25
             }
@@ -498,7 +498,7 @@
     {
       "element_pos": {
         "x": 161,
-        "y": 182
+        "y": 156
       },
       "element_cnt": 1,
       "act_type": 14,
@@ -518,7 +518,7 @@
               "sub_img_cnt": 1,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_style1/blood.png"
+                  "sub_img": "R:/png/dial_style1/spo2.png"
                 }
               ]
             } 
@@ -535,7 +535,7 @@
               },
               "text_pos": {
                 "x": -10,
-                "y": 37
+                "y": 35
               },
               "font_size": 25
             }

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/blood.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/spo2.png
similarity index 100%
rename from 2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/blood.png
rename to 2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style1/spo2.png

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style2/bg.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style2/bg.png
index 9bba95c..3329c79 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style2/bg.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style2/bg.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style3/bg.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style3/bg.png
index 9bba95c..3329c79 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style3/bg.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style3/bg.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style3/dial_style3.json b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style3/dial_style3.json
index 27018e6..958bc9d 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style3/dial_style3.json
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style3/dial_style3.json
@@ -6,8 +6,8 @@
   "element_ll": [
     {
       "element_pos": {
-        "x": 32,
-        "y": 105
+        "x": 30,
+        "y": 94
       },
       "element_cnt": 1,
       "act_type": 1,
@@ -229,7 +229,7 @@
     {
       "element_pos": {
         "x": 40,
-        "y": 20
+        "y": 34
       },
       "element_cnt": 1,
       "act_type": 5,
@@ -306,7 +306,7 @@
          {
       "element_pos": {
         "x": 40,
-        "y": 45
+        "y": 59
       },
       "element_cnt": 1,
       "act_type": 4,
@@ -355,7 +355,7 @@
     {
       "element_pos": {
         "x": 120,
-        "y": 5
+        "y": 0
       },
       "element_cnt": 1,
       "act_type": 7,
@@ -474,7 +474,7 @@
     {
       "element_pos": {
         "x": 20,
-        "y": 187
+        "y": 161
       },
       "element_cnt": 1,
       "act_type": 13,
@@ -563,8 +563,8 @@
     },
     {
       "element_pos": {
-        "x": 150,
-        "y": 207
+        "x": 142,
+        "y": 173
       },
       "element_cnt": 1,
       "act_type": 8,
@@ -601,7 +601,7 @@
               },
               "text_pos": {
                 "x": 0,
-                "y": 30
+                "y": 26
               },
               "font_size": 20
             }

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style4/bg.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style4/bg.png
index 9bba95c..3329c79 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style4/bg.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style4/bg.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style4/dial_style4.json b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style4/dial_style4.json
index 0a62aab..c818d44 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style4/dial_style4.json
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/dial_style4/dial_style4.json
@@ -228,8 +228,8 @@
     },
     {
       "element_pos": {
-        "x": 40,
-        "y": 232
+        "x": 52,
+        "y": 200
       },
       "element_cnt": 1,
       "act_type": 5,
@@ -255,7 +255,7 @@
                 "x": 0,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
             },
             {
               "label_type": 10,
@@ -266,10 +266,10 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 65,
+                "x": 56,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
             },
             {
               "label_type": 8,
@@ -280,10 +280,10 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 80,
+                "x": 65,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
             },
             {
               "label_type": 10,
@@ -294,10 +294,10 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 115,
+                "x": 90,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
             },
             {
               "label_type": 9,
@@ -308,10 +308,10 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 130,
+                "x": 105,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
             }
           ],
           "bar": {
@@ -334,7 +334,7 @@
          {
       "element_pos": {
         "x": 50,
-        "y": 197
+        "y": 172
       },
       "element_cnt": 1,
       "act_type": 4,
@@ -360,7 +360,7 @@
                 "x": 0,
                 "y": 0
               },
-              "font_size": 24
+              "font_size": 20
             }
           ],
           "bar": {
@@ -383,7 +383,7 @@
     {
       "element_pos": {
         "x": 50,
-        "y": 132
+        "y": 117
       },
       "element_cnt": 1,
       "act_type": 8,
@@ -420,7 +420,7 @@
               },
               "text_pos": {
                 "x": -5,
-                "y": 30
+                "y": 26
               },
               "font_size": 20
             }
@@ -445,7 +445,7 @@
     {
       "element_pos": {
         "x": 120,
-        "y": 130
+        "y": 112
       },
       "element_cnt": 1,
       "act_type": 15,

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png
index 546c32b..4c94fc8 100644 (file)
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png differ

diff --git a/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index a14dab7..50317b2 100644 (file)
--- a/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -162,7 +162,9 @@
 
 #define __MMI_WECHAT_SUPPORT__
 
-#define __MMI_ZHSX_SUPPORT_MAIN_MENU_ONE_PAGE__
+#define __MMI_MAIN_MENU_SWITCH_MENU__
+#define __MMI_MAIN_MENU_ONE_PAGE_STYLE__
+#define __MMI_MAIN_MENU_LIST_STYLE__
 
 #define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/dial_style1.json b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/dial_style1.json
index 53e39a8..5ea86ef 100644 (file)
--- a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/dial_style1.json
+++ b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/dial_style1.json
@@ -518,7 +518,7 @@
               "sub_img_cnt": 1,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_style1/blood.png"
+                  "sub_img": "R:/png/dial_style1/spo2.png"
                 }
               ]
             } 

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/blood.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/spo2.png
similarity index 100%
rename from 2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/blood.png
rename to 2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/spo2.png