From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/Common/ApiUtlis.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 893a034..9661856 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -140,6 +140,7 @@
// return;
//}
+ //return;
try
{
@@ -236,7 +237,6 @@
-
//===================璇诲彇鍙瀵硅鏁版嵁==========================
//鍒ゆ柇鏄惁鏈夊彲瑙嗗璁叉暟鎹紝鏈夊垯鏄剧ず鍙瀵硅icon
//var flVideoInfo = HttpRequest.CheckFlVideo();
@@ -282,6 +282,7 @@
}
}
+
//======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
//濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
@@ -297,6 +298,7 @@
}
else if (isInterphoneType_FREEVIEW)
{
+
//HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
@@ -310,6 +312,8 @@
HDLLinphone.Current.LogoutAllAccount();
}
}
+
+
//======================鐧诲綍鍏ㄨ閫�====================
if (isInterphoneType_FREEVIEW)
@@ -348,9 +352,9 @@
#if DEBUG
- DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl = true;
+ DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl = true;
#endif
- if (DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
+ if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
var pack = Ins.HttpRequest.GetGroupControlList();
if (pack != null)
@@ -359,7 +363,47 @@
{
try
{
- FunctionList.List.groupControls = JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
+ var groupControlList = JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
+ var readSidList = new List<string>();
+ foreach(var temp in groupControlList)
+ {
+ FunctionList.List.groupControls.Clear();
+ readSidList.Add(temp.userDeviceGroupControlId);
+ if (readSidList.Count >= 20)
+ {
+ var data = Ins.httpRequest.GetGroupControInfo(readSidList);
+ if(data != null)
+ {
+ if(data.Code == StateCode.SUCCESS)
+ {
+ var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString());
+ FunctionList.List.groupControls.AddRange(groupControlInfoList);
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
+ }
+ readSidList.Clear();
+ }
+ }
+ if (readSidList.Count > 0)
+ {
+ var data = Ins.httpRequest.GetGroupControInfo(readSidList);
+ if (data != null)
+ {
+ if (data.Code == StateCode.SUCCESS)
+ {
+ var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString());
+ FunctionList.List.groupControls.AddRange(groupControlInfoList);
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
+ }
+ readSidList.Clear();
+ }
}
catch (Exception ex)
{
@@ -377,9 +421,6 @@
//})
//{ IsBackground = true }.Start();
- ////===================鍦烘櫙==========================
- //new System.Threading.Thread(() =>
- //{
try
{
complateScene = false;
--
Gitblit v1.8.0