~wxr/HDL_APP_Project.git

			@@ -4,6 +4,8 @@
			using HDL_ON.DAL;
			using HDL_ON.DAL.Server;
			using HDL_ON.Entity;
			using HDL_ON.UI.UI2.FuntionControlView.Video;
			using Newtonsoft.Json;
			using Shared;

			namespace HDL_ON.Common
			@@ -106,6 +108,26 @@
			}
			endTime = DateTime.Now.AddSeconds(5);
			MainPage.Log($"刷新个人信息成功");

			//int count = 0;
			//while (count < 10)
			//{
			// if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
			// {
			// System.Threading.Thread.Sleep(200);
			// }
			// else
			// {
			// break;
			// }
			// count++;
			//}
			//if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
			//{
			// return;
			//}


			try
			{
			//===================房间=======================
			@@ -165,7 +187,7 @@
			//处理剩下的新增功能
			foreach (var newFunction in deviceList.list)
			{
			MainPage.Log(newFunction.savePath);
			newFunction.AssembleStatus();
			newFunction.SaveFunctionFile();
			FunctionList.List.IniFunctionList(newFunction.savePath);
			}
			@@ -182,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>();
			@@ -229,17 +251,63 @@
			MainPage.Log($"读取云端场景数据失败:Code:{pack.Code}; Msg:{pack.message}");
			}

			//===================读取安防列表==========================
			GetSecurityList();
			//===================读取逻辑列表==========================
			UI.UI2.Intelligence.Automation.MainView.GetLogicList();

			//===================读取可视对讲数据==========================
			var flVideoInfo = HttpRequest.CheckFlVideo();
			if(flVideoInfo.Code == StateCode.SUCCESS)
			//判断是否有可视对讲数据，有则显示可视对讲icon
			//var flVideoInfo = HttpRequest.CheckFlVideo();
			//if(flVideoInfo.Code == StateCode.SUCCESS)
			//{
			// FunctionList.List.videoIntercom1111 = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
			//}

			//======================获取可视对讲设备列表====================
			bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
			var videoInfo= VideoSend.GetVideoInfoList();
			if (videoInfo.Code == StateCode.SUCCESS)
			{
			FunctionList.List.videoIntercom = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
			string videoList = videoInfo.Data.ToString();
			FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);

			foreach (var video in FunctionList.List.videoIntercom)
			{
			if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
			{
			UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
			} else if (video.interphoneType == InterphoneType.HDL.ToString()) {
			isInterphoneType_HDL = true;
			}
			else if(video.interphoneType == InterphoneType.HDL.ToString())
			{
			DB_ResidenceData.Instance.SupportFacePass = true;
			DB_ResidenceData.Instance.SaveResidenceData();
			}
			}
			}


			//======================安防====================
			GetSecurityList();
			//======================SIP账号====================

			//======================获取Sip账号并且初始化SDK可视对讲设备列表====================
			//如果检测线程没启动，才继续下面操作因为App有可能刚启动马上收到推送了，然后才执行到这里
			if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) {
			//当前住宅是HDL可视对讲类型的设备
			if (isInterphoneType_HDL)
			{
			//HDLLinphone可视对讲,获取Sip账号并初始化SDK
			HDLLinphone.Current.GetHDLSipInfoAndInitSDK(DB_ResidenceData.Instance.CurrentRegion.id);
			}
			else
			{
			Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
			//当前住宅不支持HDL可视对讲
			HDLLinphone.Current.LogoutAllAccount();
			}
			}

			}
			catch (Exception ex)
			{
			@@ -252,8 +320,11 @@
			MainPage.Log($"结束读取云端数据线程");
			endTime = DateTime.MinValue;
			DownloadDataComplete = true;
			waitPage.Hide();
			waitPage.RemoveFromParent();
			if (waitPage != null)
			{
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			});
			//不考虑网关情况，直接订阅
			DAL.Mqtt.MqttClient.InitState();
			@@ -285,8 +356,11 @@
			DownloadDataComplete = true;
			Application.RunOnMainThread(() =>
			{
			waitPage.Hide();
			waitPage.RemoveFromParent();
			if (waitPage != null)
			{
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			});
			//初始化数据
			//SpatialInfo.CurrentSpatial.Clear();
			@@ -302,6 +376,8 @@
			UI.Music.A31MusicModel.ReadMusicStates();
			//搜索网关
			DriverLayer.Control.Ins.SearchLoaclGateway();
			//重新连接mqtt
			DAL.Mqtt.MqttClient.DisConnectRemote("刷新数据，重连mqtt",false);
			#endregion
			}
			}
			@@ -318,7 +394,7 @@
			if (deviceResult.Code == StateCode.SUCCESS)
			{
			MainPage.Log($"读取设备信息成功");
			var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
			var packList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());

			foreach(var function in packList.list)
			{
			@@ -336,25 +412,46 @@
			var pack = Ins.HttpRequest.GetSecurityList();
			if (pack.Code == StateCode.SUCCESS)
			{
			var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
			var packList = 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<SecurityAlarm>>(infoListPack.Data.ToString());
			foreach (var function in infoList)
			var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
			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();
			}


			}
			}