From b1b3f47f3eeff8536b1a2851781da0b04f346fef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:04:14 +0800
Subject: [PATCH] Merge branch 'wxr1215' into dev
---
HDL_ON/Common/HDLCommon.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index e77da10..d957a65 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -330,20 +330,26 @@
}
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();
-
if (json.ContainsKey("spk"))
{
if (json["spk"].ToString() == "door.gate")
{
+ //new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"鍛煎彨", eSVideoInfo);
+#if __IOS__
+ eSVideoInfo.spk = json["spk"].ToString();
+ HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, false);
+#else
new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"鍛煎彨", eSVideoInfo);
- //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,true);
+#endif
return;
}
else
@@ -355,6 +361,14 @@
return;
}
}
+ else
+ {
+ //HDL Linphone 鐙勮�愬厠
+ //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ //鎵撳紑鍛煎彨椤甸潰
+ HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,false);
+ return;
+ }
}
//3.鎵撳紑鍛煎彨椤甸潰
@@ -446,8 +460,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