From ff423b88a0dc521932305b5bd44b1786d3e42722 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 10 八月 2023 18:48:02 +0800
Subject: [PATCH] 2023年08月10日18:47:45
---
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
index cc599f9..0e13859 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
@@ -34,7 +34,7 @@
}
}
-
+ public const int pageSize=20;
#region ------鏃跺簭鍣�-------
/// <summary>
@@ -95,7 +95,7 @@
/// <param name="deviceId">璁惧id</param>
/// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
/// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
- public List<RemoteControlEntity> GetRemoteControlLits(string deviceId,TipType tipType = TipType.flicker)
+ public List<RemoteControlEntity> GetRemoteControlLits(string deviceId, TipType tipType = TipType.flicker)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -105,12 +105,20 @@
{
return new List<RemoteControlEntity>();
}
- var RemoteControlEntityList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RemoteControlEntity>>(responsePackNew.Data.ToString());
- if (RemoteControlEntityList == null)
- {
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RemoteControlEntity>>(responsePackNew.Data.ToString());
+ if (list == null)
+ {
return new List<RemoteControlEntity>();
}
- return RemoteControlEntityList;
+ if (list.Count > 0)
+ {
+ for (int i = 0; i < list.Count; i++)
+ {
+ var remoteControl = list[i];
+ remoteControl.deviceId = deviceId;
+ }
+ }
+ return list;
}
/// <summary>
@@ -161,7 +169,18 @@
if (list == null)
{
return new List<FilterCategoryEntity>();
- }
+ }
+ if (list.Count > 0)
+ {
+ for (int i = 0; i < list.Count; i++)
+ {
+ var filterCategory = list[i];
+ foreach (var o in filterCategory.filters)
+ {
+ o.category = filterCategory.category;
+ }
+ }
+ }
return list;
}
@@ -174,27 +193,32 @@
/// <param name="pageNo">褰撳墠椤�</param>
/// <param name="pageSize">椤垫暟</param>
/// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
- public List<MovieLibrary> GetMovieLibraryPage(string deviceId, string rcId, List<FilterCategorys> filterCategorys, int pageNo, int pageSize, TipType tipType = TipType.flicker)
+ /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
+ public List<MovieLibrary> GetMovieLibraryPage(string deviceId, string rcId, List<Filters> filterCategorys, int pageNo, int pageSize, TipType tipType = TipType.flicker)
{
JObject jObject = new JObject();
- JArray jArray = new JArray();
+
jObject.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
jObject.Add("deviceId", deviceId);//璁惧id
jObject.Add("rcId", rcId);//閬ユ帶鍣╥d
-
- foreach (var filter in filterCategorys)
+ if (filterCategorys != null && filterCategorys.Count != 0)
{
- JObject obj = new JObject();
- obj.Add("category", filter.category);
- obj.Add("filterValue", filter.filterValue);
- jArray.Add(obj);
+ //杩囨护鍒嗙被鏁版嵁
+ JArray jArray = new JArray();
+ foreach (var filter in filterCategorys)
+ {
+ JObject obj = new JObject();
+ obj.Add("category", filter.category);
+ obj.Add("filterValue", filter.filterValue);
+ jArray.Add(obj);
+ }
+ jObject.Add("filterCategorys", jArray);//鎸夐敭鏍囪瘑
}
- jObject.Add("filterCategorys", jArray);//鎸夐敭鏍囪瘑
jObject.Add("pageNo", pageNo);//褰撳墠椤�
jObject.Add("pageSize", pageSize);//椤垫暟
//d.Add("zoneType", deviceId);//鍖哄煙
- var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject.ToString(), NewAPI.Api_Post_Aks_MovieLibraryPage, "褰辩墖鍒嗛〉鑾峰彇");
+ var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject, NewAPI.Api_Post_Aks_MovieLibraryPage, "褰辩墖鍒嗛〉鑾峰彇");
if (!this.DataChecking(responsePackNew, tipType))
{
return new List<MovieLibrary>();
--
Gitblit v1.8.0