From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/Common/HDLCommon.cs | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index c010d80..3e58c17 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())
@@ -319,7 +318,8 @@
eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
eSVideoInfo.Lc_Location = OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1;
eSVideoInfo.Lc_PlayToken = json["token"].ToString();
- eSVideoInfo.Lc_Psk = json["cname"].ToString();
+ //eSVideoInfo.Lc_Psk = json["cname"].ToString();
+ eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK瀛楁涓嶈兘鍙朿name
}
else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
{
@@ -337,6 +337,7 @@
eSVideoInfo.DeviceName = json["deviceName"].ToString();
eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
//ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ //鎵撳紑鍛煎彨椤甸潰
HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
return;
}
@@ -390,20 +391,8 @@
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
switch (UserInfo.Current.AccountString)
{
- case "13415629083":
- case "18316120654":
- case "15622703419":
- case "18824864143":
case "464027401@qq.com":
- case "2791308028@qq.com":
- case "13697499568":
- case "18666455392":
- case "13375012446":
- case "13602944661":
- case "18778381374":
- case "18316672920":
case "15626203746":
- case "551775569@qq.com":
return;
}
@@ -436,6 +425,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