Z5_HA_K18

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial/buildin_dial_list.db
index e71b569..fe6e826 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial/buildin_dial_list.db
+++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial/buildin_dial_list.db
@@ -1,9 +1,9 @@
 default_digit
 R:/png/dial_digital/dial_digital.json
 rokcket
-R:/png/dial_rocket/rocket_watch.json
+R:/png/dial_style4/dial_style4.json
 dolphin
-R:/png/dial_dolphin/dolphin_watch.json
+R:/png/dial_style5/dial_style5.json
 style1
 R:/png/dial_style1/dial_style1.json
 dial_style3

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png
deleted file mode 100644 (file)
index 579d82e..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png and /dev/null differ

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png
deleted file mode 100644 (file)
index 6426da8..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png and /dev/null differ

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

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

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

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

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png
deleted file mode 100644 (file)
index 0a0cc5f..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png
deleted file mode 100644 (file)
index 4015b5e..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png and /dev/null differ

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png
deleted file mode 100644 (file)
index 67fd017..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png and /dev/null differ

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png
deleted file mode 100644 (file)
index 2891ab3..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png and /dev/null differ

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

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

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png
deleted file mode 100644 (file)
index 0079ff7..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png and /dev/null differ

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

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png
deleted file mode 100644 (file)
index 81bb754..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
deleted file mode 100644 (file)
index edf5082..0000000
--- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
+++ /dev/null
@@ -1,357 +0,0 @@
-{
-  "name": "太空翱翔",
-  "preview_img": "R:/png/dial_rocket/icon_dial_rocket.png",
-  "bg_img": "R:/png/dial_rocket/icon_rocket.png",
-  "configurable": 0,
-  "element_ll": [
-    {
-      "element_pos": {
-        "x": 230,
-        "y": 80
-      },
-      "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": 90,
-                "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": 88,
-                "y": 170
-              },
-              "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": 135,
-                "y": 170
-              },
-              "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": 215,
-        "y": 330
-      },
-      "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": 32,
-                "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": 98,
-                "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": 345,
-        "y": 330
-      },
-      "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_HA_K18/gui/lv_watch/resource/png/dial_style4/0.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/0.png
new file mode 100644 (file)
index 0000000..a237bdb
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/0.png differ

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

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

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

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

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

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

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

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

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/bg.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/bg.png
new file mode 100644 (file)
index 0000000..16ee98f
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/bg.png differ

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/dial_style4.json b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/dial_style4.json
new file mode 100644 (file)
index 0000000..2dacb09
--- /dev/null
+++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/dial_style4.json
@@ -0,0 +1,712 @@
+{
+  "name": "健康活力",
+  "preview_img": "R:/png/dial_style4/pre.png",
+  "bg_img": "R:/png/dial_style4/bg.png",
+  "configurable": 0,
+  "element_ll": [
+    {
+      "element_pos": {
+        "x": 105,
+        "y": 75
+      },
+      "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_style4/0.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/4.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/5.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/6.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/7.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/8.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/9.png"
+                }
+              ]
+            },
+                             {
+              "img_type": 11,
+              "img_pos": {
+                "x": 33,
+                "y": 0
+              },
+              "sub_img_cnt": 10,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/0.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/4.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/5.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/6.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/7.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/8.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/9.png"
+                }
+              ]
+            },
+                             {
+              "img_type": 12,
+              "img_pos": {
+                "x": 99,
+                "y": 0
+              },
+              "sub_img_cnt": 10,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/0.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/4.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/5.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/6.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/7.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/8.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/9.png"
+                }
+              ]
+            }, 
+                             {
+              "img_type": 13,
+              "img_pos": {
+                "x": 132,
+                "y": 0
+              },
+              "sub_img_cnt": 10,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/0.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/4.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/5.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/6.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/7.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/8.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/9.png"
+                }
+              ]
+            },
+            {
+              "img_type": 16,
+              "img_pos": {
+                "x": 66,
+                "y": 0
+              },
+              "sub_img_cnt": 1,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/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": 202,
+        "y": 28
+      },
+      "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": 32,
+                "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": 98,
+                "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": 135,
+        "y": 28
+      },
+      "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
+          }
+        }
+      ]
+    },
+
+    {
+      "element_pos": {
+        "x": 95,
+        "y": 165
+      },
+      "element_cnt": 1,
+      "act_type": 12,
+      "layer": 0,
+      "element_dsc_ll": [
+        {
+          "element_type": 12,
+          "element_name": "血压",
+          "img_cnt": 6,
+          "img_ll": [
+            {
+              "img_type": 121,
+              "img_pos": {
+                "x": 0,
+                "y": 0
+              },
+              "sub_img_cnt": 4,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/none.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                }
+              ]
+            },
+                             {
+              "img_type": 122,
+              "img_pos": {
+                "x": 33,
+                "y": 0
+              },
+              "sub_img_cnt": 11,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/0.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/4.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/5.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/6.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/7.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/8.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/9.png"
+                },
+                {
+                  "sub_img": "R:/png/dial_style4/none.png"
+                }
+              ]
+            },
+                             {
+              "img_type": 123,
+              "img_pos": {
+                "x": 66,
+                "y": 0
+              },
+              "sub_img_cnt": 11,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/0.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/4.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/5.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/6.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/7.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/8.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/9.png"
+                },
+                {
+                  "sub_img": "R:/png/dial_style4/none.png"
+                }
+              ]
+            }, 
+                             {
+              "img_type": 124,
+              "img_pos": {
+                "x": 0,
+                "y": 80
+              },
+              "sub_img_cnt": 4,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/none.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                }
+              ]
+            },
+            {
+              "img_type": 125,
+              "img_pos": {
+                "x": 33,
+                "y": 80
+              },
+              "sub_img_cnt": 11,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/0.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/4.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/5.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/6.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/7.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/8.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/9.png"
+                },
+                {
+                  "sub_img": "R:/png/dial_style4/none.png"
+                }
+              ]
+            },
+            {
+              "img_type": 126,
+              "img_pos": {
+                "x": 66,
+                "y": 80
+              },
+              "sub_img_cnt": 11,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style4/0.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/1.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/2.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/3.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/4.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/5.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/6.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/7.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/8.png"
+                },
+                                       {
+                  "sub_img": "R:/png/dial_style4/9.png"
+                },
+                {
+                  "sub_img": "R:/png/dial_style4/none.png"
+                }
+              ]
+            }
+          ],
+          "label_cnt": 0,
+                     "label_ll": [
+                           {
+              "label_type": 0,
+              "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": 110,
+        "y": 337
+      },
+      "element_cnt": 1,
+      "act_type": 13,
+      "layer": 0,
+      "element_dsc_ll": [
+        {
+          "element_type": 13,
+          "element_name": "心率",
+          "img_cnt": 0,
+          "img_ll": [
+            {
+              "img_type": 130,
+              "img_pos": {
+                "x": 60,
+                "y": 65
+              },
+              "sub_img_cnt": 1,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style3/heart.png"
+                }
+              ]
+            }
+          ],
+          "label_cnt": 2,
+          "label_ll": [
+            {
+              "label_type": 24,
+              "text": "",
+              "text_color": {
+                "r": 255,
+                "g": 255,
+                "b": 255
+              },
+              "text_pos": {
+                "x": 75,
+                "y": 0
+              },
+              "font_size": 30
+            },
+            {
+              "label_type": 30,
+              "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_HA_K18/gui/lv_watch/resource/png/dial_style4/none.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/none.png
new file mode 100644 (file)
index 0000000..69c5a7e
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style4/none.png differ

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

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

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/0.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/0.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/1.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/1.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/2.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/2.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/3.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/3.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/4.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/4.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/5.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/5.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/6.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/6.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/7.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/7.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/8.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/8.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/9.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/9.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/bg.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/bg.png

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/dial_style5.json
similarity index 63%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/dial_style5.json
index 603a04f..5369d37 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
+++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/dial_style5.json
@@ -1,7 +1,7 @@
 {
-  "name": "海豚世界",
-  "preview_img": "R:/png/dial_dolphin/icon_dial_dolphin.png",
-  "bg_img": "R:/png/dial_dolphin/icon_dolphin.png",
+  "name": "红色魅影",
+  "preview_img": "R:/png/dial_style5/pre.png",
+  "bg_img": "R:/png/dial_style5/bg.png",
   "configurable": 0,
   "element_ll": [
     {
@@ -27,34 +27,34 @@
               "sub_img_cnt": 10,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png"
+                  "sub_img": "R:/png/dial_style5/0.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png"
+                  "sub_img": "R:/png/dial_style5/1.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png"
+                  "sub_img": "R:/png/dial_style5/2.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png"
+                  "sub_img": "R:/png/dial_style5/3.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png"
+                  "sub_img": "R:/png/dial_style5/4.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png"
+                  "sub_img": "R:/png/dial_style5/5.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png"
+                  "sub_img": "R:/png/dial_style5/6.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png"
+                  "sub_img": "R:/png/dial_style5/7.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png"
+                  "sub_img": "R:/png/dial_style5/8.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png"
+                  "sub_img": "R:/png/dial_style5/9.png"
                 }
               ]
             },
@@ -67,34 +67,34 @@
               "sub_img_cnt": 10,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png"
+                  "sub_img": "R:/png/dial_style5/0.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png"
+                  "sub_img": "R:/png/dial_style5/1.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png"
+                  "sub_img": "R:/png/dial_style5/2.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png"
+                  "sub_img": "R:/png/dial_style5/3.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png"
+                  "sub_img": "R:/png/dial_style5/4.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png"
+                  "sub_img": "R:/png/dial_style5/5.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png"
+                  "sub_img": "R:/png/dial_style5/6.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png"
+                  "sub_img": "R:/png/dial_style5/7.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png"
+                  "sub_img": "R:/png/dial_style5/8.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png"
+                  "sub_img": "R:/png/dial_style5/9.png"
                 }
               ]
             },
@@ -107,34 +107,34 @@
               "sub_img_cnt": 10,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png"
+                  "sub_img": "R:/png/dial_style5/0.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png"
+                  "sub_img": "R:/png/dial_style5/1.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png"
+                  "sub_img": "R:/png/dial_style5/2.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png"
+                  "sub_img": "R:/png/dial_style5/3.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png"
+                  "sub_img": "R:/png/dial_style5/4.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png"
+                  "sub_img": "R:/png/dial_style5/5.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png"
+                  "sub_img": "R:/png/dial_style5/6.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png"
+                  "sub_img": "R:/png/dial_style5/7.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png"
+                  "sub_img": "R:/png/dial_style5/8.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png"
+                  "sub_img": "R:/png/dial_style5/9.png"
                 }
               ]
             }, 
@@ -147,34 +147,34 @@
               "sub_img_cnt": 10,
               "sub_img_ll": [
                 {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png"
+                  "sub_img": "R:/png/dial_style5/0.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png"
+                  "sub_img": "R:/png/dial_style5/1.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png"
+                  "sub_img": "R:/png/dial_style5/2.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png"
+                  "sub_img": "R:/png/dial_style5/3.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png"
+                  "sub_img": "R:/png/dial_style5/4.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png"
+                  "sub_img": "R:/png/dial_style5/5.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png"
+                  "sub_img": "R:/png/dial_style5/6.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png"
+                  "sub_img": "R:/png/dial_style5/7.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png"
+                  "sub_img": "R:/png/dial_style5/8.png"
                 },
                                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png"
+                  "sub_img": "R:/png/dial_style5/9.png"
                 }
               ]
             }

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/pre.png
similarity index 100%
rename from 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png
rename to 2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_style5/pre.png