From 46719b11d11b6544b57cf966cf498fbedf9b613e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:02:49 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr1215
---
HDL_ON/Common/HDLCommon.cs | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 6a2a061..28ec31e 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -330,16 +330,40 @@
}
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;
+
+ if (json.ContainsKey("spk"))
+ {
+ if (json["spk"].ToString() == "door.gate")
+ {
+ new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"鍛煎彨", eSVideoInfo);
+
+ //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,true);
+ return;
+ }
+ else
+ {
+ //HDL Linphone 鐙勮�愬厠
+ //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ //鎵撳紑鍛煎彨椤甸潰
+ HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,false);
+ return;
+ }
+ }
+ else
+ {
+ //HDL Linphone 鐙勮�愬厠
+ //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ //鎵撳紑鍛煎彨椤甸潰
+ HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,false);
+ return;
+ }
}
//3.鎵撳紑鍛煎彨椤甸潰
@@ -402,13 +426,14 @@
//璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- Logout();
+ Logout(false);
}
/// <summary>
/// 閫�鍑虹櫥褰曟搷浣�
+ /// signOutPush 鏄惁鍒犻櫎鎺ㄩ�乼oken
/// </summary>
- public void Logout()
+ public void Logout(bool signOutPush = true)
{
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
@@ -419,16 +444,22 @@
{
try
{
- //2.娉ㄩ攢鎺ㄩ��
- new HttpServerRequest().SignOutPush();
+ if (signOutPush)
+ {
+ //2.娉ㄩ攢鎺ㄩ��
+ new HttpServerRequest().SignOutPush();
+ }
//3.璺宠浆鐧诲綍椤甸潰
UserInfo.Current.LastTime = DateTime.MinValue;
UserInfo.Current.SaveUserInfo();
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