~wxr/Santan-OnPro.git

			@@ -7,11 +7,13 @@
			using HDL_ON.Entity;
			using System.Threading;
			using HDL_ON.DriverLayer;
			using System.Collections.Generic;

			namespace HDL_ON
			{
			/// <summary>
			/// HDLCommon
			/// 暂时没用
			/// </summary>
			public class HDLCommon
			{
			@@ -81,68 +83,6 @@
			/// </summary>
			public void CheckIfNeedForceUpdate()
			{
			System.Threading.Tasks.Task.Run(() =>
			{
			try
			{
			var revertObj = new HttpServerRequest().CheckAppVersion();
			if (revertObj.Code == StateCode.SUCCESS)
			{
			if (revertObj.Data != null)
			{
			var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(revertObj.Data.ToString());
			if (appVersionRes != null)
			{

			var mForceUpdateInfo = new UpdateDialogInfo()
			{
			UpdateType = appVersionRes.isEnforce ? 2 : 1,
			NewVersion = appVersionRes.version,
			NewVersionUrl = appVersionRes.packageUrl
			};
			#if __IOS__
			mForceUpdateInfo.NewVersionUrl = appVersionRes.packageUrl;
			#endif
			//解析更新内容详情
			//var reasonStrJson = GetReasonStrJson(appVersionRes.remark);
			//if (reasonStrJson != null)
			//{
			// if (Language.CurrentLanguage == "Chinese")
			// {
			// mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
			// }
			// else
			// {
			// mForceUpdateInfo.ReasonStr = reasonStrJson.English;
			// }
			//}
			mForceUpdateInfo.ReasonStr = appVersionRes.remark;

			if (appVersionRes.version != MainPage.VersionString)
			{
			Application.RunOnMainThread(() =>
			{
			ShowForceUpdateDialog(mForceUpdateInfo);
			});
			}
			}
			}
			}
			else
			{
			Utlis.WriteLine("请求失败");
			}
			}
			catch (Exception ex)
			{
			//Shared.Utlis.WriteLine (ex.ToString ());
			}
			finally
			{

			}

			});

			}

			@@ -173,62 +113,6 @@
			/// </summary>
			public void ShowForceUpdateDialog(UpdateDialogInfo mUpdateDialogInfo)
			{
			// 1.1 没有更新返回
			if (mUpdateDialogInfo.UpdateType == 0) return;
			// 1.2 有新版本但是忽略过返回
			if (mUpdateDialogInfo.UpdateType == 1 && (OnAppConfig.Instance.IgnoreUpdateVersion == mUpdateDialogInfo.NewVersion)) return;
			// 2.1 有新版本没有忽略过提示更新
			if (mUpdateDialogInfo.UpdateType == 1)
			{
			Action okAction = () =>
			{
			if (string.IsNullOrEmpty(mUpdateDialogInfo.NewVersionUrl)) return;

			HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
			};

			Action cancelAction = () =>
			{
			OnAppConfig.Instance.IgnoreUpdateVersion = mUpdateDialogInfo.NewVersion;
			OnAppConfig.Instance.SaveConfig();
			};

			//1提示更新
			var dialog = new UpdateTipDialog();
			var tipStr = Language.StringByID(StringId.VersionNumber) + mUpdateDialogInfo.NewVersion;
			dialog.ShowUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mUpdateDialogInfo.ReasonStr, okAction, cancelAction);

			}
			else if (mUpdateDialogInfo.UpdateType == 2) //2.2 需要强制更新
			{
			//2强制更新
			//"1.发现新版本App,当前版本已停用,马上更新!\n2.请下载和安装新版本!....."
			Action okAction = () =>
			{
			if (string.IsNullOrEmpty(mUpdateDialogInfo.NewVersionUrl))
			{
			Utlis.ShowTip(Language.StringByID(StringId.DataExceptionPleaseTryAgain));
			return;
			};

			HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
			};

			//1提示更新
			var dialog = new UpdateTipDialog();
			var tipStr = Language.StringByID(StringId.VersionNumber) + mUpdateDialogInfo.NewVersion;
			dialog.ShowForcedUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mUpdateDialogInfo.ReasonStr, okAction);
			}
			else //3. 只需提示
			{
			//3提示通知
			Action okAction = () =>
			{

			};
			var dialog = new UpdateTipDialog();
			dialog.ShowTipDialog(Language.StringByID(StringId.Tip), mUpdateDialogInfo.ReasonStr, okAction);
			}
			}

			#endregion
			@@ -258,10 +142,12 @@
			{
			try
			{
			//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();
			}
			@@ -273,41 +159,174 @@
			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.HDL_INTERPHONE.ToString()))
			//else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
			//{
			// if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;

			// ESVideoInfo eSVideoInfo = GetESOnVideoJson(jpushMessageInfo.expantContent);

			// if (eSVideoInfo == null) return;

			// if (string.IsNullOrEmpty(eSVideoInfo.uuid)) return;

			// if (eSVideoInfo.uuid.Contains(","))
			// {
			// var uuid = eSVideoInfo.uuid.Split(',');
			// eSVideoInfo.ESVideoUUID = uuid[0];
			// }
			// else
			// {
			// eSVideoInfo.ESVideoUUID = eSVideoInfo.uuid;
			// }

			// ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.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


			//1.视对讲厂家类型
			string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
			if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
			ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
			//2.根据可视对讲厂家类型，处理不同的数据
			//if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
			//{
			// //大华乐橙
			// eSVideoInfo.callId = json["callId"].ToString();
			// //eSVideoInfo.Lc_AccessToken = UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken;//json["subAccountToken"].ToString();//
			// eSVideoInfo.Lc_AccessToken = json["subAccountToken"].ToString();//2021-05-13 目前云端还没拿到Lc_AccessToken，目前没办法正常使用
			// eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
			// eSVideoInfo.Lc_Location = OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1;
			// eSVideoInfo.Lc_PlayToken = json["token"].ToString();
			// //eSVideoInfo.Lc_Psk = json["cname"].ToString();
			// eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK字段不能取cname
			//}
			//else
			if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
			{
			var pushTime = json["pushTime"];
			if (!string.IsNullOrEmpty(pushTime.ToString()))
			//萤石猫眼
			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()))
			{
			var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
			if (pushDateTime.AddSeconds(30) < DateTime.Now)
			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();
			eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
			eSVideoInfo.DeviceName = json["deviceName"].ToString();
			eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
			eSVideoInfo.spk = json["spk"].ToString();

			//ShowAlert("狄耐克门口机呼叫");
			//打开呼叫页面
			HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString());
			return;
			}
			catch { }
			//else if (interphoneTypeEnum == InterphoneType.FREEVIEW.ToString())
			//{
			// //全视通 Linphone 狄耐克
			// eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
			// eSVideoInfo.callId = json["callId"].ToString();
			// eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
			// eSVideoInfo.DeviceName = json["deviceName"].ToString();
			// eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
			// eSVideoInfo.spk = json["spk"].ToString();

			// //ShowAlert("狄耐克门口机呼叫");
			// //打开呼叫页面
			// HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString());
			// return;
			//}

			//3.打开呼叫页面
			if (eSVideoInfo == null) return;
			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 == (PushMessageType.DOOR_BELL.ToString()))
			//{
			// //萤石门锁推送
			// //HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
			//}


			}
			}
			catch (Exception EX)
			{
			Utlis.WriteLine("catch: " + EX.ToString());
			}
			}
			//{"code":0,"data":{"list":[{"createTime":"1625798305115","modifyTime":"1625798305115","region":"100000000000000001","id":"1413326644794294273","alarmId":"20210709103818-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103818-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:38:17","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{"createTime":"1625798057197","modifyTime":"1625798057197","region":"100000000000000001","id":"1413325604946640898","alarmId":"20210709103413-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103413-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:34:12","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797973320","modifyTime":"1625797973320","region":"100000000000000001","id":"1413325253141004289","alarmId":"20210709103236-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103236-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:32:31","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797782136","modifyTime":"1625797782136","region":"100000000000000001","id":"1413324451261382658","alarmId":"20210709102937-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102937-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:29:37","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797668771","modifyTime":"1625797668771","region":"100000000000000001","id":"1413323975769915394","alarmId":"20210709102743-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102743-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:27:42","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797539846","modifyTime":"1625797539846","region":"100000000000000001","id":"1413323435023466498","alarmId":"20210709102534-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102534-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:25:34","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797530627","modifyTime":"1625797530627","region":"100000000000000001","id":"1413323396351983618","alarmId":"20210709102525-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102525-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:25:25","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625796028089","modifyTime":"1625796028089","region":"100000000000000001","id":"1413317094255034369","alarmId":"20210709100024-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709100024-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:00:23","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625795974558","modifyTime":"1625795974558","region":"100000000000000001","id":"1413316869729746946","alarmId":"20210709095931-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709095931-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T09:59:31","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625795966933","modifyTime":"1625795966933","region":"100000000000000001","id":"1413316837748178946","alarmId":"20210709095923-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"人体感应事件","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709095923-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T09:59:22","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"}],"totalCount":"13","totalPage":"2","pageNo":"1","pageSize":"10"},"timestamp":"1625807415164","isSuccess":true}
			//{"platform":"1","timestamp":"1625805660249","appKey":"HDL-HOME-APP-TEST","sign":"02e433c40485b30451ebdc5ca3cd959c","deviceSerial":"F41014762","homeId":"1396717478877241345"}
			/// <summary>
			/// 解析丰林可视对讲推送数据
			/// </summary>
			/// <param name="jsonStr"></param>
			/// <returns></returns>
			ESVideoInfo GetESOnVideoJson(string jsonStr)
			{
			try
			{
			if (!string.IsNullOrEmpty(jsonStr))
			{
			return Newtonsoft.Json.JsonConvert.DeserializeObject<ESVideoInfo>(jsonStr);
			}
			return null;
			}
			catch
			{
			return null;
			}
			}

			@@ -318,11 +337,24 @@
			/// </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)
			{
			case "464027401@qq.com":
			case "13580507523":
			case "15626203746":
			case "18316672920":

			return;
			}

			@@ -332,7 +364,14 @@
			//账号在别处登陆，被踢下线跳转到登录页面
			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>
			@@ -355,12 +394,18 @@
			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__
			//.清空Siri共享数据信息
			//new Other.SkipControl().SetData(false, "", "", "","");
			//var sDM = new SiriKit.SceneDateManager();
			//Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
			//5.全视通登出
			//Shared.IOS.HDLFVSDK.Video.Logout();
			//6.清空Siri共享数据信息
			new Other.SkipControl().SetData(false, "", "", "", "");
			var sDM = new SiriKit.SceneDateManager();
			Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
			#endif
			}
			catch (Exception ex)
			@@ -373,6 +418,7 @@
			{
			if (waitPage != null)
			{
			waitPage.Hide();
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			@@ -420,9 +466,9 @@
			MainPage.CurPageIndex = 9999;
			MainPage.UserBasePage.ChooseCollection();
			#if __IOS__
			//var sdm = new SiriKit.SceneDateManager();
			//sdm.RegionUrl = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
			//sdm.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			var sdm = new SiriKit.SceneDateManager();
			sdm.RegionUrl = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
			sdm.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			#endif
			}
			}
			@@ -463,9 +509,9 @@

			}

			#endregion
			#endregion

			#region ■ 常用方法_______________________
			#region ■ 常用方法_______________________
			/// <summary>
			/// 设置下划线按钮状态
			/// 统一封装设置方法
			@@ -526,7 +572,7 @@
			if (internetStatus == 0)//没有网络连接 0
			{
			MainPage.InternetStatus = 0;
			DAL.Mqtt.MqttClient.InitState();
			//DAL.Mqtt.MqttClient.DisConnectRemote();//.InitState();
			}
			else if (internetStatus == 1)//3,4G的网络连接 1
			{
			@@ -540,9 +586,9 @@
			Control.Ins.SearchLoaclGateway();
			}
			}
			#endregion
			#endregion

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

			/// <summary>
			/// 获取子账号token并跳转设备列表页面
			@@ -558,6 +604,7 @@
			{
			try
			{
			//var list = UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockLockModelsList();
			//先获取萤石云子账号token
			var result = new HttpServerRequest().EZGetChildToken();
			if (result.Code == StateCode.SUCCESS)
			@@ -569,7 +616,9 @@
			{
			if (!string.IsNullOrEmpty(ezChildAccessToken))
			{

			#if __IOS__

			//iOS
			//初始化萤石云SDK，中文国内key、英文海外key 开发者账号使用应用包名申请的APPKEY，不同包名应用需配置不同的APPKEY
			EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
			@@ -578,12 +627,25 @@
			EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
			//2.设置萤石子账号的AccessToken到SDK
			EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
			////3.打开摄像头设备列表页面
			EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();

			//////3.打开摄像头设备列表页面
			//EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();

			//EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
			//info.de
			//EZSDK.IOS.EZSDK.Play(info);

			//2023年03月29日13:08:35 修改
			Foundation.NSObject[] nSObject = new Foundation.NSObject[list.Count];
			for (int i = 0; i < list.Count; i++)
			{
			string strValue = list[i];
			nSObject[i] = new Foundation.NSString(strValue);
			}
			EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(nSObject);



			#else
			//Android
			//1.设置所需河东的token、域名地址
			@@ -595,21 +657,25 @@
			{
			((BaseActivity)Shared.Application.Activity).SetPermission(result =>
			{
			if(result)
			{
			Android.Content.Intent intent = new Android.Content.Intent();
			var bundle = new Android.OS.Bundle();
			//传递name参数为tinyphp
			bundle.PutString("EzChildAccessToken", ezChildAccessToken);
			bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
			bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
			bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
			bundle.PutInt("Platform", 1);
			bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
			intent.PutExtras(bundle);
			intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
			Shared.Application.Activity.StartActivity(intent);
			}
			//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,
			HttpUtil.APP_KEY,HttpUtil.SECRET_KEY);
			Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, new List<String>());
			//if (result)
			//{
			// Android.Content.Intent intent = new Android.Content.Intent();
			// var bundle = new Android.OS.Bundle();
			// //传递name参数为tinyphp
			// bundle.PutString("EzChildAccessToken", ezChildAccessToken);
			// bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
			// bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
			// bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
			// bundle.PutInt("Platform", 1);
			// bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
			// intent.PutExtras(bundle);
			// intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
			// Shared.Application.Activity.StartActivity(intent);
			//}
			}, "android.permission.RECORD_AUDIO");

			}
			@@ -644,6 +710,6 @@
			{ IsBackground = true }.Start();
			}

			#endregion
			#endregion
			}
			}