wei
2021-08-27 1f5fdd892e8efc9f1babe1ace9d810803edef396
HDL_ON/Common/ApiUtlis.cs
@@ -204,7 +204,7 @@
                    {
                        endTime = DateTime.Now.AddSeconds(100);
                        MainPage.Log($"读取场景数据成功");
                        var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                        var sceneList = JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                        if (sceneList == null)
                        {
                            sceneList = new List<Scene>();
@@ -275,12 +275,18 @@
                            {
                                UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
                            }
                            else if(video.interphoneType == InterphoneType.HDL.ToString())
                            {
                                DB_ResidenceData.Instance.SupportFacePass = true;
                                DB_ResidenceData.Instance.SaveResidenceData();
                            }
                        }
                    }
                    //======================安防====================
                    GetSecurityList();
                    //======================SIP账号====================
                }
                catch (Exception ex)
@@ -294,8 +300,11 @@
                        MainPage.Log($"结束读取云端数据线程");
                        endTime = DateTime.MinValue;
                        DownloadDataComplete = true;
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                    });
                    //不考虑网关情况,直接订阅
                    DAL.Mqtt.MqttClient.InitState();
@@ -327,8 +336,11 @@
                    DownloadDataComplete = true;
                    Application.RunOnMainThread(() =>
                    {
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                    });
                    //初始化数据
                    //SpatialInfo.CurrentSpatial.Clear();
@@ -388,17 +400,38 @@
                }
                var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
                var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
                foreach (var function in infoList)
                if (infoList != null)
                {
                    function.SaveFile();
                    FunctionList.List.IniFunctionList(function.savePath, true);
                    var filePathList = FileUtlis.Files.ReadFiles().FindAll((obj) => obj.StartsWith("SecurityData_"));
                    if (filePathList != null)
                    {
                        foreach (var file in filePathList)
                        {
                            FileUtlis.Files.DeleteFile(file);
                        }
                    }
                    foreach (var function in infoList)
                    {
                        function.SaveFile();
                        FunctionList.List.IniFunctionList(function.savePath, true);
                    }
                }
            }
            }
            else
            {
                MainPage.Log($"读取安防列表失败:Code:{pack.Code}; Msg:{pack.message}");
            }
        }
        /// <summary>
        /// 获取SIP账号信息
        /// </summary>
        public void GetSipInfo()
        {
            var pack = Ins.HttpRequest.GetSecurityList();
        }
    }
}