gengxin

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h
index eef70bf..96dd38f 100644 (file)
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h
@@ -99,11 +99,11 @@
 #define MMI_CUSTOMER_LOW_BATTERY_SWITCH                (MMI_WATCH_SWITCH_ON)
 
 // schedule power on/off
-#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH          (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH          (MMI_WATCH_SWITCH_OFF)
 #define MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR            (6) // 0-23
 #define MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE          (0) // 0-59
 
-#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH         (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH         (MMI_WATCH_SWITCH_OFF)
 #define MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR           (23) // 0-23
 #define MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE         (59) // 0-59
 

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/ext/png/poweron/img_poweron_logo.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/ext/png/poweron/img_poweron_logo.png
index e5a6cc3..a890e36 100644 (file)
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/ext/png/poweron/img_poweron_logo.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/ext/png/poweron/img_poweron_logo.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db
index b04df37..b812689 100644 (file)
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db
+++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db
@@ -1,4 +1,2 @@
-dial_style3
-R:/png/dial_style3/dial_style3.json
-dial_style4
-R:/png/dial_style4/dial_style4.json
+dial_style0
+R:/png/dial_style0/dial_style0.json

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/0.png
new file mode 100644 (file)
index 0000000..4901e47
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/0.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/1.png
new file mode 100644 (file)
index 0000000..a20d1f8
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/1.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/2.png
new file mode 100644 (file)
index 0000000..44b8184
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/2.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/3.png
new file mode 100644 (file)
index 0000000..d370040
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/3.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/4.png
new file mode 100644 (file)
index 0000000..3790aae
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/4.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/5.png
new file mode 100644 (file)
index 0000000..b0a9323
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/5.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/6.png
new file mode 100644 (file)
index 0000000..ab54ef5
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/6.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/7.png
new file mode 100644 (file)
index 0000000..e610f31
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/7.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/8.png
new file mode 100644 (file)
index 0000000..7a61041
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/8.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/9.png
new file mode 100644 (file)
index 0000000..d4a4ae1
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/9.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/bg.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/bg.png
new file mode 100644 (file)
index 0000000..04fe902
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/bg.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/colon.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/colon.png
new file mode 100644 (file)
index 0000000..52d9f1b
Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/colon.png differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/dial_style4.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/dial_style0.json
similarity index 63%
rename from 2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/dial_style4.json
rename to 2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/dial_style0.json
index 25d0b17..2e3f8db 100644 (file)
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/dial_style4.json
+++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/dial_style0.json
@@ -1,13 +1,13 @@
 {
-  "name": "太空人",
-  "preview_img": "R:/png/dial_style4/pre.png",
-  "bg_img": "R:/png/dial_style4/bg.png",
+  "name": "HZCH",
+  "preview_img": "R:/png/dial_style0/pre.png",
+  "bg_img": "R:/png/dial_style0/bg.png",
   "configurable": 0,
   "element_ll": [
     {
       "element_pos": {
-        "x": 0,
-        "y": 30
+        "x": 43,
+        "y": 25
       },
       "element_cnt": 1,
       "act_type": 1,
@@ -16,178 +16,178 @@
         {
           "element_type": 1,
           "element_name": "数字时钟",
-          "img_cnt": 4,
+          "img_cnt": 5,
           "img_ll": [
             {
               "img_type": 10,
               "img_pos": {
-                "x": 5,
+                "x": 0,
                 "y": 0
               },
               "sub_img_cnt": 10,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_style4/0.png"
+                  "sub_img": "R:/png/dial_style0/0.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/1.png"
+                  "sub_img": "R:/png/dial_style0/1.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/2.png"
+                  "sub_img": "R:/png/dial_style0/2.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/3.png"
+                  "sub_img": "R:/png/dial_style0/3.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/4.png"
+                  "sub_img": "R:/png/dial_style0/4.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/5.png"
+                  "sub_img": "R:/png/dial_style0/5.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/6.png"
+                  "sub_img": "R:/png/dial_style0/6.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/7.png"
+                  "sub_img": "R:/png/dial_style0/7.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/8.png"
+                  "sub_img": "R:/png/dial_style0/8.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/9.png"
+                  "sub_img": "R:/png/dial_style0/9.png"
                 }
               ]
             },
                              {
               "img_type": 11,
               "img_pos": {
-                "x": 57,
+                "x": 31,
                 "y": 0
               },
               "sub_img_cnt": 10,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_style4/0.png"
+                  "sub_img": "R:/png/dial_style0/0.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/1.png"
+                  "sub_img": "R:/png/dial_style0/1.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/2.png"
+                  "sub_img": "R:/png/dial_style0/2.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/3.png"
+                  "sub_img": "R:/png/dial_style0/3.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/4.png"
+                  "sub_img": "R:/png/dial_style0/4.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/5.png"
+                  "sub_img": "R:/png/dial_style0/5.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/6.png"
+                  "sub_img": "R:/png/dial_style0/6.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/7.png"
+                  "sub_img": "R:/png/dial_style0/7.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/8.png"
+                  "sub_img": "R:/png/dial_style0/8.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/9.png"
+                  "sub_img": "R:/png/dial_style0/9.png"
                 }
               ]
             },
                              {
               "img_type": 12,
               "img_pos": {
-                "x": 131,
+                "x": 93,
                 "y": 0
               },
               "sub_img_cnt": 10,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_style4/0.png"
+                  "sub_img": "R:/png/dial_style0/0.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/1.png"
+                  "sub_img": "R:/png/dial_style0/1.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/2.png"
+                  "sub_img": "R:/png/dial_style0/2.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/3.png"
+                  "sub_img": "R:/png/dial_style0/3.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/4.png"
+                  "sub_img": "R:/png/dial_style0/4.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/5.png"
+                  "sub_img": "R:/png/dial_style0/5.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/6.png"
+                  "sub_img": "R:/png/dial_style0/6.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/7.png"
+                  "sub_img": "R:/png/dial_style0/7.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/8.png"
+                  "sub_img": "R:/png/dial_style0/8.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/9.png"
+                  "sub_img": "R:/png/dial_style0/9.png"
                 }
               ]
             }, 
                              {
               "img_type": 13,
               "img_pos": {
-                "x": 183,
+                "x": 124,
                 "y": 0
               },
               "sub_img_cnt": 10,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_style4/0.png"
+                  "sub_img": "R:/png/dial_style0/0.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/1.png"
+                  "sub_img": "R:/png/dial_style0/1.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/2.png"
+                  "sub_img": "R:/png/dial_style0/2.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/3.png"
+                  "sub_img": "R:/png/dial_style0/3.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/4.png"
+                  "sub_img": "R:/png/dial_style0/4.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/5.png"
+                  "sub_img": "R:/png/dial_style0/5.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/6.png"
+                  "sub_img": "R:/png/dial_style0/6.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/7.png"
+                  "sub_img": "R:/png/dial_style0/7.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/8.png"
+                  "sub_img": "R:/png/dial_style0/8.png"
                 },
                                        {
-                  "sub_img": "R:/png/dial_style4/9.png"
+                  "sub_img": "R:/png/dial_style0/9.png"
                 }
               ]
             },
             {
               "img_type": 16,
               "img_pos": {
-                "x": 109,
+                "x": 62,
                 "y": 0
               },
               "sub_img_cnt": 1,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_style4/colon.png"
+                  "sub_img": "R:/png/dial_style0/colon.png"
                 }
               ]
             }
@@ -229,7 +229,7 @@
     {
       "element_pos": {
         "x": 40,
-        "y": 232
+        "y": 80
       },
       "element_cnt": 1,
       "act_type": 5,
@@ -241,10 +241,10 @@
           "img_cnt": 0,
           "img_ll": [
           ],
-          "label_cnt": 5,
+          "label_cnt": 3,
           "label_ll": [
             {
-              "label_type": 7,
+              "label_type": 9,
               "text": "",
               "text_color": {
                 "r": 255,
@@ -255,21 +255,21 @@
                 "x": 0,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
             },
             {
               "label_type": 10,
-              "text": "-",
+              "text": "/",
               "text_color": {
                 "r": 255,
                 "g": 255,
                 "b": 255
               },
               "text_pos": {
-                "x": 65,
+                "x": 25,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
             },
             {
               "label_type": 8,
@@ -280,27 +280,48 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 80,
+                "x": 35,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
+            }
+          ],
+          "bar": {
+            "bar_type": 0,
+            "bar_pos": {
+              "x": 8,
+              "y": 9
             },
-            {
-              "label_type": 10,
-              "text": "-",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 115,
-                "y": 0
-              },
-              "font_size": 28
+            "bar_color": {
+              "r": 77,
+              "g": 88,
+              "b": 99
             },
+            "bar_w": 11,
+            "bar_h": 12
+          }
+        }
+      ]
+    },
+         {
+      "element_pos": {
+        "x": 150,
+        "y": 80
+      },
+      "element_cnt": 1,
+      "act_type": 4,
+      "layer": 0,
+      "element_dsc_ll": [
+        {
+          "element_type": 4,
+          "element_name": "星期",
+          "img_cnt": 0,
+          "img_ll": [
+          ],
+          "label_cnt": 1,
+          "label_ll": [
             {
-              "label_type": 9,
+              "label_type": 5,
               "text": "",
               "text_color": {
                 "r": 255,
@@ -308,10 +329,10 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 130,
+                "x": 0,
                 "y": 0
               },
-              "font_size": 28
+              "font_size": 20
             }
           ],
           "bar": {
@@ -331,25 +352,25 @@
         }
       ]
     },
-         {
+    {
       "element_pos": {
-        "x": 35,
-        "y": 154
+        "x": 40,
+        "y": 240
       },
       "element_cnt": 1,
-      "act_type": 4,
+      "act_type": 7,
       "layer": 0,
       "element_dsc_ll": [
         {
-          "element_type": 4,
-          "element_name": "星期",
+          "element_type": 7,
+          "element_name": "卡路里",
           "img_cnt": 0,
           "img_ll": [
           ],
-          "label_cnt": 2,
+          "label_cnt": 1,
           "label_ll": [
             {
-              "label_type": 5,
+              "label_type": 15,
               "text": "",
               "text_color": {
                 "r": 255,
@@ -360,10 +381,45 @@
                 "x": 0,
                 "y": 0
               },
-              "font_size": 22
+              "font_size": 20
+            }
+          ],
+          "bar": {
+            "bar_type": 0,
+            "bar_pos": {
+              "x": 8,
+              "y": 9
+            },
+            "bar_color": {
+              "r": 77,
+              "g": 88,
+              "b": 99
             },
+            "bar_w": 11,
+            "bar_h": 12
+          }
+        }
+      ]
+    },
+    {
+      "element_pos": {
+        "x": 175,
+        "y": 240
+      },
+      "element_cnt": 1,
+      "act_type": 10,
+      "layer": 0,
+      "element_dsc_ll": [
+        {
+          "element_type": 10,
+          "element_name": "电量值",
+          "img_cnt": 0,
+          "img_ll": [
+          ],
+          "label_cnt": 1,
+          "label_ll": [
             {
-              "label_type": 27,
+              "label_type": 29,
               "text": "",
               "text_color": {
                 "r": 255,
@@ -372,9 +428,9 @@
               },
               "text_pos": {
                 "x": 0,
-                "y": -30
+                "y": 0
               },
-              "font_size": 22
+              "font_size": 20
             }
           ],
           "bar": {
@@ -396,36 +452,23 @@
     },
     {
       "element_pos": {
-        "x": 35,
-        "y": 190
+        "x": 101,
+        "y": 240
       },
       "element_cnt": 1,
-      "act_type": 8,
+      "act_type": 16,
       "layer": 0,
       "element_dsc_ll": [
         {
-          "element_type": 8,
-          "element_name": "计步",
-          "img_cnt": 1,
+          "element_type": 16,
+          "element_name": "信号值",
+          "img_cnt": 0,
           "img_ll": [
-            {
-              "img_type": 80,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style4/step.png"
-                }
-              ]
-            }
           ],
           "label_cnt": 1,
           "label_ll": [
             {
-              "label_type": 17,
+              "label_type": 28,
               "text": "",
               "text_color": {
                 "r": 255,
@@ -433,7 +476,7 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 33,
+                "x": 0,
                 "y": 0
               },
               "font_size": 20
@@ -458,36 +501,23 @@
     },
     {
       "element_pos": {
-        "x": 125,
-        "y": 130
+        "x": 35,
+        "y": 125
       },
       "element_cnt": 1,
-      "act_type": 15,
+      "act_type": 8,
       "layer": 0,
       "element_dsc_ll": [
         {
-          "element_type": 15,
-          "element_name": "è\87ªå®\9aä¹\89",
+          "element_type": 8,
+          "element_name": "计步",
           "img_cnt": 1,
           "img_ll": [
-            {
-              "img_type": 150,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style4/icon.png"
-                }
-              ]
-            }
           ],
-          "label_cnt": 0,
+          "label_cnt": 2,
           "label_ll": [
             {
-              "label_type": 5,
+              "label_type": 17,
               "text": "",
               "text_color": {
                 "r": 255,
@@ -495,8 +525,22 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 30,
-                "y": 220
+                "x": 0,
+                "y": 30
+              },
+              "font_size": 20
+            },
+            {
+              "label_type": 18,
+              "text": "步数",
+              "text_color": {
+                "r": 255,
+                "g": 255,
+                "b": 255
+              },
+              "text_pos": {
+                "x": 0,
+                "y": 0
               },
               "font_size": 20
             }
@@ -517,6 +561,6 @@
           }
         }
       ]
-    }            
+    }            
   ]
 }

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/pre.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/pre.png
similarity index 100%
rename from 2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/pre.png
rename to 2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/pre.png

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/表盘.jpg b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/表盘.jpg
new file mode 100644 (file)
index 0000000..d5644db
Binary files /dev/null and "b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style0/\350\241\250\347\233\230.jpg" differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/0.png
deleted file mode 100644 (file)
index 71fcf0c..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/0.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/1.png
deleted file mode 100644 (file)
index 2cf6911..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/1.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/2.png
deleted file mode 100644 (file)
index 6fe6967..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/2.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/3.png
deleted file mode 100644 (file)
index e51f343..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/3.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/4.png
deleted file mode 100644 (file)
index cd611e9..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/4.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/5.png
deleted file mode 100644 (file)
index d159298..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/5.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/6.png
deleted file mode 100644 (file)
index dd2e3d3..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/6.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/7.png
deleted file mode 100644 (file)
index 3051da3..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/7.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/8.png
deleted file mode 100644 (file)
index 5424cf2..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/8.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/9.png
deleted file mode 100644 (file)
index 3745f21..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/9.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/bg.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/bg.png
deleted file mode 100644 (file)
index 9bba95c..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/bg.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie.png
deleted file mode 100644 (file)
index 3a27a61..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/0.png
deleted file mode 100644 (file)
index dc17281..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/0.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/1.png
deleted file mode 100644 (file)
index 6e27478..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/1.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/10.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/10.png
deleted file mode 100644 (file)
index 9b6213d..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/10.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/2.png
deleted file mode 100644 (file)
index cad2804..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/2.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/3.png
deleted file mode 100644 (file)
index c61eb6d..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/3.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/4.png
deleted file mode 100644 (file)
index b96cf76..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/4.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/5.png
deleted file mode 100644 (file)
index eb1032e..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/5.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/6.png
deleted file mode 100644 (file)
index 5a86190..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/6.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/7.png
deleted file mode 100644 (file)
index 42e75f5..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/7.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/8.png
deleted file mode 100644 (file)
index 64ae9f3..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/8.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/9.png
deleted file mode 100644 (file)
index 7623c9c..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/calorie/9.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/colon.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/colon.png
deleted file mode 100644 (file)
index 3d1ca9c..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/colon.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/dial_style3.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/dial_style3.json
deleted file mode 100644 (file)
index 27018e6..0000000
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/dial_style3.json
+++ /dev/null
@@ -1,627 +0,0 @@
-{
-  "name": "火力全开",
-  "preview_img": "R:/png/dial_style3/pre.png",
-  "bg_img": "R:/png/dial_style3/bg.png",
-  "configurable": 0,
-  "element_ll": [
-    {
-      "element_pos": {
-        "x": 32,
-        "y": 105
-      },
-      "element_cnt": 1,
-      "act_type": 1,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 1,
-          "element_name": "数字时钟",
-          "img_cnt": 5,
-          "img_ll": [
-            {
-              "img_type": 10,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/0.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/1.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/2.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/3.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/4.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/5.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/6.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/7.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/8.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/9.png"
-                }
-              ]
-            },
-                             {
-              "img_type": 11,
-              "img_pos": {
-                "x": 40,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/0.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/1.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/2.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/3.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/4.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/5.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/6.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/7.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/8.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/9.png"
-                }
-              ]
-            },
-                             {
-              "img_type": 12,
-              "img_pos": {
-                "x": 94,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/0.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/1.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/2.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/3.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/4.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/5.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/6.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/7.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/8.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/9.png"
-                }
-              ]
-            }, 
-                             {
-              "img_type": 13,
-              "img_pos": {
-                "x": 134,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/0.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/1.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/2.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/3.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/4.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/5.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/6.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/7.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/8.png"
-                },
-                                       {
-                  "sub_img": "R:/png/dial_style3/9.png"
-                }
-              ]
-            },
-            {
-              "img_type": 16,
-              "img_pos": {
-                "x": 80,
-                "y": 0
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/colon.png"
-                }
-              ]
-            }
-          ],
-          "label_cnt": 0,
-                     "label_ll": [
-                             {
-              "label_type": 5,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 25,
-                "y": 190
-              },
-              "font_size": 20
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    },
-    {
-      "element_pos": {
-        "x": 40,
-        "y": 20
-      },
-      "element_cnt": 1,
-      "act_type": 5,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 5,
-          "element_name": "日期",
-          "img_cnt": 0,
-          "img_ll": [
-          ],
-          "label_cnt": 3,
-          "label_ll": [
-            {
-              "label_type": 9,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "font_size": 20
-            },
-            {
-              "label_type": 10,
-              "text": "/",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 25,
-                "y": 0
-              },
-              "font_size": 20
-            },
-            {
-              "label_type": 8,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 35,
-                "y": 0
-              },
-              "font_size": 20
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    },
-         {
-      "element_pos": {
-        "x": 40,
-        "y": 45
-      },
-      "element_cnt": 1,
-      "act_type": 4,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 4,
-          "element_name": "星期",
-          "img_cnt": 0,
-          "img_ll": [
-          ],
-          "label_cnt": 1,
-          "label_ll": [
-            {
-              "label_type": 5,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "font_size": 20
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    },
-    {
-      "element_pos": {
-        "x": 120,
-        "y": 5
-      },
-      "element_cnt": 1,
-      "act_type": 7,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 7,
-          "element_name": "卡路里",
-          "img_cnt": 2,
-          "img_ll": [
-            {
-              "img_type": 70,
-              "img_pos": {
-                "x": 30,
-                "y": 30
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/calorie.png"
-                }
-              ]
-            },
-            {
-              "img_type": 75,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 11,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/0.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/1.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/2.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/3.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/4.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/5.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/6.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/7.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/8.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/9.png"
-                },
-                {
-                  "sub_img": "R:/png/dial_style3/calorie/10.png"
-                }
-              ]
-            }
-          ],
-          "label_cnt": 2,
-          "label_ll": [
-            {
-              "label_type": 15,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 50
-              },
-              "font_size": 20
-            },
-            {
-              "label_type": 16,
-              "text": "KCAL",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 70
-              },
-              "font_size": 12
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    },
-    {
-      "element_pos": {
-        "x": 20,
-        "y": 187
-      },
-      "element_cnt": 1,
-      "act_type": 13,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 13,
-          "element_name": "心率",
-          "img_cnt": 2,
-          "img_ll": [
-            {
-              "img_type": 130,
-              "img_pos": {
-                "x": 30,
-                "y": 30
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/heart.png"
-                }
-              ]
-            },
-            {
-              "img_type": 135,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                
-                {
-                  "sub_img": "R:/png/dial_style3/heart_image.png"
-                }
-              ]
-            }
-          ],
-          "label_cnt": 2,
-          "label_ll": [
-            {
-              "label_type": 24,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 55,
-                "y": 0
-              },
-              "font_size": 20
-            },
-            {
-              "label_type": 25,
-              "text": "BPM",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 60,
-                "y": 25
-              },
-              "font_size": 12
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    },
-    {
-      "element_pos": {
-        "x": 150,
-        "y": 207
-      },
-      "element_cnt": 1,
-      "act_type": 8,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 8,
-          "element_name": "计步",
-          "img_cnt": 1,
-          "img_ll": [
-            {
-              "img_type": 80,
-              "img_pos": {
-                "x": 10,
-                "y": 0
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style3/step.png"
-                }
-              ]
-            }
-          ],
-          "label_cnt": 1,
-          "label_ll": [
-            {
-              "label_type": 17,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 30
-              },
-              "font_size": 20
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    }            
-  ]
-}

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/heart.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/heart.png
deleted file mode 100644 (file)
index fd43add..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/heart.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/heart_image.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/heart_image.png
deleted file mode 100644 (file)
index 651f1c9..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/heart_image.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/step.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/step.png
deleted file mode 100644 (file)
index acbeba2..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style3/step.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/0.png
deleted file mode 100644 (file)
index 107ebb9..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/0.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/1.png
deleted file mode 100644 (file)
index d9b2484..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/1.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/2.png
deleted file mode 100644 (file)
index 6626142..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/2.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/3.png
deleted file mode 100644 (file)
index a4de1f2..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/3.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/4.png
deleted file mode 100644 (file)
index c0acb3f..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/4.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/5.png
deleted file mode 100644 (file)
index 6641b3a..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/5.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/6.png
deleted file mode 100644 (file)
index fe57770..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/6.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/7.png
deleted file mode 100644 (file)
index de2ae6d..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/7.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/8.png
deleted file mode 100644 (file)
index d504706..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/8.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/9.png
deleted file mode 100644 (file)
index f54ed4e..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/9.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/bg.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/bg.png
deleted file mode 100644 (file)
index 9bba95c..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/bg.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/colon.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/colon.png
deleted file mode 100644 (file)
index e6cdfc5..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/colon.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/icon.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/icon.png
deleted file mode 100644 (file)
index d394ae6..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/icon.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/pre.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/pre.png
deleted file mode 100644 (file)
index 50e4b13..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/pre.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/step.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/step.png
deleted file mode 100644 (file)
index 385213b..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/step.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_ant_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_ant_small.png
deleted file mode 100644 (file)
index 34ccbb4..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_ant_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_boy_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_boy_small.png
deleted file mode 100644 (file)
index 5d3e116..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_boy_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_family_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_family_small.png
deleted file mode 100644 (file)
index 92afaca..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_family_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_father_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_father_small.png
deleted file mode 100644 (file)
index a6cd5de..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_father_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_girl_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_girl_small.png
deleted file mode 100644 (file)
index 0b00b9a..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_girl_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_maternal_gradfather_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_maternal_gradfather_small.png
deleted file mode 100644 (file)
index 8818b0e..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_maternal_gradfather_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_maternal_gradmother_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_maternal_gradmother_small.png
deleted file mode 100644 (file)
index ba968a6..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_maternal_gradmother_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_mother_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_mother_small.png
deleted file mode 100644 (file)
index d5251c8..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_mother_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_paternal_gradfather_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_paternal_gradfather_small.png
deleted file mode 100644 (file)
index 21c2f63..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_paternal_gradfather_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_paternal_gradmother_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_paternal_gradmother_small.png
deleted file mode 100644 (file)
index a7ba60c..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_paternal_gradmother_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_uncle_small.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_uncle_small.png
deleted file mode 100644 (file)
index 0ea21a7..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/phone_portrait/icon_uncle_small.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_all_people.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_all_people.png
deleted file mode 100644 (file)
index 37ca5be..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_all_people.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_aunt.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_aunt.png
deleted file mode 100644 (file)
index 24fdf0d..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_aunt.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_boy.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_boy.png
deleted file mode 100644 (file)
index 27b0c89..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_boy.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_family.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_family.png
deleted file mode 100644 (file)
index db220dc..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_family.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_father.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_father.png
deleted file mode 100644 (file)
index 68b1ca5..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_father.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_friends.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_friends.png
deleted file mode 100644 (file)
index a2859da..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_friends.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_girl.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_girl.png
deleted file mode 100644 (file)
index bccd8ee..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_girl.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_maternal_gradfather.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_maternal_gradfather.png
deleted file mode 100644 (file)
index fa35fa7..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_maternal_gradfather.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_maternal_gradmother.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_maternal_gradmother.png
deleted file mode 100644 (file)
index 861ea71..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_maternal_gradmother.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_mother.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_mother.png
deleted file mode 100644 (file)
index 3ff6b85..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_mother.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_paternal_gradfather.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_paternal_gradfather.png
deleted file mode 100644 (file)
index 81a18d7..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_paternal_gradfather.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_paternal_gradmother.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_paternal_gradmother.png
deleted file mode 100644 (file)
index d1ddaba..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_paternal_gradmother.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_relative.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_relative.png
deleted file mode 100644 (file)
index d1e3fe9..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_relative.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_uncle.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_uncle.png
deleted file mode 100644 (file)
index ac8fb82..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/portrait/icon_uncle.png and /dev/null differ

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 6622ba4..2ef2893 100644 (file)
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -26,7 +26,7 @@
 #define USE_LV_WATCH_SETTING_ABOUT 1
 #define USE_LV_WATCH_SHUTDOWN 1
 #define USE_LV_WATCH_LANGUAGE 1
-#define USE_LV_WATCH_DIAL_SWITCH 1
+#define USE_LV_WATCH_DIAL_SWITCH 0 // 1
 //#define USE_LV_WATCH_DIAL_DEFAULT_CLOCK 1
 //#define USE_LV_WATCH_DIAL_DOLPHIN 1
 //#define USE_LV_WATCH_DIAL_ROCKET 1
@@ -168,7 +168,7 @@
 //#define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__
 
 #define __MMI_MAIN_MENU_ONE_PAGE_STYLE__
-//#define __MMI_MAIN_MENU_FOUR_GRID_STYLE__
+#define __MMI_PAGE_MAIN_MENU_NO_TEXT__
 
 #define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__