gengxin

diff --git a/2.sdk/project/Z5_I7/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_I7/gui/lv_watch/mmi_default_CUSTOM.h
index a574d40..0f97d08 100644 (file)
--- a/2.sdk/project/Z5_I7/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_I7/gui/lv_watch/mmi_default_CUSTOM.h
@@ -9,9 +9,9 @@
 // fzd debug-lab.xcloudtech.com:9000; fzd-api.xcloudtech.com:9000
 // wulian-8.134.110.49:30346
 // tongxin debug-tcptest.tx.kidxin.com:20500; tongxin-tcp.tx.kidxin.com:20500
-#define MMI_CUSTOMER_IP_ADDRESS                "tcp.tx.kidxin.com" // "8.134.110.49" // "lab.xcloudtech.com"
+#define MMI_CUSTOMER_IP_ADDRESS                "api.xcloudtech.com" // "8.134.110.49" // "lab.xcloudtech.com"
 
-#define MMI_CUSTOMER_IP_PORT           (20500) // (30346) // (9000)
+#define MMI_CUSTOMER_IP_PORT           (9000) // (30346) // (9000)
 
 // fzd-"bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"; wulian-"g3HOqJwHUhhA1myJnuur"
 #define MMI_CUSTOMER_PROTOCOL_MD5_KEY          "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP" // "3JyCjsw4ryXKzjzudayY"

diff --git a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_bear/bear_watch.json b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_bear/bear_watch.json
index 5a4df6f..d3c4d36 100644 (file)
--- a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_bear/bear_watch.json
+++ b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_bear/bear_watch.json
@@ -1,5 +1,5 @@
 {
-  "name": "小熊时钟",
+  "name": "Bear",
   "preview_img": "R:/png/dial_bear/icon_dial_bear_clock.png",
   "bg_img": "R:/png/dial_bear/icon_bear.png",
   "configurable": 0,

diff --git a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
index b5b175e..40eb326 100644 (file)
--- a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
+++ b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
@@ -1,5 +1,5 @@
 {
-  "name": "数字时钟",
+  "name": "Digital",
   "preview_img": "R:/png/dial_default_ambient/am_digit_pre.png",
   "bg_img": "R:/png/dial_default_ambient/am_digit_bg.png", 
   "configurable": 0,

diff --git a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
index 8def041..3b85acf 100644 (file)
--- a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
+++ b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json
@@ -1,5 +1,5 @@
 {
-  "name": "海豚世界",
+  "name": "Dolphin",
   "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_I7/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
index 7b6549f..58086f4 100644 (file)
--- a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
+++ b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json
@@ -1,5 +1,5 @@
 {
-  "name": "太空翱翔",
+  "name": "Rocket",
   "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_I7/gui/lv_watch/resource/png/dial_style1/dial_style1.json b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_style1/dial_style1.json
index 5ea86ef..2009258 100644 (file)
--- a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_style1/dial_style1.json
+++ b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_style1/dial_style1.json
@@ -1,5 +1,5 @@
 {
-  "name": "那时花开",
+  "name": "Flower",
   "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_I7/gui/lv_watch/resource/png/dial_style3/dial_style3.json b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_style3/dial_style3.json
index 27018e6..cb92ff7 100644 (file)
--- a/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_style3/dial_style3.json
+++ b/2.sdk/project/Z5_I7/gui/lv_watch/resource/png/dial_style3/dial_style3.json
@@ -1,5 +1,5 @@
 {
-  "name": "火力全开",
+  "name": "Sport",
   "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_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 2c91c76..774bb6c 100644 (file)
--- a/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -159,8 +159,8 @@
 
 #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__
 //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
-#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__
+#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
+//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__
 
 #define __MMI_WECHAT_SUPPORT__
 
@@ -174,7 +174,7 @@
 
 #define __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
 
-//#define __MMI_APP_QRCODE_MENU_SUPPORT__
+#define __MMI_APP_QRCODE_MENU_SUPPORT__
 
 #define __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
 

diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
index 92b0e7b..66e693c 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
@@ -64,7 +64,7 @@ const void * lang_text_en[] = {
     "Volte is not enabled,Please check the SIM card and the network supports volte",
 
     /*weather.c*/
-    "No network, please wait",
+    "No data, please wait",
     "Sunny",
     "Cloudy",
     "Overcast",
@@ -806,6 +806,7 @@ const void * lang_text_en[] = {
     /*bt_SensorHub*/
     "BT upgrade",
     "Device check",
+    "Device reboot",
     "Time sync",
     "Log ctrl",
     "BT Ver request",