From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/Common/HDLCommon.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 955fb51..d986e84 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -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();//"瀛愯处鍙穞oken
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)
{
--
Gitblit v1.8.0