~wxr/OnPro.git - Gitblit

			@@ -258,12 +258,12 @@
			{
			try
			{
			MainPage.Log($"接收到推送");
			//Console.WriteLine($"接收到推送，，，，.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");

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

			if (jpushMessageInfo.Extras.Contains(PushMessageType.OffLine.ToString()))
			if (jpushMessageInfo.Extras == (PushMessageType.OffLine.ToString()))
			{
			CheckLogout();
			}
			@@ -275,14 +275,14 @@
			if (string.IsNullOrEmpty(jpushMessageInfo.messageType)) return;

			//报警推送才弹窗提示（messageType包含Alarm关键字的）
			if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
			if (jpushMessageInfo.messageType == (PushMessageType.Alarm.ToString()))
			{
			//报警推送弹窗提示
			ShowAlarmPushMessage(jpushMessageInfo, true);
			//萤石门锁推送
			HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
			}
			else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString()))
			else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
			{
			if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;

			@@ -305,26 +305,14 @@
			ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.ToString());

			}
			else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
			else if (jpushMessageInfo.messageType == (PushMessageType.HDL_INTERPHONE.ToString()))
			{

			if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;

			//字段兼容问题，只能直接取值了
			var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
			try
			{
			var pushTime = json["pushTime"];
			if (!string.IsNullOrEmpty(pushTime.ToString()))
			{
			var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
			if (pushDateTime.AddSeconds(30) < DateTime.Now)
			{
			return;
			}
			}
			}
			catch { }


			//1.视对讲厂家类型
			string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
			@@ -348,10 +336,38 @@
			//萤石猫眼
			eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"子账号token
			eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//设备序列号
			eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
			eSVideoInfo.spk = json["spk"].ToString();

			eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
			if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString()))
			{
			eSVideoInfo.msgId = json["msgId"].ToString();
			}
			if (json.ContainsKey("currentTime") && !string.IsNullOrEmpty(json["currentTime"].ToString()))
			{
			eSVideoInfo.currentTime = json["currentTime"].ToString();
			}
			}
			else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
			{
			try
			{
			var pushTime = json["pushTime"];
			if (pushTime == null)
			{
			return;
			}
			if (!string.IsNullOrEmpty(pushTime.ToString()))
			{
			var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
			if (pushDateTime.AddSeconds(30) < DateTime.Now)
			{
			return;
			}
			}
			}
			catch { }
			//HDL Linphone 狄耐克
			eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
			eSVideoInfo.callId = json["callId"].ToString();
			@@ -386,13 +402,13 @@
			ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);

			}
			else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
			else if (jpushMessageInfo.messageType == (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()))
			else if (jpushMessageInfo.messageType == (PushMessageType.DOOR_BELL.ToString()))
			{
			//萤石门锁推送
			HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
			@@ -450,7 +466,10 @@
			switch (UserInfo.Current.AccountString)
			{
			case "464027401@qq.com":
			case "13580507523":
			case "15626203746":
			case "18316672920":

			return;
			}

			@@ -496,7 +515,7 @@

			#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();
			@@ -667,7 +686,7 @@
			if (internetStatus == 0)//没有网络连接 0
			{
			MainPage.InternetStatus = 0;
			DAL.Mqtt.MqttClient.InitState();
			//DAL.Mqtt.MqttClient.DisConnectRemote();//.InitState();
			}
			else if (internetStatus == 1)//3,4G的网络连接 1
			{
			@@ -753,7 +772,8 @@
			((BaseActivity)Shared.Application.Activity).SetPermission(result =>
			{
			//2023年03月29日13:08:35 修改
			Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
			Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id,
			HttpUtil.APP_KEY, HttpUtil.SECRET_KEY);
			Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
			//if (result)
			//{
			@@ -783,7 +803,8 @@
			}
			else
			{
			IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
			if (result.Code != "-1")
			IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
			}
			}
			catch (Exception ex)