~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -218,7 +218,7 @@

			ClickHandle();

			if (doorLock.IsOnline == 1)
			if (Common.LocalDevice.Current.CheckDeviceIsOnline(doorLock) == true)
			{
			ReadDoorLockUserInfo();
			}
			@@ -605,15 +605,11 @@
			{
			return;
			}
			string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
			if (doorLock.IsDoorLockNormallyMode)
			{
			if (doorLock.IsDoorLockNormallyMode[key] == true)
			{
			if (canOpenNormallyMode)
			{
			Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
			}
			if (canOpenNormallyMode)
			{
			Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
			}
			}
			}
			@@ -849,20 +845,11 @@
			//开锁事件
			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)
			{
			NomallyOpenModeInvalidDialog(false);
			}
			else
			{
			OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
			}
			if (canOpenNormallyMode)
			{
			NomallyOpenModeInvalidDialog(false);
			}
			else
			{
			@@ -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,51 +1025,49 @@
			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 = () =>
			{
			{
			#region WJC
			if (doorLock == null)
			{
			///防止抛异常
			doorLock = new ZigBee.Device.DoorLock();
			}
			Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
			///进来刷新一次设备列表；
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
			UserView.HomePage.Instance.AddChidren(addLogicPage);
			UserView.HomePage.Instance.PageIndex += 1;
			addLogicPage.Show(() =>
			{
			UpdateNomallyOpenStatus();//徐梅的方法
			});
			//系统密码支持操作门锁后，调用温居城的界面【常开自动化】
			#endregion
			}

			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action);
			//系统密码支持操作门锁后，调用温居城的界面【常开自动化】
			if (doorLock == null)
			{
			///防止抛异常
			return;
			}
			///备注：WJC的
			Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
			///进来刷新一次设备列表；
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
			UserView.HomePage.Instance.AddChidren(addLogicPage);
			UserView.HomePage.Instance.PageIndex += 1;
			addLogicPage.Show();
			addLogicPage.action += (w) =>
			{
			doorLock.IsDoorLockNormallyMode = w;
			///留给徐梅用的
			UpdateNomallyOpenStatus();
			};
			};
			//HdlCheckLogic.Current.CheckSecondarySecurity(action);
			#endregion




			}

			/// <summary>
			@@ -1361,12 +1342,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;
			@@ -1374,7 +1350,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;
			@@ -1463,6 +1439,7 @@
			CommonPage.Instance.IsDrawerLockMode = false;
			}
			ZbGateway.StatusList.Remove(this);
			DoorLockCommonInfo.LogicAction = null;
			base.RemoveFromParent();
			}
			#endregion