20201222-1

wei

2020-12-22 d07d62be7111d78b2aaa44c9cdee23a7d22b4dda

 HDL_ON/Entity/FunctionList.cs

old mode 100755
new mode 100644
@@ -207,7 +207,7 @@
            }
            try
            {
                deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
                deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
            }
            catch (Exception ex)
            {
@@ -399,10 +399,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 +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

@@ -687,6 +695,9 @@
                case FunctionAttributeKey.Percent:
                    text = Language.StringByID(StringId.PercentAdjustment);
                    break;
                case FunctionAttributeKey.FadeTime:
                    text = Language.StringByID(StringId.FadeSpeed);
                    break;
            }
            return text;
        }