2020-12-11-1

陈嘉乐

2020-12-11 0414d9754bc61b5e496930ff184ede647ab4cc3a

 HDL_ON/Entity/FunctionList.cs

@@ -193,7 +193,7 @@
        /// </summary>
        public List<Function> GetAllDeviceFunctionList()
        {
            //if (deviceFunctionList == null)
            if (deviceFunctionList == null || deviceFunctionList.Count == 0)
            {
                deviceFunctionList = new List<Function>();
                deviceFunctionList.AddRange(aCs);
@@ -370,8 +370,9 @@
                        //    }
                        //})
                        //{ IsBackground = true }.Start();
                        foreach (var localFunction in List.GetAllDeviceFunctionList())
                        for (int i =0;i < List.GetAllDeviceFunctionList().Count;)
                        {
                            var localFunction = List.GetAllDeviceFunctionList()[i];
                            var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
                            if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                            {
@@ -379,6 +380,7 @@
                            }
                            else
                            {
                                i++;
                                if (localFunction.modifyTime != newFunction.modifyTime)
                                {
                                    localFunction.name = newFunction.name;
@@ -431,8 +433,9 @@
                        //    }
                        //})
                        //{ IsBackground = true }.Start();
                        foreach (var localScene in List.scenes)
                        for(int i=0;i<List.scenes.Count;)
                        {
                            var localScene = List.scenes[i];
                            var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                            if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                            {
@@ -440,6 +443,7 @@
                            }
                            else
                            {
                                i++;
                                if (localScene.modifyTime != newScene.modifyTime)
                                {
                                    localScene.name = newScene.name;