~wjc/HomeApp.git

			@@ -685,9 +685,7 @@
			{
			tempRes = false;
			}

			NormallyOpenModeValue(tempRes);

			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
			Application.RunOnMainThread(async () =>
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist();
			@@ -1036,23 +1034,7 @@
			}
			#endregion

			#region 常开模式
			/// <summary>
			/// 门锁常开模式值
			/// </summary>
			public void NormallyOpenModeValue(bool value)
			{
			string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
			{
			doorLock.IsDoorLockNormallyMode[key] = value;
			}
			else
			{
			doorLock.IsDoorLockNormallyMode.Add(key, value);
			}
			}

			#region 常开模式
			/// <summary>
			/// 常开模式处理
			/// </summary>
			@@ -1102,7 +1084,7 @@

			//每次重新设置常开，默认时间都是12小时
			DoorLockCommonInfo.NormallyOpenModeInvalidTime = 12;
			NormallyOpenModeValue(true);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1146,8 +1128,8 @@
			{
			if (IsFromReport)
			{
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			NormallyOpenModeValue(false);
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1165,8 +1147,8 @@
			}
			else
			{
			//app默认“常开模式”还是开启
			NormallyOpenModeValue(true);
			//app默认“常开模式”还是开启
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1197,7 +1179,7 @@
			{
			string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
			this.ShowTipMsg(msg0);
			NormallyOpenModeValue(false);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1208,7 +1190,7 @@
			{
			string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
			this.ShowTipMsg(msg1);
			NormallyOpenModeValue(false);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1217,8 +1199,8 @@
			}
			else
			{
			//保持“常开成功”
			NormallyOpenModeValue(true);
			//保持“常开成功”
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1237,8 +1219,8 @@
			}
			else
			{
			//app操作不取消“常开模式”
			NormallyOpenModeValue(true);
			//app操作不取消“常开模式”
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1250,8 +1232,8 @@
			{
			if (IsFromReport)
			{
			//上报门锁“常开模式”已经取消，现在app确认“常开模式”取消
			NormallyOpenModeValue(false);
			//上报门锁“常开模式”已经取消，现在app确认“常开模式”取消
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1290,8 +1272,8 @@
			//添加App开启常开模式的历史记录
			HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9002, string.Empty);

			//app确认取消“常开模式”成功
			NormallyOpenModeValue(false);
			//app确认取消“常开模式”成功
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1367,19 +1349,6 @@

			alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
			{
			Regex rg = new Regex("^[0-9]+$");
			if (!rg.IsMatch(obj))
			{
			//必须是数字
			string msg0 = Language.StringByID(R.MyInternationalizationString.NormallyOpenModeInvalidTimeTip);
			this.ShowTipMsg(msg0);

			string msgTimeInValidSetting2 = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
			var timeConfrim2 = Language.StringByID(R.MyInternationalizationString.Confrim);
			var alertTimeInValidSetting2 = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting2, timeConfrim2);
			alertTimeInValidSetting2.Show();
			return;
			}
			//常开模式失效时间设置成功
			var temp = int.Parse(obj);
			DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
			@@ -1389,8 +1358,8 @@
			{
			//默认创建常开模式失败
			string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
			this.ShowTipMsg(msg0);

			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));
			alert.Show();
			//二次加载弹窗常开模式开启提示
			NomallyOpenModeInvalidTimeDialog();
			}
			@@ -1408,6 +1377,10 @@
			return;
			}
			string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (!doorLock.IsDoorLockNormallyMode.ContainsKey(key))
			{
			return;
			}
			if (doorLock.IsDoorLockNormallyMode[key] == true)
			{
			btnNormallyOpen.IsSelected = true;