gengxin

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOLUME_BTN.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOLUME_BTN.png
new file mode 100644 (file)
index 0000000..b06febc
Binary files /dev/null and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOLUME_BTN.png differ

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/video_call/img_video_call.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/video_call/img_video_call.png
deleted file mode 100644 (file)
index 2fc0a8f..0000000
Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/video_call/img_video_call.png and /dev/null differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h
index e0cbc15..b7fe778 100644 (file)
--- a/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h
@@ -6,9 +6,9 @@
 
 
 //server ip
-#define MMI_CUSTOMER_IP_ADDRESS                "api.xcloudtech.com"
+#define MMI_CUSTOMER_IP_ADDRESS                "8.134.110.49" // "api.xcloudtech.com"
 
-#define MMI_CUSTOMER_IP_PORT           (9000)
+#define MMI_CUSTOMER_IP_PORT           (30346) // (9000)
 
 
 #define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (60 * 5) // unit:s

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_ANSWER_BTN.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_ANSWER_BTN.png
index 663e55a..4121841 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_ANSWER_BTN.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_ANSWER_BTN.png differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_CONTACT_PHOTO.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_CONTACT_PHOTO.png
index 5606d38..0e7a752 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_CONTACT_PHOTO.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_CONTACT_PHOTO.png differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_HANGUP_BTN.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_HANGUP_BTN.png
index ed0f575..ef3e0fb 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_HANGUP_BTN.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_HANGUP_BTN.png differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOLUME_BTN.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOLUME_BTN.png
new file mode 100644 (file)
index 0000000..b06febc
Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_VOLUME_BTN.png differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/img_video_call.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/img_video_call.png
deleted file mode 100644 (file)
index 2fc0a8f..0000000
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/video_call/img_video_call.png and /dev/null differ

diff --git a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 598e24c..61c8439 100644 (file)
--- a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -151,6 +151,8 @@
 
 #define __MMI_ZHSX_SUPPORT_FZD__
 
+#define __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__ // dachui
+
 #define __MMI_ZHSX_SUPPORT_SMS__
 
 #define __MMI_ZHSX_SUPPORT_ALIPAY__

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
index 22f9600..f073fa3 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
@@ -469,7 +469,9 @@ LV_IMG_DECLARE(img_poweron_logo);
 #endif
 
 //video_call
+#if USE_LV_WATCH_VIDEOCALL != 0
 #define ICON_VIDEO_CALL                                "R:/png/video_call/img_video_call.png"
+#endif
 
 //audio player
 #if USE_LV_WATCH_AUDIO_PLAYER != 0
@@ -675,6 +677,7 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_VIDEO_CALL_VIDEO_BTN                      "R:/png/video_call/ICON_VIDEO_CALL_VIDEO_BTN.png"
 #define ICON_VIDEO_CALL_HANGUP_BTN                     "R:/png/video_call/ICON_VIDEO_CALL_HANGUP_BTN.png"
 #define ICON_VIDEO_CALL_ANSWER_BTN                     "R:/png/video_call/ICON_VIDEO_CALL_ANSWER_BTN.png"
+#define ICON_VIDEO_CALL_VOLUME_BTN                     "R:/png/video_call/ICON_VIDEO_CALL_VOLUME_BTN.png"
 #define ICON_VIDEO_CALL_CONTACT_PHOTO                   "R:/png/video_call/ICON_VIDEO_CALL_CONTACT_PHOTO.png"
 
 #endif