From: @CHENG <2393524978@qq.com>
Date: Mon, 24 Feb 2025 04:26:33 +0000 (+0800)
Subject: Z5_HA_K18_NFC 表盘及资源文件
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=2487723f329ff2071d3f17db2279f76f96ec9f80;p=mirrors%2FASR3603_Z5.git

Z5_HA_K18_NFC 表盘及资源文件
---

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/dial_style1.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/dial_style1.json
index c340c6f5..fa7d46e7 100644
--- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/dial_style1.json
+++ b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/dial_style1.json
@@ -231,8 +231,8 @@
     {
       "element_pos": 
       {
-        "x": 70,
-        "y": 175
+        "x": 90,
+        "y": 155
       },
       "element_cnt": 1,
       "act_type": 5,
@@ -324,8 +324,8 @@
     },
 	  {
       "element_pos": {
-        "x": 100,
-        "y": 225
+        "x": 280,
+        "y": 155
       },
       "element_cnt": 1,
       "act_type": 4,
@@ -373,8 +373,8 @@
     },
     {
       "element_pos": {
-        "x": 240,
-        "y": 210
+        "x": 217,
+        "y": 375
       },
       "element_cnt": 1,
       "act_type": 8,
@@ -410,10 +410,10 @@
                 "b": 255
               },
               "text_pos": {
-                "x": 55,
-                "y": 0
+                "x": 20,
+                "y": 5
               },
-              "font_size": 40
+              "font_size": 20
             }
           ],
           "bar": {
@@ -435,8 +435,8 @@
     },
     {
       "element_pos": {
-        "x": 130,
-        "y": 306
+        "x": 140,
+        "y": 205
       },
       "element_cnt": 1,
       "act_type": 13,
@@ -461,7 +461,7 @@
               ]
             } 
           ],
-          "label_cnt": 1,
+          "label_cnt": 2,
           "label_ll": [
             {
               "label_type": 24,
@@ -472,10 +472,24 @@
                 "b": 255
               },
               "text_pos": {
-                "x": -7,
-                "y": 52
+                "x": 67,
+                "y": 28
               },
-              "font_size": 40
+              "font_size": 60
+            },
+            {
+              "label_type": 30,
+              "text": "幸福值",
+              "text_color": {
+                "r": 255,
+                "g": 255,
+                "b": 255
+              },
+              "text_pos": {
+                "x": 61,
+                "y": 100
+              },
+              "font_size": 20
             }
           ],
           "bar": {
@@ -498,7 +512,7 @@
     {
       "element_pos": {
         "x": 300,
-        "y": 298
+        "y": 380
       },
       "element_cnt": 1,
       "act_type": 14,
@@ -534,10 +548,72 @@
                 "b": 255
               },
               "text_pos": {
-                "x": -10,
-                "y": 60
+                "x": 21,
+                "y": 0
               },
-              "font_size": 40
+              "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": 370
+      },
+      "element_cnt": 1,
+      "act_type": 17,
+      "layer": 0,
+      "element_dsc_ll": [
+        {
+          "element_type": 17,
+          "element_name": "温度",
+          "img_cnt": 1,
+          "img_ll": [
+            {
+              "img_type": 170,
+              "img_pos": {
+                "x": 0,
+                "y": 0
+              },
+              "sub_img_cnt": 1,
+              "sub_img_ll": [
+                {
+                  "sub_img": "R:/png/dial_style1/temperature.png"
+                }
+              ]
+            } 
+          ],
+          "label_cnt": 1,
+          "label_ll": [
+            {
+              "label_type": 29,
+              "text": "--",
+              "text_color": {
+                "r": 255,
+                "g": 255,
+                "b": 255
+              },
+              "text_pos": {
+                "x": 25,
+                "y": 10
+              },
+              "font_size": 20
             }
           ],
           "bar": {
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/heart.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/heart.png
index 7b307c8d..9eb26f5b 100644
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/heart.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/heart.png differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/spo2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/spo2.png
index acdd484f..402619d2 100644
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/spo2.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/spo2.png differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/step.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/step.png
index 027b29e0..af6fa2ea 100644
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/step.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/step.png differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/temperature.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/temperature.png
new file mode 100644
index 00000000..e94de930
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/temperature.png differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png
index b912c8ef..a3b1c6c7 100644
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png
index b32e4d58..e516d39c 100644
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png
index 61815136..555baab0 100644
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png
deleted file mode 100644
index ab0adfd8..00000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png and /dev/null differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_step.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_step.png
index df265ecd..dfc3b07d 100644
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_step.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_step.png differ
diff --git a/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 2da4f5e3..698ecee8 100644
--- a/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -160,6 +160,8 @@
 #define MMI_PROJECT_Z5_HA_K18_NFC
 
 
+#define MMI_FONT60_RED_SUPPORT
+
 
 //#define __MMI_MAIN_MENU_SWITCH_MENU__
 #define __MMI_MAIN_MENU_ONE_PAGE_STYLE__