~wjc/HomeApp.git

			@@ -47,7 +47,7 @@
			/// </summary>
			bool canVolume = false;
			/// <summary>
			/// 保留上一次音量
			/// 是否支持常开
			/// </summary>
			bool canOpenNormallyMode = false;
			/// <summary>
			@@ -182,7 +182,7 @@
			#endregion

			/// <summary>
			/// UI显示
			/// UI显示
			/// </summary>
			public void Show()
			{
			@@ -218,7 +218,7 @@

			ClickHandle();

			if (doorLock.IsOnline == 1)
			if (Common.LocalDevice.Current.CheckDeviceIsOnline(doorLock) == true)
			{
			ReadDoorLockUserInfo();
			}
			@@ -510,7 +510,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			};
			btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
			#endregion
			#endregion
			}

			#region 音量弹窗
			@@ -565,7 +565,7 @@
			ThumbImagePath = "DoorLock/UnLockButton.png",//进度条按钮图标
			ThumbImageHeight = Application.GetRealHeight(81),//进度条按钮图标的高度（默认正方形：宽和高一样）
			ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			ProgressTextSize = 12,//显示百分比字体大小
			ProgressTextSize = 12,//显示百分比字体大小
			SeekBarViewHeight = Application.GetRealHeight(17),//进度条的宽度
			Progress = currentVolume,
			};
			@@ -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); });
			}
			}
			}
			@@ -685,12 +681,10 @@
			{
			tempRes = false;
			}

			NormallyOpenModeValue(tempRes);

			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;
			@@ -714,7 +708,7 @@
			canVolume = DoorLockCommonInfo.CanVolume(doorLock);
			if (canVolume)
			{
			//读取音量
			//读取音量
			var resultRes = await doorLock.GetVolumeAsync();
			if (resultRes == null \|\| resultRes.volumeResponseData == null)
			{
			@@ -770,9 +764,9 @@

			#endregion

			#region 公共事件处理
			#region 公共事件处理
			/// <summary>
			/// 事件处理
			/// 事件处理
			/// </summary>
			public void ClickHandle()
			{
			@@ -790,8 +784,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;
			@@ -837,11 +832,11 @@
			btnCollect.IsSelected = !btnCollect.IsSelected;
			if (btnCollect.IsSelected)
			{
			HdlRoomLogic.Current.AddLoveDevice(deviceUI);//收藏
			HdlRoomLogic.Current.AddLoveDevice(deviceUI);//收藏
			}
			else
			{
			HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//取消收藏
			HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//取消收藏
			}
			};
			btnCollectFrameLayout.MouseDownEventHandler += handerCollect;
			@@ -850,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
			{
			@@ -887,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
			@@ -961,7 +943,7 @@
			}
			#endregion

			#region 音量
			#region 音量
			/// <summary>
			/// 更新音量
			/// </summary>
			@@ -1036,28 +1018,41 @@
			}
			#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>
			private async void NomallyOpenDialog()
			{
			#region 后续版本
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
			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);
			#endregion

			#region 暂时版本 (最终去掉）
			if (!btnNormallyOpen.IsSelected)
			{
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			@@ -1102,7 +1097,7 @@

			//每次重新设置常开，默认时间都是12小时
			DoorLockCommonInfo.NormallyOpenModeInvalidTime = 12;
			NormallyOpenModeValue(true);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1113,6 +1108,7 @@
			AlreadyOpenNormallyMode();
			}
			};

			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action);
			}
			@@ -1120,6 +1116,8 @@
			{
			NomallyOpenModeInvalidDialog();
			}

			#endregion
			}

			/// <summary>
			@@ -1147,7 +1145,7 @@
			if (IsFromReport)
			{
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			NormallyOpenModeValue(false);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1166,7 +1164,7 @@
			else
			{
			//app默认“常开模式”还是开启
			NormallyOpenModeValue(true);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1195,11 +1193,11 @@
			var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
			if (result == null \|\| result.defaultControlResponseData == null)
			{
			string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
			this.ShowTipMsg(msg0);
			NormallyOpenModeValue(false);
			Application.RunOnMainThread(() =>
			{
			string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
			this.ShowTipMsg(msg0);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			UpdateNomallyOpenStatus();
			});
			return;
			@@ -1208,7 +1206,7 @@
			{
			string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
			this.ShowTipMsg(msg1);
			NormallyOpenModeValue(false);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1218,13 +1216,13 @@
			else
			{
			//保持“常开成功”
			NormallyOpenModeValue(true);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			});

			//创建常开模式的特殊逻辑
			//创建常开模式的特殊逻辑
			var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			//if (!resu)
			//{
			@@ -1238,7 +1236,7 @@
			else
			{
			//app操作不取消“常开模式”
			NormallyOpenModeValue(true);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1251,7 +1249,7 @@
			if (IsFromReport)
			{
			//上报门锁“常开模式”已经取消，现在app确认“常开模式”取消
			NormallyOpenModeValue(false);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1291,7 +1289,7 @@
			HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9002, string.Empty);

			//app确认取消“常开模式”成功
			NormallyOpenModeValue(false);
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			@@ -1331,7 +1329,7 @@
			alertNomallyModeIsTurnOn.Show();
			alertNomallyModeIsTurnOn.MsgControlClickEvent += async () =>
			{
			//默认创建常开模式的特殊逻辑
			//默认创建常开模式的特殊逻辑
			var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			//if (!res)
			//{
			@@ -1359,7 +1357,7 @@
			/// </summary>
			private void NomallyOpenModeInvalidTimeDialog()
			{
			//失效设置
			//失效设置
			string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
			var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
			var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
			@@ -1367,30 +1365,17 @@

			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;
			//默认创建常开模式的特殊逻辑
			//默认创建常开模式的特殊逻辑
			var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			if (!res)
			{
			//默认创建常开模式失败
			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();
			}
			@@ -1407,8 +1392,7 @@
			btnNormallyOpenFrameLayout.Width = Application.GetRealWidth(0);
			return;
			}
			string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (doorLock.IsDoorLockNormallyMode[key] == true)
			if (doorLock.IsDoorLockNormallyMode)
			{
			btnNormallyOpen.IsSelected = true;
			btnDoorLockPic.IsSelected = true;
			@@ -1416,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;
			@@ -1426,7 +1410,7 @@
			}
			#endregion

			#region 开锁处理
			#region 开锁处理
			/// <summary>
			/// 开锁处理
			/// </summary>
			@@ -1505,6 +1489,7 @@
			CommonPage.Instance.IsDrawerLockMode = false;
			}
			ZbGateway.StatusList.Remove(this);
			DoorLockCommonInfo.LogicAction = null;
			base.RemoveFromParent();
			}
			#endregion