~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -182,7 +182,7 @@
			#endregion

			/// <summary>
			/// UI显示
			/// UI显示
			/// </summary>
			public void Show()
			{
			@@ -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,
			};
			@@ -708,7 +708,7 @@
			canVolume = DoorLockCommonInfo.CanVolume(doorLock);
			if (canVolume)
			{
			//读取音量
			//读取音量
			var resultRes = await doorLock.GetVolumeAsync();
			if (resultRes == null \|\| resultRes.volumeResponseData == null)
			{
			@@ -764,9 +764,9 @@

			#endregion

			#region 公共事件处理
			#region 公共事件处理
			/// <summary>
			/// 事件处理
			/// 事件处理
			/// </summary>
			public void ClickHandle()
			{
			@@ -832,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;
			@@ -943,7 +943,7 @@
			}
			#endregion

			#region 音量
			#region 音量
			/// <summary>
			/// 更新音量
			/// </summary>
			@@ -1018,56 +1018,106 @@
			}
			#endregion

			#region 常开模式
			#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.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 = () =>
			{
			//系统密码支持操作门锁后，调用温居城的界面【常开自动化】
			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);
			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)
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
			return;
			}

			if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
			{
			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();
			}
			};

			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action);
			}
			else
			{
			NomallyOpenModeInvalidDialog();
			}

			#endregion
			}

			/// <summary>
			@@ -1094,7 +1144,7 @@
			{
			if (IsFromReport)
			{
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			@@ -1113,7 +1163,7 @@
			}
			else
			{
			//app默认“常开模式”还是开启
			//app默认“常开模式”还是开启
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			@@ -1165,14 +1215,14 @@
			}
			else
			{
			//保持“常开成功”
			//保持“常开成功”
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			});

			//创建常开模式的特殊逻辑
			//创建常开模式的特殊逻辑
			var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			//if (!resu)
			//{
			@@ -1185,7 +1235,7 @@
			}
			else
			{
			//app操作不取消“常开模式”
			//app操作不取消“常开模式”
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			@@ -1198,7 +1248,7 @@
			{
			if (IsFromReport)
			{
			//上报门锁“常开模式”已经取消，现在app确认“常开模式”取消
			//上报门锁“常开模式”已经取消，现在app确认“常开模式”取消
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			@@ -1238,7 +1288,7 @@
			//添加App开启常开模式的历史记录
			HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9002, string.Empty);

			//app确认取消“常开模式”成功
			//app确认取消“常开模式”成功
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			@@ -1279,7 +1329,7 @@
			alertNomallyModeIsTurnOn.Show();
			alertNomallyModeIsTurnOn.MsgControlClickEvent += async () =>
			{
			//默认创建常开模式的特殊逻辑
			//默认创建常开模式的特殊逻辑
			var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			//if (!res)
			//{
			@@ -1307,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);
			@@ -1318,7 +1368,7 @@
			//常开模式失效时间设置成功
			var temp = int.Parse(obj);
			DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
			//默认创建常开模式的特殊逻辑
			//默认创建常开模式的特殊逻辑
			var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			if (!res)
			{
			@@ -1360,7 +1410,7 @@
			}
			#endregion

			#region 开锁处理
			#region 开锁处理
			/// <summary>
			/// 开锁处理
			/// </summary>