From 49248e3bdff0458f8f6f4156d1425bd6f6074e32 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期二, 17 五月 2022 13:17:21 +0800
Subject: [PATCH] Merge branch 'dev' into lss
---
HDL_ON/Common/HDLCommon.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 6a2a061..88ca761 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -330,12 +330,15 @@
}
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();
+ eSVideoInfo.spk = json["spk"].ToString();
+
//ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
//鎵撳紑鍛煎彨椤甸潰
HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
@@ -427,8 +430,11 @@
DB_ResidenceData.Instance.EixtAccount();
//4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
HDLLinphone.Current.LogoutAllAccount();
+
#if __IOS__
- //5.娓呯┖Siri鍏变韩鏁版嵁淇℃伅
+ //5.鍏ㄨ閫氱櫥鍑�
+ Shared.IOS.HDLFVSDK.Video.Logout();
+ //6.娓呯┖Siri鍏变韩鏁版嵁淇℃伅
new Other.SkipControl().SetData(false, "", "", "","");
var sDM = new SiriKit.SceneDateManager();
Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
--
Gitblit v1.8.0