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/ApiUtlis.cs | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 09695b6..0bb6e41 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -56,7 +56,9 @@
return result;
}
-
+ /// <summary>
+ /// 涓嬭浇鏁版嵁瀹屾垚鏍囪
+ /// </summary>
public bool DownloadDataComplete = true;
/// <summary>
/// 涓嬭浇鏁版嵁
@@ -168,7 +170,7 @@
for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
{
var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
- if (localFunction.Spk_Prefix == FunctionCategory.Music || string.IsNullOrEmpty(localFunction.Spk_Prefix))
+ if (SPK.MusicSpkList().Contains(localFunction.spk))
{
i++;
continue;
@@ -263,6 +265,7 @@
//}
//======================鑾峰彇鍙瀵硅璁惧鍒楄〃====================
+ bool isInterphoneType_HDL = false;//鏄惁涓篐DLLinphone鍙瀵硅
var videoInfo= VideoSend.GetVideoInfoList();
if (videoInfo.Code == StateCode.SUCCESS)
{
@@ -274,19 +277,33 @@
if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
{
UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
- }
- else if(video.interphoneType == InterphoneType.HDL.ToString())
- {
+ } else if (video.interphoneType == InterphoneType.HDL.ToString()) {
+ isInterphoneType_HDL = true;
DB_ResidenceData.Instance.SupportFacePass = true;
- DB_ResidenceData.Instance.SaveResidenceData();
+ DB_ResidenceData.Instance.SaveResidenceData();
}
}
}
+ //======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
+ //濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
+ if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) {
+ //褰撳墠浣忓畢鏄疕DL鍙瀵硅绫诲瀷鐨勮澶�
+ if (isInterphoneType_HDL)
+ {
+ //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
+ HDLLinphone.Current.GetHDLSipInfoAndInitSDK(DB_ResidenceData.Instance.CurrentRegion.id);
+ }
+ else
+ {
+ Utlis.WriteLine("褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅,閫�鍑虹櫥褰曟墍鏈夎处鍙�");
+ //褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅
+ HDLLinphone.Current.LogoutAllAccount();
+ }
+ }
//======================瀹夐槻====================
GetSecurityList();
- //======================SIP璐﹀彿====================
}
catch (Exception ex)
--
Gitblit v1.8.0