20201218-2

wei

2020-12-19 c5a873df96e4a797426e4dd5eafe5b43f7aea564

 HDL_ON/Entity/FunctionList.cs

@@ -407,7 +407,7 @@
                                        localFunction.collect = newFunction.collect;
                                        localFunction.modifyTime = newFunction.modifyTime;
                                        localFunction.roomIds = newFunction.roomIds;
                                        localFunction.bus_Data = newFunction.bus_Data;
                                        localFunction.bus = newFunction.bus;
                                        localFunction.SaveFunctionData(false);
                                    }
                                    deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能
@@ -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
                    {
@@ -626,7 +634,26 @@
            })
            { IsBackground = true }.Start();
        }

        #region 场景相关
        /// <summary>
        /// 添加场景
        /// </summary>
        public string AddScene(Scene scene,out Scene result)
        {
            Scene tempScene = null;
            var pm = new HttpServerRequest();
            var revPack = pm.AddScene(scene);
            if (revPack.Code == StateCode.SUCCESS)
            {
                var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
                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 = tempScene;
            return revPack.Code;
        }
        #endregion

        #region 功能文本相关
        /// <summary>