From: CCC <2393524978@qq.com>
Date: Wed, 12 Jul 2023 03:38:31 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=96ad3bcd7c1f60f94b9b3a9a7b887b4185d084d2;p=mirrors%2FASR3603_Z5.git

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
index 00000000..b06febcc
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
index 2fc0a8f6..00000000
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 e0cbc150..b7fe7785 100644
--- 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 663e55a1..4121841f 100644
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 5606d385..0e7a752c 100644
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 ed0f575d..ef3e0fbb 100644
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
index 00000000..b06febcc
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
index 2fc0a8f6..00000000
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 598e24cb..61c8439c 100644
--- 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 22f96009..f073fa31 100644
--- 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