~wjc/HomeApp.git

			@@ -605,15 +605,11 @@
			{
			return;
			}
			string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
			{
			if (doorLock.IsDoorLockNormallyMode[key] == true)
			{
			if (canOpenNormallyMode)
			{
			Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
			}
			if (doorLock.IsDoorLockNormallyMode)
			{
			if (canOpenNormallyMode)
			{
			Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
			}
			}
			}
			@@ -688,7 +684,7 @@
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
			Application.RunOnMainThread(async () =>
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist();
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2);
			if (resTemp == 1)
			{
			HaveLogicNormallyOpenMode = true;
			@@ -849,26 +845,17 @@
			//开锁事件
			EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
			{

			string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
			if (doorLock.IsDoorLockNormallyMode)
			{
			if (doorLock.IsDoorLockNormallyMode[key] == true)
			if (canOpenNormallyMode)
			{
			if (canOpenNormallyMode)
			{
			NomallyOpenModeInvalidDialog(false);
			}
			else
			{
			OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
			}
			NomallyOpenModeInvalidDialog(false);
			}
			else
			{
			OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
			}
			}
			}
			else
			{
			OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
			@@ -886,13 +873,9 @@
			{
			if (canOpenNormallyMode)
			{
			var key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
			if (doorLock.IsDoorLockNormallyMode)
			{
			if (doorLock.IsDoorLockNormallyMode[key] == true)
			{
			NomallyOpenModeInvalidDialog();
			}
			NomallyOpenModeInvalidDialog();
			}
			}
			else
			@@ -1042,31 +1025,31 @@
			private async void NomallyOpenDialog()
			{
			#region 后续版本
			//if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			//{
			// this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
			// return;
			//}
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
			return;
			}

			//if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
			//{
			// SystemSecondAuthentication();
			// return;
			//}
			if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
			{
			SystemSecondAuthentication();
			return;
			}

			//action = () =>
			//{
			// //系统密码支持操作门锁后，调用温居城的界面【常开自动化】
			// var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);
			// Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
			// Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			// functionSetting.Show();
			// functionSetting.aaaAction = () =>
			// {
			// UpdateNomallyOpenStatus();
			// };
			//};
			//HdlCheckLogic.Current.CheckSecondarySecurity(action);
			action = () =>
			{
			//系统密码支持操作门锁后，调用温居城的界面【常开自动化】
			var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			functionSetting.Show();
			// functionSetting.aaaAction = () =>
			//{
			// UpdateNomallyOpenStatus();
			//};
			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action);
			#endregion

			#region 暂时版本 (最终去掉）
			@@ -1086,12 +1069,6 @@

			action = () =>
			{
			//系统密码支持操作门锁后，调用问温居城的界面【常开自动化】
			//Action nomallyOpenModeStartAction = () =>
			//{
			// UpdateNomallyOpenStatus();
			//};

			string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
			var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
			var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
			@@ -1415,12 +1392,7 @@
			btnNormallyOpenFrameLayout.Width = Application.GetRealWidth(0);
			return;
			}
			string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (!doorLock.IsDoorLockNormallyMode.ContainsKey(key))
			{
			return;
			}
			if (doorLock.IsDoorLockNormallyMode[key] == true)
			if (doorLock.IsDoorLockNormallyMode)
			{
			btnNormallyOpen.IsSelected = true;
			btnDoorLockPic.IsSelected = true;
			@@ -1428,7 +1400,7 @@
			btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.DoorLockOpen);

			}
			else if (doorLock.IsDoorLockNormallyMode[key] == false)
			else if (!doorLock.IsDoorLockNormallyMode)
			{
			btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.CLose);
			btnDoorLockPic.IsSelected = false;
			@@ -1517,6 +1489,7 @@
			CommonPage.Instance.IsDrawerLockMode = false;
			}
			ZbGateway.StatusList.Remove(this);
			DoorLockCommonInfo.LogicAction = null;
			base.RemoveFromParent();
			}
			#endregion