wei
2020-12-24 22fcd0d263770c8371bd03ca53f097a6ec1678f7
HDL_ON/Common/ApiUtlis.cs
@@ -217,8 +217,6 @@
                        if (sceneList == null)
                        {
                            sceneList = new List<Scene>();
                        }
                        {
                            for (int i = 0; i < FunctionList.List.scenes.Count;)
                            {
                                var localScene = FunctionList.List.scenes[i];
@@ -256,20 +254,28 @@
                        //如果是一端口需要提前下载场景数据,否则控制不了一端口场景
                        if (DB_ResidenceData.Instance.GatewayType == 0)
                        {
                            var sceneIds = new List<string>();
                            foreach (var tempScene in FunctionList.List.scenes)
                            {
                                var pcak = HttpRequest.GetSceneInfo(tempScene.userSceneId);
                                if (pack.Code == StateCode.SUCCESS)
                                sceneIds.Add(tempScene.userSceneId);
                            }
                            var packInfo = HttpRequest.GetSceneListInfo(sceneIds);
                            if (packInfo.Code == StateCode.SUCCESS)
                            {
                                var serverTempList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(packInfo.Data.ToString());
                                foreach (var localScene in FunctionList.List.scenes)
                                {
                                    var serverTempList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                                    var serverTemp = serverTempList.Find((obj) => obj.userSceneId == tempScene.userSceneId);
                                    tempScene.functions = serverTemp.functions;
                                    tempScene.SaveSceneFile();
                                    var serverTemp = serverTempList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                                    if (serverTemp != null)
                                    {
                                        localScene.functions = serverTemp.functions;
                                        localScene.SaveSceneFile();
                                    }
                                }
                                else
                                {
                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                                }
                            }
                            else
                            {
                                IMessageCommon.Current.ShowErrorInfoAlter(packInfo.Code);
                            }
                        }
                        endTime = DateTime.Now.AddSeconds(5);