~wxr/OnPro.git - Gitblit

			@@ -92,6 +92,7 @@
			var waitPage = new Loading();
			MainPage.BaseView.AddChidren(waitPage);
			waitPage.Start(Language.StringByID(StringId.PleaseWait));


			string code = StateCode.SUCCESS;

			@@ -99,11 +100,43 @@

			var downloadDataThread = new System.Threading.Thread(() =>
			{
			try
			{//增加3秒云服务器连接检测，连不上服务器的时候不刷新数据
			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);
			if (revertObj == null \|\| revertObj.Code != StateCode.SUCCESS)
			{
			DownloadDataComplete = true;
			return;
			}
			}
			catch (Exception ex)
			{
			MainPage.Log($"Error：下载数据1：{ex.Message}");
			DownloadDataComplete = true;
			return;
			}
			MainPage.Log($"进入读取云端数据线程");
			//===================刷新Token=======================
			code = Ins.HttpRequest.RefreshToken();
			if (code != StateCode.SUCCESS)
			{
			if (waitPage != null)
			{
			Application.RunOnMainThread(() =>
			{
			try
			{
			waitPage.Hide();
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			catch { }
			});
			}
			MainPage.Log($"刷新token失败");
			return;
			}
			@@ -112,6 +145,19 @@
			code = Ins.HttpRequest.GetHomePager();
			if (code != StateCode.SUCCESS)
			{
			if (waitPage != null)
			{
			Application.RunOnMainThread(() =>
			{
			try
			{
			waitPage.Hide();
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			catch { }
			});
			}
			MainPage.Log($"刷新住宅信息失败");
			return;
			}
			@@ -120,6 +166,19 @@
			code = Ins.HttpRequest.GetUserInfo();
			if (code != StateCode.SUCCESS)
			{
			if (waitPage != null)
			{
			Application.RunOnMainThread(() =>
			{
			try
			{
			waitPage.Hide();
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			catch { }
			});
			}
			MainPage.Log($"刷新个人信息失败");
			return;
			}
			@@ -178,7 +237,7 @@
			FunctionList.List.ClearDatas();
			//MainPage.Log($"============设备============开始" + FunctionList.List.Functions.Count);
			//MainPage.Log($"读取设备信息成功");
			//MainPage.Log($"sid列表获取====" + deviceResult.Data.ToString());
			MainPage.Log($"sid列表获取====\r\n" , deviceResult.Data.ToString());
			var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
			if (deviceList == null)
			{
			@@ -257,8 +316,10 @@
			string videoList = videoInfo.Data.ToString();
			FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);

			foreach (var video in FunctionList.List.videoIntercom)
			for(int i =0;i< FunctionList.List.videoIntercom.Count;i++)
			{
			var video = FunctionList.List.videoIntercom[i];

			if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
			{
			UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
			@@ -272,11 +333,23 @@
			}
			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;
			DB_ResidenceData.Instance.SupportFacePass = true;
			Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
			Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
			isInterphoneType_FREEVIEW = true;
			#endif
			}
			}
			}
			@@ -286,6 +359,7 @@
			//如果检测线程没启动，才继续下面操作因为App有可能刚启动马上收到推送了，然后才执行到这里
			if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
			{

			//当前住宅是HDL可视对讲类型的设备
			if (isInterphoneType_HDL)
			{
			@@ -353,6 +427,7 @@
			}


			//======================群控====================
			if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
			{
			var pack = Ins.HttpRequest.GetGroupControlList();
			@@ -385,6 +460,7 @@
			}
			readSidList.Clear();
			}
			//FunctionList.List.Functions.AddRange(FunctionList.List.groupControls);
			}
			if (readSidList.Count > 0)
			{
			@@ -479,11 +555,12 @@

			//======================安防====================
			GetSecurityList();

			//===================读取逻辑列表====================
			Logic.LogicList.Clear();//主页下拉强制刷新自动化列表
			MainView.GetLogicList();//读取自动化列表
			})
			{ IsBackground = true }.Start();

			//===================读取逻辑列表==========================
			Logic.LogicList.Clear();//主页下拉强制刷新自动化列表

			//======================注册推送====================
			httpRequest.RegisteredPush();