From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone
---
HDL_ON/Common/ApiUtlis.cs | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 65338b6..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;
@@ -277,19 +279,11 @@
UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
} else if (video.interphoneType == InterphoneType.HDL.ToString()) {
isInterphoneType_HDL = true;
- }
- else if(video.interphoneType == InterphoneType.HDL.ToString())
- {
DB_ResidenceData.Instance.SupportFacePass = true;
- DB_ResidenceData.Instance.SaveResidenceData();
+ DB_ResidenceData.Instance.SaveResidenceData();
}
}
}
-
-
- //======================瀹夐槻====================
- GetSecurityList();
- //======================SIP璐﹀彿====================
//======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
//濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
@@ -307,7 +301,10 @@
HDLLinphone.Current.LogoutAllAccount();
}
}
-
+
+ //======================瀹夐槻====================
+ GetSecurityList();
+
}
catch (Exception ex)
{
--
Gitblit v1.8.0