From: CCC <2393524978@qq.com>
Date: Thu, 3 Aug 2023 06:43:34 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=5146a7b7978f47af2dc267f10c17ba6e3599f0a3;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
index cacb3884..7da1dac1 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
@@ -65,6 +65,7 @@ const struct {
     { ICON_SETTING_SHUTDOWN, WATCH_TEXT_ID_SHUTDOWN, shutdown_create_btn_action },
 #endif
 
+	{ ICON_SETTING_ABOUT, WATCH_TEXT_ID_ABOUT_WATCH, setting_about_create_btn_action },
 #if USE_LV_WATCH_UPGRADE != 0
     { ICON_SETTING_UPGRADE, WATCH_TEXT_ID_SYSTEM_UPGRADE, upgrade_create_btn_action },
 #elif USE_LV_WATCH_UPGRADE_RS != 0
@@ -72,7 +73,6 @@ const struct {
 #else
     { ICON_SETTING_UPGRADE, WATCH_TEXT_ID_SYSTEM_UPGRADE, btn_event_cb },
 #endif
-    { ICON_SETTING_ABOUT, WATCH_TEXT_ID_ABOUT_WATCH, setting_about_create_btn_action },
     //{ &icon_setting_time_zone, WATCH_TEXT_ID_TIME_ZONE, btn_action },
     //{ &icon_setting_add_friends, WATCH_TEXT_ID_ADD_FRIEND_ADJUST, btn_action },
     //{ &icon_setting_ring_music, WATCH_TEXT_ID_RINGTONE_SWITCH, btn_action },
diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.h b/2.sdk/sdk/gui/lv_watch/lv_watch.h
index 316f6e36..7fb5cd55 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_watch.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch.h
@@ -176,6 +176,7 @@ extern "C" {
 #include "mmi_sundry/mmi_sundry.h"
 #include "framework/message/mmi_msg_zhsx.h"
 #include "lv_apps/mmi_video_call/mmi_video_call.h"
+#include "lv_apps/mmi_video_call/mmi_video_call_fzd.h"
 #ifdef __MMI_WECHAT_SUPPORT__
 #include "lv_apps/mmi_wechat/wechat.h"
 #endif
@@ -259,6 +260,12 @@ MMI_MODEM_PIN_STATUS_TYPE watch_get_pintype(void);
 void watch_wakeup_lcd(bool always);
 
 
+uint8_t voip_get_call_volume(void);
+bool watch_voip_suspend_check(void);
+bool voip_connect_check_req(void);
+void voip_activity_destroy_req(void);
+
+
 /**********************
  *      MACROS
  **********************/
diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c
index 4a92e208..bb52a31f 100644
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c
@@ -252,7 +252,7 @@ void mmi_protocol_watch_heartbeat_action(void)
 	}
 }
 
-#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 bool mmi_protocol_watch_link_action(void)
 {
 	return mmi_protocol_fzd_action_LINK();
diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.h b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.h
index d043e1b7..c88c72be 100644
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.h
@@ -62,7 +62,7 @@ void mmi_protocol_watch_timed_mission_action(void);
 void mmi_protocol_watch_heartbeat_stop(void);
 void mmi_protocol_watch_heartbeat_action(void);
 
-#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 bool mmi_protocol_watch_link_action(void);
 #endif
 
diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
index 9ff218f9..f3e2e4c9 100644
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
@@ -481,7 +481,7 @@ static unsigned char * mmi_protocol_fzd_action_string_get(MMI_PROTOCOL_FZD_ACTIO
 	    {
 			{MMI_FZD_ACTION_NONE, "NONE"}, 		//MMI_FZD_ACTION_NONE
 			
-		#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+		#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 			{MMI_FZD_ACTION_LINK, "LK"},
 		#endif
 	        {MMI_FZD_ACTION_HEARTBEAT, "KA"},
@@ -522,6 +522,7 @@ static unsigned char * mmi_protocol_fzd_action_string_get(MMI_PROTOCOL_FZD_ACTIO
 			{MMI_FZD_ACTION_UNBIND, "DLT"},
 
 		#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
+		#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__
 			{MMI_FZD_WATCH_GET_VC_CONFIG, "jup_hoo_config"},
 			{MMI_FZD_WATCH_GET_VC_CONTACT, "video_contact"},
 			
@@ -531,6 +532,15 @@ static unsigned char * mmi_protocol_fzd_action_string_get(MMI_PROTOCOL_FZD_ACTIO
 			{MMI_FZD_SERVER_VC_CALL_REQUEST, "jup_hoo_request"},
 			{MMI_FZD_WATCH_VC_CALL_RESPONSE, "jup_hoo_response"},
 		#endif
+		#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
+			{MMI_FZD_WATCH_GET_VC_CONFIG, "JPREG"},
+			{MMI_FZD_WATCH_GET_VC_CONTACT, "MEMBERS"},
+			{MMI_FZD_WATCH_VC_CALL_REQUEST, "AGTALK"},
+			{MMI_FZD_SERVER_VC_CALL_RESPONSE, "RTALK"},
+			{MMI_FZD_SERVER_VC_CALL_REQUEST, "CALLING"},
+			{MMI_FZD_WATCH_VC_CALL_RESPONSE, "RCALLING"},
+		#endif
+		#endif
 
 		
 		/*******add before this line*******/
@@ -577,7 +587,7 @@ static bool mmi_protocol_fzd_content_parse(unsigned char * content_ptr, unsigned
 
 	switch(action)
 	{
-		#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+		#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 		case MMI_FZD_ACTION_LINK:
 			mmi_protocol_fzd_parse_LINK(next_buff, next_buff_len);
 			break;
@@ -698,6 +708,7 @@ static bool mmi_protocol_fzd_content_parse(unsigned char * content_ptr, unsigned
 			break;
 
 	#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
+	#if defined(__MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__) || defined(__MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__)
 		case MMI_FZD_WATCH_GET_VC_CONFIG:
 			mmi_protocol_fzd_parse_WATCH_GET_VC_CONFIG(next_buff, next_buff_len);
 			break;
@@ -721,6 +732,7 @@ static bool mmi_protocol_fzd_content_parse(unsigned char * content_ptr, unsigned
 		case MMI_FZD_WATCH_VC_CALL_RESPONSE:
 			break;
 	#endif
+	#endif
 
 			 
 		default:
@@ -731,7 +743,7 @@ static bool mmi_protocol_fzd_content_parse(unsigned char * content_ptr, unsigned
 }
 
 
-#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 bool mmi_protocol_fzd_action_LINK(void)
 {
 	return mmi_protocol_fzd_send_without_data(MMI_FZD_ACTION_LINK);
@@ -825,7 +837,9 @@ bool mmi_protocol_fzd_parse_ACTION_BIND(unsigned char * next_buff, unsigned int
 			mmi_protocol_watch_timed_mission_action();
 
 			//video call
+		#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
 			mmi_protocol_fzd_action_get_vc_config();
+		#endif
 
 		}
 	}
@@ -2001,6 +2015,7 @@ bool mmi_protocol_fzd_action_unbind(void)
 
 
 #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__
 bool mmi_protocol_fzd_action_get_vc_config(void)
 {
 	return mmi_protocol_fzd_send_without_data(MMI_FZD_WATCH_GET_VC_CONFIG);
@@ -2135,7 +2150,7 @@ bool mmi_protocol_fzd_parse_WATCH_VC_CALL_REQUEST(unsigned char * next_buff, uns
 	if(0 == t_value)
 	{
 		// the other party is not online
-		mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED);		
+		mmi_vc_call_action_call_stop();
 	}
 	else
 	{
@@ -2166,7 +2181,7 @@ bool mmi_protocol_fzd_parse_SERVER_VC_CALL_RESPONSE(unsigned char * next_buff, u
 	if(0 == t_value)
 	{
 		// the other party is reject
-		mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED);
+		mmi_vc_call_action_call_stop();
 	}
 	else
 	{
@@ -2218,7 +2233,297 @@ bool mmi_protocol_fzd_action_VC_CALL_RESPONSE(char * number, uint8_t state)
 
 	return result;
 }
+#endif
+
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
+bool mmi_protocol_fzd_action_get_vc_config(void)
+{
+	return mmi_protocol_fzd_send_without_data(MMI_FZD_WATCH_GET_VC_CONFIG);
+}
+
+bool mmi_protocol_fzd_action_get_vc_contact(void)
+{
+	return mmi_protocol_fzd_send_without_data(MMI_FZD_WATCH_GET_VC_CONTACT);
+}
+
+bool mmi_protocol_fzd_parse_WATCH_GET_VC_CONFIG(unsigned char * next_buff, unsigned int next_buff_len)
+{
+	bool result = false;
+	//MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_WATCH_GET_VC_CONFIG;
+
+	if(NULL == next_buff || 0 == next_buff_len)
+	{
+		PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+		return false;
+	}
+
+	result = true;
+	//mmi_protocol_fzd_send_without_data(action);
+
+	char * t_char = NULL;
+	int32_t t_id = 0;
+
+	t_char = next_buff;
+	t_id = atoi(t_char);
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, t_id);
+
+	//get contact
+	mmi_protocol_fzd_action_get_vc_contact();
+	
+	return result;
+}
+
+bool mmi_protocol_fzd_parse_WATCH_GET_VC_CONTACT(unsigned char * next_buff, unsigned int next_buff_len)
+{
+	bool result = false;
+	//MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_WATCH_GET_VC_CONTACT;
+
+	if(NULL == next_buff || 0 == next_buff_len)
+	{
+		PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+		return false;
+	}
+	
+	result = true;
+	//mmi_protocol_fzd_send_without_data(action);
+
+	// MEMBERS,0036003500300034003800320031002C0069006E00630061007200740065007300	
+	
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, next_buff_len);
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG]: %s\n", next_buff);
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG]: %s\n", next_buff + 64);
+
+	nv_watch_vc_contact_t t_vc_contact = {0};
+	char temp_buffer[4] = {0};
+	char * temp_ptr = next_buff;
+	uint8_t i = 0;
+	uint8_t t_len = 0;
+	char t_content_buffer[NV_WATCH_VC_CONTACT_NUMBER_LEN] = {0};
+	uint8_t t_next = 0, t_current = 0;
+	uint8_t t_offset = 0;
+	
+	while((NULL != temp_ptr) && (i < next_buff_len))
+	{
+		memset(temp_buffer, 0x0, sizeof(temp_buffer));
+		mmi_unicode_hex_str_to_utf8_str(temp_ptr + t_offset, 4, temp_buffer, &t_len);
+		if(0x002C == temp_buffer[0]) // ,
+		{
+			if(2 == t_current)
+			{
+				PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+				
+				t_current = 0;
+				t_next++;
+				
+				if(NV_WATCH_VC_CONTACT_TOTAL <= t_next)
+				{
+					PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+					break;
+				}
+			}
+			else if(1 == t_current) // name
+			{
+				PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+
+				memset(t_content_buffer, 0x0, sizeof(t_content_buffer));
+				mmi_unicode_hex_str_to_utf8_str(temp_ptr, t_offset, t_content_buffer, &t_len);
+				strncpy(t_vc_contact.name[t_next], t_content_buffer, NV_WATCH_VC_CONTACT_NAME_LEN - 1);
+				t_current++;
+			}
+			else // user id
+			{
+				PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+				
+				memset(t_content_buffer, 0x0, sizeof(t_content_buffer));
+				mmi_unicode_hex_str_to_utf8_str(temp_ptr, t_offset, t_content_buffer, &t_len);
+				strncpy(t_vc_contact.number[t_next], t_content_buffer, NV_WATCH_VC_CONTACT_NUMBER_LEN - 1);
+				t_current++;
+			}
+
+			temp_ptr += t_offset + 4;
+			t_offset = 0;
+		}
+		else
+		{
+			t_offset += 4;
+			PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, t_offset);
+		}
+
+		i += 4;
+		PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, i);
+	}
+
+	t_next++;
+
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, t_next);
+	for(i = 0; i < t_next; i++)
+	{
+		PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s\n", __FUNCTION__, __LINE__, t_vc_contact.number[i]);
+	}
+
+	t_vc_contact.total = t_next;
+	mmi_vc_contact_set(&t_vc_contact);
+
+	return result;
+}
+
+bool mmi_protocol_fzd_action_VC_CALL_REQUEST(char * number, uint8_t call_type)
+{
+	bool result = false;
+	MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_WATCH_VC_CALL_REQUEST;
+	unsigned char content_buff[NV_WATCH_VC_CONTACT_NUMBER_LEN + 8] = {0};
+	unsigned int content_lenth = 0;
+
+	sprintf(content_buff, ",%d,%s", call_type, number);
+	content_lenth = strlen(content_buff);
+
+	result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
+
+	return result;
+}
+	
+// [XT*334588000000156*0006*AGTALK,0,efef2323423423,123]
+// 0-continue; other-stop
+bool mmi_protocol_fzd_parse_WATCH_VC_CALL_REQUEST(unsigned char * next_buff, unsigned int next_buff_len)
+{
+	bool result = false;
+
+	if(NULL == next_buff || 0 == next_buff_len)
+	{
+		PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+		return false;
+	}
+
+	result = true;
+
+	char * t_value = NULL;
+	char * t_tokens = NULL;
+	char * t_ticket = NULL;
+
+	t_value = km_strtok_r(NULL, ",", &next_buff);
+	t_tokens = km_strtok_r(NULL, ",", &next_buff);
+	t_ticket = next_buff;
+
+	
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: t_value=%d\n", __FUNCTION__, __LINE__, t_value);
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: t_tokens,%d,%s\n", __LINE__, strlen(t_tokens), t_tokens+0);
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: %s\n", __LINE__, t_tokens+31);
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: %s\n", __LINE__, t_tokens+63);
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: %s\n", __LINE__, t_tokens+95);
+	PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: t_ticket,%d,%s\n", __LINE__, strlen(t_ticket), t_ticket+0);
+	
+	
+	if(0 == atoi(t_value))
+	{
+		// go on
+		mmi_vc_call_action_dialing_ext(t_tokens, t_ticket);	
+	}
+	else
+	{
+		// stop
+		mmi_vc_call_action_call_stop();
+	}
+	
+	return result;
+}
+
+// reject
+bool mmi_protocol_fzd_parse_SERVER_VC_CALL_RESPONSE(unsigned char * next_buff, unsigned int next_buff_len)
+{
+	bool result = false;
+	MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_SERVER_VC_CALL_RESPONSE;
+
+	if(NULL == next_buff || 0 == next_buff_len)
+	{
+		PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+		return false;
+	}
+
+	result = true;
+	mmi_protocol_fzd_send_without_data(action);
+
+	// the other party is reject
+	mmi_vc_call_action_call_stop();
+	
+	return result;
+}
+
+bool mmi_protocol_fzd_action_SERVER_VC_CALL_REQUEST(int8_t state)
+{
+	bool result = false;
+	MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_SERVER_VC_CALL_REQUEST;
+	unsigned char content_buff[8] = {0};
+	unsigned int content_lenth = 0;
+
+	sprintf(content_buff, ",%d", state);
+	content_lenth = strlen(content_buff);
+
+	result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
+
+	return result;
+}
+
+// [XT*YYYYYYYYYYYYYYY*LEN*CALLING,ºô½ÐÕßid,»áÒéid(ûÓÐÔòÁô¿Õ£¬µ«Î»Öñ£Áô£©,ÒôƵ»¹ÊÇÊÓƵ£¨0ΪÒôƵ£¬1ΪÊÓƵ£©£¬ÉùÍøToken]
+bool mmi_protocol_fzd_parse_SERVER_VC_CALL_REQUEST(unsigned char * next_buff, unsigned int next_buff_len)
+{
+	bool result = false;
+	MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_SERVER_VC_CALL_REQUEST;
+
+	if(NULL == next_buff || 0 == next_buff_len)
+	{
+		PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+		return false;
+	}
 
+	result = true;
+	mmi_protocol_fzd_action_SERVER_VC_CALL_REQUEST(0);
+
+	char * t_ptr = NULL;
+	char t_number[NV_WATCH_VC_CONTACT_NUMBER_LEN] = {0};
+	char t_ticket[64 + 1] = {0};
+	uint8_t t_calltype = 0;
+	char t_tokens[128 + 1] = {0};
+
+	t_ptr = km_strtok_r(NULL, ",", &next_buff);
+	strncpy(t_number, t_ptr, NV_WATCH_VC_CONTACT_NUMBER_LEN - 1);
+
+	t_ptr = km_strtok_r(NULL, ",", &next_buff);
+	strncpy(t_ticket, t_ptr, strlen(t_ptr));
+	
+	t_ptr = km_strtok_r(NULL, ",", &next_buff);
+	t_calltype = atoi(t_ptr);
+
+	t_ptr = km_strtok_r(NULL, ",", &next_buff);
+	strncpy(t_tokens, t_ptr, strlen(t_ptr));
+
+	mmi_vc_call_action_incoming(t_number, t_calltype, t_ticket, t_tokens);
+	
+	return result;
+}
+
+// [XT*YYYYYYYYYYYYYYY*LEN*RCALLING,ºô½ÐÕßid,»áÒéid(ûÓÐÔòÁô¿Õ£¬µ«Î»Öñ£Áô£©,ÒôƵ»¹ÊÇÊÓƵ£¨0ΪÒôƵ£¬1ΪÊÓƵ£©]
+bool mmi_protocol_fzd_action_VC_CALL_RESPONSE(char * number, char * ticket, MODEM_VIDEO_CALL_TYPE type)
+{
+	bool result = false;
+	MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_WATCH_VC_CALL_RESPONSE;
+
+	if(NULL == number) // hang up
+	{
+		result = mmi_protocol_fzd_send_without_data(action);
+	}
+	else // reject
+	{
+		unsigned char content_buff[NV_WATCH_VC_CONTACT_NUMBER_LEN + 64 + 8] = {0};
+		unsigned int content_lenth = 0;
+
+		sprintf(content_buff, ",%s,%s,%d", number, ticket, type);
+		content_lenth = strlen(content_buff);
+
+		result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
+	}
+	return result;
+}
+#endif
 #endif
 
 
diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
index 37fb43c2..a18c2269 100644
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
@@ -26,7 +26,7 @@ FORMAT: [MD5_DATADEVICE_NAME*DEVICE_ID*CONTENT_LENGTH*CONTENT_KEY,CONTENT_VALUE]
 
 ****************************************/
 
-#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 #define MMI_PROTOCOL_FZD_MD5_KEY_STR 	"3JyCjsw4ryXKzjzudayY"
 #else
 #define MMI_PROTOCOL_FZD_MD5_KEY_STR 	"bZld0ALsZTt15tKEZhOlLPgbsO75BLTP" // "FDF9532BB5914C0F9D0999CAF99DEBB9" // "XMQcHi0lGIdru6xzW7lygBwBT8N0c09P"
@@ -37,7 +37,7 @@ FORMAT: [MD5_DATADEVICE_NAME*DEVICE_ID*CONTENT_LENGTH*CONTENT_KEY,CONTENT_VALUE]
 
 #define MMI_PROTOCOL_FZD_HEAD_BRACKET		"["
 #define MMI_PROTOCOL_FZD_BRACKET_LEN		(strlen(MMI_PROTOCOL_FZD_HEAD_BRACKET))
-#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 #define MMI_PROTOCOL_FZD_DEVICE_NAME		"qAELPTKmFanR4RHe"
 #else
 #define MMI_PROTOCOL_FZD_DEVICE_NAME		"SZKW" // "ZHSX"
@@ -92,7 +92,7 @@ typedef enum
 {
     MMI_FZD_ACTION_NONE,       //0 nothing
 
-#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 	MMI_FZD_ACTION_LINK,
 #endif
 	MMI_FZD_ACTION_HEARTBEAT, // tcp heartbeat
@@ -134,14 +134,15 @@ typedef enum
 	MMI_FZD_ACTION_UNBIND,
 
 #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
+#if defined(__MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__) || defined(__MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__)
 	MMI_FZD_WATCH_GET_VC_CONFIG,
 	MMI_FZD_WATCH_GET_VC_CONTACT,
 	MMI_FZD_WATCH_VC_CALL_REQUEST,
 	MMI_FZD_SERVER_VC_CALL_RESPONSE,
-
 	MMI_FZD_SERVER_VC_CALL_REQUEST,
 	MMI_FZD_WATCH_VC_CALL_RESPONSE,
 #endif
+#endif
 
 
 /*******add before this line*******/
@@ -180,7 +181,7 @@ void mmi_protocol_fzd_send_space_deinit(MMI_PROTOCOL_FZD_ACTION_ENUM action);
 
 bool mmi_protocol_fzd_send_cmd_check(MMI_PROTOCOL_FZD_ACTION_ENUM action);
 
-#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 bool mmi_protocol_fzd_action_LINK(void);
 
 bool mmi_protocol_fzd_parse_LINK(unsigned char * next_buff, unsigned int next_buff_len);
@@ -254,6 +255,10 @@ bool mmi_protocol_fzd_action_send_warning_info(MMI_WATCH_LOCATION_DATA_T * locat
 
 bool mmi_protocol_fzd_action_unbind(void);
 
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
+bool mmi_protocol_fzd_action_get_vc_config(void);
+bool mmi_protocol_fzd_action_VC_CALL_REQUEST(char * number, uint8_t call_type);
+#endif
 
 
 #endif
diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_msg_handler_impl.c b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_msg_handler_impl.c
index 419a6a2a..cc531caf 100644
--- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_msg_handler_impl.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_msg_handler_impl.c
@@ -31,7 +31,7 @@ void cmdmsg_handler_login_impl(void *param)
 #ifdef __MMI_ZHSX_SUPPORT__
 	printf("[@CHENG_DEBUG][%s][%d]: \n",__FUNCTION__,__LINE__);
 
-	#ifdef __MMI_ZHSX_SUPPORT_FZD_SERVER_WULIAN__
+	#ifdef __MMI_ZHSX_SUPPORT_WULIAN_SERVER__
 	mmi_protocol_watch_link_action();
 	#else
 	mmi_protocol_watch_heartbeat_action();
diff --git a/2.sdk/sdk/gui/lv_watch/modem/modem_adp.c b/2.sdk/sdk/gui/lv_watch/modem/modem_adp.c
index ca184912..0cd7729c 100644
--- a/2.sdk/sdk/gui/lv_watch/modem/modem_adp.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/modem_adp.c
@@ -136,6 +136,8 @@ void watch_modem_get_imei_req(char * imei)
 {
     //static char tmp_imei[16] = "867387060319199";
 	//static char tmp_imei[16] = "860132060004801"; // juphoon video call
+	//static char tmp_imei[16] = "860132060004802"; // juphoon video call & fzd
+	//static char tmp_imei[16] = "860132060004803"; // juphoon video call & dachui
 	//memcpy(imei, tmp_imei, 16);
     MMI_Modem_Query_Imei_Req(modem_sim_id, imei);
 }
diff --git a/2.sdk/sdk/product/craneg_modem/factory_mode.c b/2.sdk/sdk/product/craneg_modem/factory_mode.c
index ad04f43e..a6829203 100644
--- a/2.sdk/sdk/product/craneg_modem/factory_mode.c
+++ b/2.sdk/sdk/product/craneg_modem/factory_mode.c
@@ -27,7 +27,7 @@ int test_gsensor(void)
 {
 	uint8_t id_value;
 	//uart_printf("%s:%d\n",__FUNCTION__,__LINE__);
-	id_value = asl_pedometer_sensor_id_get();
+	id_value = mmi_gsensor_sensor_id_get();
 	uart_printf("GSensor get_id:%x\n", id_value);
 	//Icm40607_my_init();
 	return id_value;
@@ -46,7 +46,7 @@ int test_heartrate(void)
 int test_body_temp(void)
 {
     float body_temp = 0;
-    asl_temperature_measure_start();
+    mmi_tsensor_temperature_measure_start();
     uos_sleep(2000);
 
     body_temp = asl_cur_temperature_get();