From 46cfc3decb9f162129e2dd6fad85aada638a9a3f Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 22 十二月 2020 20:38:08 +0800 Subject: [PATCH] 20201222-5 --- HDL_ON/Entity/FunctionList.cs | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs index 0be3c7f..aaacb3c 100644 --- a/HDL_ON/Entity/FunctionList.cs +++ b/HDL_ON/Entity/FunctionList.cs @@ -91,10 +91,18 @@ /// </summary> public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>(); + public List<Scene> scenes = new List<Scene>(); /// <summary> /// 鍦烘櫙鍒楄〃 /// </summary> - public List<Scene> scenes = new List<Scene>(); + //public List<Scene> Scenes + //{ + // get + // { + // List.scenes = List.scenes.OrderByDescending(o => o.createTime).ToList(); + // return List.scenes; + // } + //} /// <summary> /// 鍔熻兘鍒楄〃 /// </summary> @@ -207,7 +215,7 @@ } try { - deviceFunctionList.OrderByDescending(o => o.usageCount).ToList(); + deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList(); } catch (Exception ex) { @@ -399,10 +407,10 @@ } else { + MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}"); i++; if (localFunction.modifyTime != newFunction.modifyTime) { - MainPage.Log($"local:{localFunction.modifyTime}\r\n server:{newFunction.modifyTime}"); localFunction.name = newFunction.name; localFunction.collect = newFunction.collect; localFunction.modifyTime = newFunction.modifyTime; @@ -590,12 +598,21 @@ { 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(); + count = 0; + } } - DriverLayer.Control.Ins.SendApiReadCommand(functionIds); + DriverLayer.Control.Ins.SendApiReadCommand(page); } else { @@ -630,7 +647,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 +655,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 @@ -687,6 +704,9 @@ case FunctionAttributeKey.Percent: text = Language.StringByID(StringId.PercentAdjustment); break; + case FunctionAttributeKey.FadeTime: + text = Language.StringByID(StringId.FadeSpeed); + break; } return text; } -- Gitblit v1.8.0