gengxin

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_am_list_360.db b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_am_list_360.db
deleted file mode 100644 (file)
index 46226b1..0000000
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_am_list_360.db
+++ /dev/null
@@ -1,4 +0,0 @@
-无
-R:/png/dial_default_ambient/am_none_360.json
-数字时钟
-R:/png/dial_default_ambient/am_digit_360.json

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_list.db
index da02856..b0a4462 100644 (file)
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_list.db
+++ b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_list.db
@@ -7,7 +7,7 @@ R:/png/dial_dolphin/dolphin_watch.json
 bear
 R:/png/dial_bear/bear_watch.json
 style1
-R:/png/dial_style1/style1_watch.json
+R:/png/dial_style1/dial_style1.json
 dial_style3
 R:/png/dial_style3/dial_style3.json
 dial_style4

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_list_360.db b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_list_360.db
deleted file mode 100644 (file)
index be5e3be..0000000
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/buildin_dial_list_360.db
+++ /dev/null
@@ -1,4 +0,0 @@
-dolphoin
-R:/png/dial_dolphin/dolphin_watch_360.json
-rokcket
-R:/png/dial_rocket/rocket_watch_360.json

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

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/icon_none_360.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/icon_none_360.png
deleted file mode 100644 (file)
index 34e9897..0000000
Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial/icon_none_360.png and /dev/null differ

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_360.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_360.json
deleted file mode 100644 (file)
index 5ffc8a7..0000000
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_360.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-  "name": "数字时钟",
-  "preview_img": "R:/png/dial_default_ambient/am_digit_pre_360.png",
-  "bg_img": "R:/png/dial_default_ambient/am_digit_bg_360.png", 
-  "configurable": 2,
-  "element_ll": [
-    {
-      "element_pos": {
-        "x": 66,
-        "y": 136
-      },
-      "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_rocket/icon_rocket_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png"
-                }
-              ]
-            },
-                       {
-              "img_type": 11,
-              "img_pos": {
-                "x": 49,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png"
-                }
-              ]
-            },
-                       {
-              "img_type": 16,
-              "img_pos": {
-                "x": 98,
-                "y": 30
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_default_ambient/am_digit_con_colon.png"
-                }
-              ]
-            },
-                       {
-              "img_type": 12,
-              "img_pos": {
-                "x": 129,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png"
-                }
-              ]
-            },
-                       {
-              "img_type": 13,
-              "img_pos": {
-                "x": 178,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png"
-                }
-              ]
-            }
-          ],
-          "label_cnt": 0,
-          "label_ll": [
-            {
-              "label_type": 0,
-              "text": "",
-              "text_color": {
-                "r": 0,
-                "g": 0,
-                "b": 0
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "font_size": 0
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 0,
-              "y": 0
-            },
-            "bar_color": {
-              "r": 0,
-              "g": 0,
-              "b": 0
-            },
-            "bar_w": 0,
-            "bar_h": 0
-          }
-        }
-      ]
-    }
-  ]
-}

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_none_360.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_none_360.json
deleted file mode 100644 (file)
index 28a0939..0000000
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_none_360.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "无",
-  "preview_img": "R:/png/dial/icon_none_360.png",
-  "configurable": 2,
-  "element_ll": [
-    {
-      "element_pos": {
-        "x": 0,
-        "y": 0
-      },
-      "element_cnt": 0,
-      "act_type": 1,
-      "layer": 0,
-      "element_dsc_ll": [
-     ]
-   }
-  ]
-}

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
index 489b37f..89bb67e 100644 (file)
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
+++ b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
@@ -1,5 +1,5 @@
 {
-  "name": "dolphin",
+  "name": "海豚世界",
   "preview_img": "R:/png/dial_dolphin/icon_dial_dolphin.png",
   "bg_img": "R:/png/dial_dolphin/icon_dolphin.png",
   "configurable": 0,

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
index f534e2d..42a3188 100644 (file)
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
+++ b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
@@ -1,5 +1,5 @@
 {
-  "name": "rocket",
+  "name": "太空翱翔",
   "preview_img": "R:/png/dial_rocket/icon_dial_rocket.png",
   "bg_img": "R:/png/dial_rocket/icon_rocket.png",
   "configurable": 0,

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/rocket_watch_360.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/rocket_watch_360.json
deleted file mode 100644 (file)
index 3e7455a..0000000
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/rocket_watch_360.json
+++ /dev/null
@@ -1,357 +0,0 @@
-{
-  "name": "rocket",
-  "preview_img": "R:/png/dial_rocket/icon_dial_rocket_360.png",
-  "bg_img": "R:/png/dial_rocket/icon_rocket_360.png",
-  "configurable": 0,
-  "element_ll": [
-    {
-      "element_pos": {
-        "x": 210,
-        "y": 60
-      },
-      "element_cnt": 1,
-      "act_type": 1,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 1,
-          "element_name": "数字时钟",
-          "img_cnt": 4,
-          "img_ll": [
-            {
-              "img_type": 10,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png"
-                }
-              ]
-            },
-                       {
-              "img_type": 11,
-              "img_pos": {
-                "x": 50,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png"
-                }
-              ]
-            },
-                       {
-              "img_type": 12,
-              "img_pos": {
-                "x": 44,
-                "y": 95
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_9.png"
-                }
-              ]
-            }, 
-                       {
-              "img_type": 13,
-              "img_pos": {
-                "x": 72,
-                "y": 95
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_9.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": 180,
-        "y": 210
-      },
-      "element_cnt": 1,
-      "act_type": 5,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 5,
-          "element_name": "日期",
-          "img_cnt": 0,
-          "img_ll": [
-          ],
-          "label_cnt": 4,
-          "label_ll": [
-            {
-              "label_type": 8,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "font_size": 30
-            },
-                       {
-              "label_type": 10,
-              "text": "月",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 35,
-                "y": 0
-              },
-              "font_size": 30
-            },
-                       {
-              "label_type": 9,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 65,
-                "y": 0
-              },
-              "font_size": 30
-            },
-                       {
-              "label_type": 10,
-              "text": "日",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 100,
-                "y": 0
-              },
-              "font_size": 30
-            }
-          ],
-          "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": 250,
-        "y": 250
-      },
-      "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": 30
-            }
-          ],
-          "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/Z5_K6/gui/lv_watch/resource/png/dial_style1/style1_watch.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style1/dial_style1.json
similarity index 99%
rename from 2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style1/style1_watch.json
rename to 2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style1/dial_style1.json
index 93baf9d..f211feb 100644 (file)
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style1/style1_watch.json
+++ b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style1/dial_style1.json
@@ -1,5 +1,5 @@
 {
-  "name": "style1",
+  "name": "那时花开",
   "preview_img": "R:/png/dial_style1/view.png",
   "bg_img": "R:/png/dial_style1/bg.png",
   "configurable": 0,

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style3/dial_style3.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style3/dial_style3.json
index 3151757..4546600 100644 (file)
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style3/dial_style3.json
+++ b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style3/dial_style3.json
@@ -1,5 +1,5 @@
 {
-  "name": "dial_style3",
+  "name": "火力全开",
   "preview_img": "R:/png/dial_style3/pre.png",
   "bg_img": "R:/png/dial_style3/bg.png",
   "configurable": 0,

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style4/dial_style4.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style4/dial_style4.json
index f26327b..0492848 100644 (file)
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style4/dial_style4.json
+++ b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_style4/dial_style4.json
@@ -1,5 +1,5 @@
 {
-  "name": "dial_style4",
+  "name": "太空人",
   "preview_img": "R:/png/dial_style4/pre.png",
   "bg_img": "R:/png/dial_style4/bg.png",
   "configurable": 0,

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png
new file mode 100644 (file)
index 0000000..546c32b
Binary files /dev/null and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png differ

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/setting/icon_seting_app_qrcode.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/setting/icon_seting_app_qrcode.png
new file mode 100644 (file)
index 0000000..f56af01
Binary files /dev/null and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/setting/icon_seting_app_qrcode.png differ