From: CCC <2393524978@qq.com>
Date: Tue, 15 Aug 2023 08:21:38 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f76a37039c09931909775eed9abb5805693f2bbf;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial/buildin_dial_list.db
index da028564..b0a4462a 100644
--- a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial/buildin_dial_list.db
+++ b/2.sdk/project/Z5_K7/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_K7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
index 15113964..8def041f 100644
--- a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
+++ b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
@@ -1,5 +1,5 @@
 {
-  "name": "海豚",
+  "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_K7/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
index 5a6ae5e2..7b6549fd 100644
--- a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
+++ b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
@@ -1,5 +1,5 @@
 {
-  "name": "太空火箭",
+  "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_K7/gui/lv_watch/resource/png/dial_style1/style1_watch.json b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/dial_style1.json
similarity index 99%
rename from 2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/style1_watch.json
rename to 2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/dial_style1.json
index 23b92e9a..53e39a83 100644
--- a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style1/style1_watch.json
+++ b/2.sdk/project/Z5_K7/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,
@@ -324,7 +324,7 @@
     },
 	  {
       "element_pos": {
-        "x": 29,
+        "x": 47,
         "y": 143
       },
       "element_cnt": 1,
diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style3/dial_style3.json b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style3/dial_style3.json
index d86a4b79..27018e6b 100644
--- a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_style3/dial_style3.json
+++ b/2.sdk/project/Z5_K7/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,