~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -856,15 +856,16 @@
			//开锁事件
			EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
			{
			canShowDialog = true;
			if (doorLock.IsDoorLockNormallyMode)
			{
			if (canOpenNormallyMode)
			{
			{
			Application.RunOnMainThread(() =>
			{
			Action<bool> action = (obj) =>
			{
			UpdateNomallyOpenStatus();
			UpdateNomallyOpenStatus();
			};
			DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
			});
			@@ -889,6 +890,7 @@
			//关锁事件
			EventHandler<MouseEventArgs> hander2 = (sender, e) =>
			{
			canShowDialog = true;
			if (canOpenNormallyMode)
			{
			if (doorLock.IsDoorLockNormallyMode)
			@@ -1049,7 +1051,6 @@
			/// </summary>
			private async void NomallyOpenDialog()
			{
			#region 后续版本
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
			@@ -1084,19 +1085,20 @@
			addLogicPage.Show();
			addLogicPage.action += (w) =>
			{
			doorLock.IsDoorLockNormallyMode = w;
			///留给徐梅用的
			UpdateNomallyOpenStatus();
			doorLock.IsDoorLockNormallyMode = w;
			UpdateNomallyOpenStatus();
			//返回按键清空当前逻辑定义的LogicAction
			UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
			};
			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action);
			#endregion

			}

			/// <summary>
			/// 常开模式失效处理
			/// </summary>
			public void NomallyOpenModeInvalidDialog(bool IsFromReport = false)
			private void NomallyOpenModeInvalidDialog(bool IsFromReport = false)
			{
			if (!canShowDialog)
			{
			@@ -1128,15 +1130,11 @@
			{
			UpdateNomallyOpenStatus();
			});
			//删除已经失效的“常开模式”的逻辑

			if (haveLogicNormallyOpenMode)
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			//if (resTemp == 3)
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
			// this.ShowTipMsg(msg0);
			//}
			//此处删除温居城的常开模式特殊逻辑
			var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
			}
			}
			else
			@@ -1156,16 +1154,11 @@
			{
			//上报“常开模式”已被取消
			Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
			//先删除已失效的“常开模式”的逻辑

			if (haveLogicNormallyOpenMode)
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			//if (resTemp == 3)
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2);
			// this.ShowTipMsg(msg0);
			// return;
			//}
			//此处删除温居城的常开模式特殊逻辑
			var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
			}
			//app重新开启“常开模式”
			var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
			@@ -1233,15 +1226,10 @@
			UpdateNomallyOpenStatus();
			});

			//删除已经失效的“常开模式”的逻辑
			if (haveLogicNormallyOpenMode)
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			//if (resTemp == 3)
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
			// this.ShowTipMsg(msg0);
			//}
			//此处删除温居城的常开模式特殊逻辑
			var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
			}
			}
			else
			@@ -1272,21 +1260,11 @@
			{
			UpdateNomallyOpenStatus();
			});
			//删除设置常开模式创建的逻辑

			if (haveLogicNormallyOpenMode)
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			//因为目前机制问题，逻辑经常失败，所以不提示，后期机制要改，重新做一个这个界面
			//if (resTemp == 3)
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
			// this.ShowTipMsg(msg0);
			//}
			//else if (resTemp == 2)
			//{
			// string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
			// this.ShowTipMsg(msg2);
			//}
			//此处删除温居城的常开模式特殊逻辑
			var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
			}
			string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
			this.ShowTipMsg(msg2);