Revert "Merge branch 'CJL-NEW' into NewFilePath"

wxr

2020-12-11 a4f57bf9dda3d52e04f537a2ca24db95761eb888

 HDL_ON/Entity/FunctionList.cs

@@ -349,6 +349,24 @@
        }

        /// <summary>
        /// 功能绑定房间
        /// </summary>
        public string FunctionsBindRooms(List<string> roomIds,List<string> deviceIds)
        {
            var pm = new HttpServerRequest();
            var pack = pm.BindDeviceToRoom(deviceIds, roomIds);
            if(pack.Code == StateCode.SUCCESS)
            {

            }
            else
            {
                Utlis.ShowTip(Shared.Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
            }
            return pack.Code;
        }

        /// <summary>
        /// 下来云端设备数据
        /// </summary>
        public void DownloadFunctionList()
@@ -370,8 +388,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 +398,7 @@
                            }
                            else
                            {
                                i++;
                                if (localFunction.modifyTime != newFunction.modifyTime)
                                {
                                    localFunction.name = newFunction.name;
@@ -398,7 +418,7 @@
                            List.IniFunctionList(newFunction.savePath);
                        }
                    }
                    MainPage.Log($"读取云端设备数据:\r\n{ pack.Data.ToString()}");
                    //MainPage.Log($"读取云端设备数据:\r\n{ pack.Data.ToString()}");
                }
                else
                {
@@ -419,7 +439,7 @@
                var pack = pm.GetSceneList();
                if(pack.Code == StateCode.SUCCESS)
                {
                    MainPage.Log($"读取云端场景数据:\r\n{pack.Data.ToString()}");
                    //MainPage.Log($"读取云端场景数据:\r\n{pack.Data.ToString()}");
                    var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                    if (sceneList != null)
                    {
@@ -431,8 +451,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 +461,7 @@
                            }
                            else
                            {
                                i++;
                                if (localScene.modifyTime != newScene.modifyTime)
                                {
                                    localScene.name = newScene.name;