~wxr/OnPro.git - Gitblit

			@@ -258,6 +258,8 @@
			{
			try
			{
			MainPage.Log($"接收到推送");

			//Extras为空不处理
			if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;

			@@ -277,6 +279,8 @@
			{
			//报警推送弹窗提示
			ShowAlarmPushMessage(jpushMessageInfo, true);
			//萤石门锁推送
			HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
			}
			else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString()))
			{
			@@ -385,22 +389,16 @@
			else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
			{
			ShowAlarmPushMessage(jpushMessageInfo, false);
			//萤石门锁推送
			HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
			}
			else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
			{
			try
			{
			if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
			var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.VideoDoorLock.ExpantContent>(jpushMessageInfo.expantContent);
			if (expantContent == null)
			{
			return;
			}
			///视频门锁
			HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
			}
			catch { }
			//萤石门锁推送
			HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
			}


			}
			}
			catch (Exception EX)
			@@ -438,6 +436,16 @@
			/// </summary>
			public void CheckLogout()
			{
			#if __IOS__
			try{
			HDL_ON_iOS.AppDelegate.rootViewController.PopToRootViewController(false);
			}catch(Exception ex){
			MainPage.Log($"回到跟类失败:{ex.Message}");
			}
			#else
			//Application.Activity.StartActivity()
			#endif

			//测试账号，不挤下线
			switch (UserInfo.Current.AccountString)
			{
			@@ -452,7 +460,13 @@
			//账号在别处登陆，被踢下线跳转到登录页面
			new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();

			Logout();
			try
			{
			Logout();
			}catch (Exception ex)
			{
			MainPage.Log($"挤下线异常:{ex.Message}");
			}
			}

			/// <summary>
			@@ -475,12 +489,14 @@
			UserInfo.Current.LastTime = DateTime.MinValue;
			UserInfo.Current.SaveUserInfo();
			DB_ResidenceData.Instance.EixtAccount();
			MainPage.Log("退出账号清空数据");
			//4.注销HDLSIP账号登录 2021-08-20
			HDLLinphone.Current.LogoutAllAccount();
			MainPage.Log("注销HDLSIP账号登录");

			#if __IOS__
			//5.全视通登出
			Shared.IOS.HDLFVSDK.Video.Logout();
			//Shared.IOS.HDLFVSDK.Video.Logout();
			//6.清空Siri共享数据信息
			new Other.SkipControl().SetData(false, "", "", "", "");
			var sDM = new SiriKit.SceneDateManager();
			@@ -497,6 +513,7 @@
			{
			if (waitPage != null)
			{
			waitPage.Hide();
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			@@ -587,9 +604,9 @@

			}

			#endregion
			#endregion

			#region ■ 常用方法_______________________
			#region ■ 常用方法_______________________
			/// <summary>
			/// 设置下划线按钮状态
			/// 统一封装设置方法
			@@ -664,9 +681,9 @@
			Control.Ins.SearchLoaclGateway();
			}
			}
			#endregion
			#endregion

			#region 跳转打开萤石云方法
			#region 跳转打开萤石云方法

			/// <summary>
			/// 获取子账号token并跳转设备列表页面
			@@ -787,6 +804,6 @@
			{ IsBackground = true }.Start();
			}

			#endregion
			#endregion
			}
			}