~wxr/OnPro.git - Gitblit

			@@ -72,6 +72,8 @@
			/// 下载数据完成标记
			/// </summary>
			public bool DownloadDataComplete = false;

			public bool hadInternet = true;
			/// <summary>
			/// 下载数据
			/// </summary>
			@@ -97,20 +99,19 @@
			string code = StateCode.SUCCESS;

			Inverter.Ins.H5Page = null;//重置光伏页面

			var downloadDataThread = new System.Threading.Thread(() =>
			{
			try
			{
			//增加3秒云服务器连接检测，连不上服务器的时候不刷新数据
			hadInternet = true;
			var dataList = new List<GlobalRegionListRes>();
			var requestJson = HttpUtil.GetSignRequestJson(new GetRegionListObj() { regionMark = HttpUtil.RegionMark });
			Console.WriteLine(DateTime.Now);
			var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GlobalRegionList, requestJson, HttpUtil.GlobalRequestHttpsHost,"",3);
			Console.WriteLine(DateTime.Now);
			var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GlobalRegionList, requestJson, HttpUtil.GlobalRequestHttpsHost, "", 3);
			if (revertObj == null \|\| revertObj.Code != StateCode.SUCCESS)
			{
			DownloadDataComplete = true;
			hadInternet = false;
			try
			{
			var spatialInfoDataBytes = FileUtlis.Files.ReadFile("SpatialInfoData");
			@@ -146,12 +147,30 @@

			return;
			}
			else
			{
			hadInternet = true;
			}
			}
			catch (Exception ex)
			{
			MainPage.Log($"Error：下载数据1：{ex.Message}");
			DownloadDataComplete = true;
			return;
			}
			finally
			{
			if (!hadInternet)
			{
			Application.RunOnMainThread(() =>
			{
			if (waitPage != null)
			{
			waitPage.Hide();
			waitPage.RemoveFromParent();
			}
			});
			}
			}
			MainPage.Log($"进入读取云端数据线程");
			//===================刷新Token=======================
			@@ -354,7 +373,6 @@
			//}

			//======================获取可视对讲设备列表====================
			bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
			bool isInterphoneType_FREEVIEW = false;//是否为全视通可视对讲
			var videoInfo = VideoSend.GetVideoInfoList();
			if (videoInfo.Code == StateCode.SUCCESS)
			@@ -370,91 +388,7 @@
			{
			UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
			}
			else if (video.interphoneType == InterphoneType.HDL.ToString())
			{
			isInterphoneType_HDL = true;
			DB_ResidenceData.Instance.SupportFacePass = true;
			DB_ResidenceData.Instance.SaveResidenceData();
			DB_ResidenceData.Instance.SupportFVDevice = true;
			}
			else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
			{
			#if __IOS__
			try
			{
			FunctionList.List.videoIntercom.Remove(video);
			--i;
			}catch(Exception ex)
			{
			MainPage.Log($"ios 全视通异常 : {ex.Message}");
			}

			#else
			//为全视通可视对讲
			DB_ResidenceData.Instance.SupportFacePass = true;
			Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
			Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
			isInterphoneType_FREEVIEW = true;
			#endif
			}
			}
			}


			//======================获取Sip账号并且初始化SDK可视对讲设备列表====================
			//如果检测线程没启动，才继续下面操作因为App有可能刚启动马上收到推送了，然后才执行到这里
			if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
			{

			//当前住宅是HDL可视对讲类型的设备
			if (isInterphoneType_HDL)
			{
			//HDLLinphone可视对讲,获取Sip账号并初始化SDK
			HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
			callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
			HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
			}
			else if (isInterphoneType_FREEVIEW)
			{
			//HDLLinphone可视对讲,获取Sip账号并初始化SDK
			HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
			callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
			HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
			}
			else
			{
			Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
			//当前住宅不支持HDL可视对讲
			HDLLinphone.Current.LogoutAllAccount();
			}
			}



			//======================登录全视通====================
			if (isInterphoneType_FREEVIEW)
			{

			#if __IOS__
			//string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
			//string errorVersion = "16.2.0";
			//if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
			//{
			// List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
			// Dictionary<string, object> dictionary = new Dictionary<string, object>();
			// dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
			// var requestJson = HttpUtil.GetSignRequestJson(dictionary);
			// ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
			// if (pack != null)
			// {
			// var data = JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
			// //登录全视通
			// Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
			// }
			//}
			#endif
			}

			}