From c5a873df96e4a797426e4dd5eafe5b43f7aea564 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期六, 19 十二月 2020 15:41:53 +0800 Subject: [PATCH] 20201218-2 --- HDL_ON/Entity/FunctionList.cs | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs index 0be3c7f..2b481cb 100644 --- a/HDL_ON/Entity/FunctionList.cs +++ b/HDL_ON/Entity/FunctionList.cs @@ -590,12 +590,20 @@ { if (DriverLayer.Control.Ins.IsRemote) { - var functionIds = new List<string>(); + var page = new List<string>(); + int count = 0; + foreach (var function in GetDeviceFunctionList()) { - functionIds.Add(function.deviceId); + page.Add(function.deviceId); + count++; + if (count > 9) + { + DriverLayer.Control.Ins.SendApiReadCommand(page); + page.Clear(); + } } - DriverLayer.Control.Ins.SendApiReadCommand(functionIds); + DriverLayer.Control.Ins.SendApiReadCommand(page); } else { @@ -630,7 +638,7 @@ /// <summary> /// 娣诲姞鍦烘櫙 /// </summary> - public Scene AddScene(Scene scene,out string result) + public string AddScene(Scene scene,out Scene result) { Scene tempScene = null; var pm = new HttpServerRequest(); @@ -638,12 +646,12 @@ if (revPack.Code == StateCode.SUCCESS) { var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString()); - tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId); + tempScene = sceneList.Find((obj) => obj.sid == scene.sid); var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene)); Common.FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd); } - result = revPack.Code; - return tempScene; + result = tempScene; + return revPack.Code; } #endregion -- Gitblit v1.8.0