~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -47,7 +47,7 @@
			/// </summary>
			bool canVolume = false;
			/// <summary>
			/// 保留上一次音量
			/// 是否支持常开
			/// </summary>
			bool canOpenNormallyMode = false;
			/// <summary>
			@@ -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); });
			}
			}
			}
			@@ -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(3,doorLock);
			if (resTemp == 1)
			{
			HaveLogicNormallyOpenMode = true;
			@@ -774,6 +770,7 @@
			/// </summary>
			public void ClickHandle()
			{

			//门锁标题
			btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);

			@@ -788,8 +785,9 @@
			//设置
			EventHandler<MouseEventArgs> btnFuncSetHander = (sender, e) =>
			{
			//打开其他界面时前移除
			RemoveFromParent();
			//打开其他界面时前移除【暂时不移除】
			//RemoveFromParent();

			var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			@@ -848,20 +846,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
			{
			@@ -885,13 +874,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
			@@ -1040,68 +1025,50 @@
			/// </summary>
			private async void NomallyOpenDialog()
			{
			if (!btnNormallyOpen.IsSelected)
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
			return;
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
			return;
			}

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

			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());
			}

			if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)

			var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
			UserView.HomePage.Instance.AddChidren(addLogicPage);
			UserView.HomePage.Instance.PageIndex += 1;
			addLogicPage.Show();
			addLogicPage.action += (w) =>
			{
			SystemSecondAuthentication();
			return;
			}

			action = () =>
			{
			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);
			alert.Show();

			alert.ConfirmClickEvent += async () =>
			{
			Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
			var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
			if (result == null \|\| result.defaultControlResponseData == null)
			{
			string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
			this.ShowTipMsg(msg0);
			return;
			}
			if (result.defaultControlResponseData.status != 0)
			{
			string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
			this.ShowTipMsg(msg1);
			return;
			}
			else
			{
			//添加App开启常开模式的历史记录
			HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9001, string.Empty);

			//每次重新设置常开，默认时间都是12小时
			DoorLockCommonInfo.NormallyOpenModeInvalidTime = 12;
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			CommonPage.Loading.Hide();
			});

			//常开模式开启提示
			AlreadyOpenNormallyMode();
			}
			};
			doorLock.IsDoorLockNormallyMode = w;
			///留给徐梅用的
			UpdateNomallyOpenStatus();
			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action);
			}
			else
			{
			NomallyOpenModeInvalidDialog();
			}

			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action);


			}

			/// <summary>
			@@ -1137,7 +1104,7 @@
			//删除已经失效的“常开模式”的逻辑
			if (HaveLogicNormallyOpenMode)
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
			//if (resTemp == 3)
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
			@@ -1165,7 +1132,7 @@
			//先删除已失效的“常开模式”的逻辑
			if (HaveLogicNormallyOpenMode)
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
			//if (resTemp == 3)
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2);
			@@ -1177,11 +1144,11 @@
			var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
			if (result == null \|\| result.defaultControlResponseData == null)
			{
			string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
			this.ShowTipMsg(msg0);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
			this.ShowTipMsg(msg0);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			UpdateNomallyOpenStatus();
			});
			return;
			@@ -1242,7 +1209,7 @@
			//删除已经失效的“常开模式”的逻辑
			if (HaveLogicNormallyOpenMode)
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
			//if (resTemp == 3)
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
			@@ -1281,7 +1248,7 @@
			//删除设置常开模式创建的逻辑
			if (HaveLogicNormallyOpenMode)
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
			//因为目前机制问题，逻辑经常失败，所以不提示，后期机制要改，重新做一个这个界面
			//if (resTemp == 3)
			//{
			@@ -1354,7 +1321,7 @@
			DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
			//默认创建常开模式的特殊逻辑
			var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			if (!res)
			if (res==0)
			{
			//默认创建常开模式失败
			string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
			@@ -1376,12 +1343,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;
			@@ -1389,7 +1351,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;
			@@ -1478,6 +1440,7 @@
			CommonPage.Instance.IsDrawerLockMode = false;
			}
			ZbGateway.StatusList.Remove(this);
			DoorLockCommonInfo.LogicAction = null;
			base.RemoveFromParent();
			}
			#endregion