wei
2021-06-02 e13a9980ce617db1394a76944186c5d5bd595d5d
HDL_ON/Common/ApiUtlis.cs
@@ -187,34 +187,37 @@
                        {
                            sceneList = new List<Scene>();
                        }
                        for (int i = 0; i < FunctionList.List.scenes.Count;)
                        {
                            var localScene = FunctionList.List.scenes[i];
                            if (localScene == null)
                            {
                                FunctionList.List.scenes.Remove(localScene);
                                continue;
                            }
                            var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                            if (newScene == null)//如果云端最新数据没有该条数据,则本地需要删掉该数据记录
                            {
                                FunctionList.List.DeleteScene(localScene, false);
                            }
                            else
                            {
                                i++;
                                if (localScene.modifyTime != newScene.modifyTime)
                                {
                                    localScene.name = newScene.name;
                                    localScene.collect = newScene.collect;
                                    localScene.modifyTime = newScene.modifyTime;
                                    localScene.roomIds = newScene.roomIds;
                                    localScene.image = newScene.image;
                                    localScene.SaveSceneFile();
                                }
                                sceneList.Remove(newScene);//操作完的数据清理掉,剩下的就是新增的功能
                            }
                        }
                        //for (int i = 0; i < FunctionList.List.scenes.Count;)
                        //{
                        //    var localScene = FunctionList.List.scenes[i];
                        //    if (localScene == null)
                        //    {
                        //        FunctionList.List.scenes.Remove(localScene);
                        //        continue;
                        //    }
                        //    var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                        //    if (newScene == null)//如果云端最新数据没有该条数据,则本地需要删掉该数据记录
                        //    {
                        //        FunctionList.List.DeleteScene(localScene, false);
                        //    }
                        //    else
                        //    {
                        //        i++;
                        //        if (localScene.modifyTime != newScene.modifyTime)
                        //        {
                        //            localScene.name = newScene.name;
                        //            localScene.collect = newScene.collect;
                        //            localScene.modifyTime = newScene.modifyTime;
                        //            localScene.roomIds = newScene.roomIds;
                        //            localScene.image = newScene.image;
                        //            localScene.SaveSceneFile();
                        //        }
                        //        sceneList.Remove(newScene);//操作完的数据清理掉,剩下的就是新增的功能
                        //    }
                        //}
                        FunctionList.List.scenes.Clear();
                        //处理剩下的新增功能
                        foreach (var tempScene in sceneList)
                        {
@@ -362,14 +365,14 @@
            var pack = Ins.HttpRequest.GetSecurityList();
            if (pack.Code == StateCode.SUCCESS)
            {
                var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Security>>(pack.Data.ToString());
                var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
                var sidList = new List<string>();
                foreach (var function in packList)
                {
                    sidList.Add(function.sid);
                }
                var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
                var infoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Security>>(infoListPack.Data.ToString());
                var infoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
                foreach (var function in infoList)
                {
                    function.SaveFile();