gengxin

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial/buildin_dial_list.db
index b0a4462..295148c 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial/buildin_dial_list.db
+++ b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial/buildin_dial_list.db
@@ -1,14 +1,12 @@
-default_digit
-R:/png/dial_default_ambient/am_digit.json
 rokcket
 R:/png/dial_rocket/rocket_watch.json
+default_digit
+R:/png/dial_default_ambient/am_digit.json
 dolphin
 R:/png/dial_dolphin/dolphin_watch.json
 bear
 R:/png/dial_bear/bear_watch.json
 style1
 R:/png/dial_style1/dial_style1.json
-dial_style3
-R:/png/dial_style3/dial_style3.json
 dial_style4
 R:/png/dial_style4/dial_style4.json

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial_style1/dial_style1.json b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial_style1/dial_style1.json
index 15d1f2e..6c2a72e 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial_style1/dial_style1.json
+++ b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial_style1/dial_style1.json
@@ -8,7 +8,7 @@
     {
       "element_pos": {
         "x": 0,
-        "y": 0
+        "y": 20
       },
       "element_cnt": 1,
       "act_type": 1,
@@ -231,8 +231,8 @@
     {
       "element_pos": 
       {
-        "x": 24,
-        "y": 95
+        "x": 40,
+        "y": 125
       },
       "element_cnt": 1,
       "act_type": 5,
@@ -324,7 +324,7 @@
     },
          {
       "element_pos": {
-        "x": 47,
+        "x": 155,
         "y": 125
       },
       "element_cnt": 1,
@@ -373,8 +373,8 @@
     },
     {
       "element_pos": {
-        "x": 130,
-        "y": 110
+        "x": 70,
+        "y": 165
       },
       "element_cnt": 1,
       "act_type": 8,
@@ -432,130 +432,6 @@
           }
         }
       ]
-    },
-    {
-      "element_pos": {
-        "x": 53,
-        "y": 160
-      },
-      "element_cnt": 1,
-      "act_type": 13,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 13,
-          "element_name": "心率",
-          "img_cnt": 1,
-          "img_ll": [
-            {
-              "img_type": 130,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style1/heart.png"
-                }
-              ]
-            } 
-          ],
-          "label_cnt": 1,
-          "label_ll": [
-            {
-              "label_type": 24,
-              "text": "123",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": -7,
-                "y": 31
-              },
-              "font_size": 25
-            }
-          ],
-          "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": 161,
-        "y": 156
-      },
-      "element_cnt": 1,
-      "act_type": 14,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 14,
-          "element_name": "血氧",
-          "img_cnt": 1,
-          "img_ll": [
-            {
-              "img_type": 140,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 1,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_style1/spo2.png"
-                }
-              ]
-            } 
-          ],
-          "label_cnt": 1,
-          "label_ll": [
-            {
-              "label_type": 26,
-              "text": "--",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": -10,
-                "y": 35
-              },
-              "font_size": 25
-            }
-          ],
-          "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_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial_style1/view.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial_style1/view.png
index d4d0827..dec6f21 100644 (file)
Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial_style1/view.png and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/dial_style1/view.png differ

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

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

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

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

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_1.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_1.png
index 2d23fbf..1120645 100644 (file)
Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_1.png and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_1.png differ

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_2.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_2.png
index 4d1f2b5..a05b73a 100644 (file)
Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_2.png and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_2.png differ

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_3.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_3.png
index 0c79fc0..4c896cf 100644 (file)
Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_3.png and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_3.png differ

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_4.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_4.png
index e98ab17..603e351 100644 (file)
Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_4.png and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/signal/icon_signal_4.png differ

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png
index a8b3095..0ff01b2 100644 (file)
Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png differ

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

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_PROMPT2.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_PROMPT2.png
deleted file mode 100644 (file)
index 72af638..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_PROMPT2.png and /dev/null differ

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

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png
index a968a73..aad30a6 100644 (file)
Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png differ

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 6a389d1..0ec8d4d 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -163,6 +163,7 @@
 //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__
 
 #define __MMI_WECHAT_SUPPORT__
+#define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__
 
 #define __MMI_MAIN_MENU_SWITCH_MENU__
 #define __MMI_MAIN_MENU_ONE_PAGE_STYLE__
@@ -190,8 +191,15 @@
 
 #if 0 != USE_LV_WATCH_WEATHER
 #define __MMI_WEATHER_MENU_SUPPORT__
+#define __MMI_WEATHER_MENU_NOT_DISPLAY_TEMPERATURE_RANGE__
 #endif
 
+#define __MMI_POWER_ON_OFF_NO_RING__
+
+#define __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__
+
+#define __MMI_KEY_BACK_RUN_PHONEBOOK_WHEN_IN_DIAL__
+
 
 
 #endif

diff --git a/2.sdk/project/Z5_HA_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png b/2.sdk/project/Z5_HA_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png
index a286fbf..2458276 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png and b/2.sdk/project/Z5_HA_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png differ

diff --git a/2.sdk/project/Z5_HA_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png b/2.sdk/project/Z5_HA_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png
index d575753..2217967 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png and b/2.sdk/project/Z5_HA_K7/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png differ