~wxr/HDL_APP_Project.git

			@@ -307,7 +307,6 @@
			//1.视对讲厂家类型
			string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
			if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
			//
			ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
			//2.根据可视对讲厂家类型，处理不同的数据
			if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
			@@ -327,6 +326,19 @@
			eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"子账号token
			eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//设备序列号
			eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
			}
			else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
			{
			//HDL Linphone 狄耐克
			eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
			eSVideoInfo.callId = json["callId"].ToString();
			eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
			eSVideoInfo.DeviceName = json["deviceName"].ToString();
			eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
			//ShowAlert("狄耐克门口机呼叫");
			//打开呼叫页面
			HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
			return;
			}

			//3.打开呼叫页面
			@@ -424,6 +436,8 @@
			UserInfo.Current.LastTime = DateTime.MinValue;
			UserInfo.Current.SaveUserInfo();
			DB_ResidenceData.Instance.EixtAccount();
			//4.注销HDLSIP账号登录 2021-08-20
			HDLLinphone.Current.LogoutAllAccount();
			}
			catch (Exception ex)
			{
			@@ -627,14 +641,14 @@
			#if __IOS__
			//iOS
			//初始化萤石云SDK，中文国内key、英文海外key 开发者账号使用应用包名申请的APPKEY，不同包名应用需配置不同的APPKEY
			EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
			EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
			//1.设置所需河东的AccessToken和RefreshToken、域名地址
			EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
			EZSDK.IOS.EZSDK.SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
			EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
			EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
			//2.设置萤石子账号的AccessToken到SDK
			EZSDK.IOS.EZSDK.SetEZAccessToken(ezChildAccessToken);
			EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
			////3.打开摄像头设备列表页面
			EZSDK.IOS.EZSDK.Go2EZvizMonitor();
			EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();

			//EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
			//info.de
			@@ -648,18 +662,25 @@
			{
			if (b)
			{
			Android.Content.Intent intent = new Android.Content.Intent();
			var bundle = new Android.OS.Bundle();
			//传递name参数为tinyphp
			bundle.PutString("EzChildAccessToken", ezChildAccessToken);
			bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
			bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
			bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
			bundle.PutInt("Platform", 1);
			bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
			intent.PutExtras(bundle);
			intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
			Shared.Application.Activity.StartActivity(intent);
			((BaseActivity)Shared.Application.Activity).SetPermission(result =>
			{
			if(result)
			{
			Android.Content.Intent intent = new Android.Content.Intent();
			var bundle = new Android.OS.Bundle();
			//传递name参数为tinyphp
			bundle.PutString("EzChildAccessToken", ezChildAccessToken);
			bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
			bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
			bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
			bundle.PutInt("Platform", 1);
			bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
			intent.PutExtras(bundle);
			intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
			Shared.Application.Activity.StartActivity(intent);
			}
			}, "android.permission.RECORD_AUDIO");

			}
			});
			#endif