~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -83,7 +83,7 @@
			/// <summary>
			/// 中部布局中门锁名称显示
			/// </summary>
			Button btnDoorLockTitle;
			NormalViewControl btnDoorLockTitle;
			/// <summary>
			/// 分享
			/// </summary>
			@@ -188,7 +188,7 @@
			#endregion

			/// <summary>
			/// UI显示
			/// UI显示
			/// </summary>
			public void Show()
			{
			@@ -252,18 +252,15 @@
			};
			this.midFrameLayout.AddChidren(midTopFrameLayout);

			//门锁标题
			btnDoorLockTitle = new Button()
			{
			Width = Application.GetRealWidth(250),
			Height = Application.GetRealHeight(60),
			X = Application.GetRealWidth(372),
			Y = Application.GetRealHeight(46),
			TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
			TextSize = 15,
			TextAlignment = TextAlignment.Center,
			IsBold = true,
			};
			//设备名称
			btnDoorLockTitle = new NormalViewControl(100, 60, true);
			btnDoorLockTitle.Y = Application.GetRealHeight(46);
			btnDoorLockTitle.TextSize = 15;
			btnDoorLockTitle.IsBold = true;
			btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
			btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();
			btnDoorLockTitle.TextAlignment = TextAlignment.Center;
			btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;
			midTopFrameLayout.AddChidren(btnDoorLockTitle);

			//记录
			@@ -516,7 +513,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			};
			btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
			#endregion
			#endregion
			}

			#region 音量弹窗
			@@ -571,7 +568,7 @@
			ThumbImagePath = "DoorLock/UnLockButton.png",//进度条按钮图标
			ThumbImageHeight = Application.GetRealHeight(81),//进度条按钮图标的高度（默认正方形：宽和高一样）
			ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			ProgressTextSize = 12,//显示百分比字体大小
			ProgressTextSize = 12,//显示百分比字体大小
			SeekBarViewHeight = Application.GetRealHeight(17),//进度条的宽度
			Progress = currentVolume,
			};
			@@ -721,7 +718,7 @@
			canVolume = DoorLockCommonInfo.CanVolume(doorLock);
			if (canVolume)
			{
			//读取音量
			//读取音量
			var resultRes = await doorLock.GetVolumeAsync();
			if (resultRes == null \|\| resultRes.volumeResponseData == null)
			{
			@@ -777,9 +774,9 @@

			#endregion

			#region 公共事件处理
			#region 公共事件处理
			/// <summary>
			/// 事件处理
			/// 事件处理
			/// </summary>
			public void ClickHandle()
			{
			@@ -843,11 +840,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;
			@@ -860,10 +857,14 @@
			if (doorLock.IsDoorLockNormallyMode)
			{
			if (canOpenNormallyMode)
			{
			{
			Application.RunOnMainThread(() =>
			{
			NomallyOpenModeInvalidDialog();
			Action<bool> action = (obj) =>
			{
			UpdateNomallyOpenStatus();
			};
			DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
			});
			}
			else
			@@ -893,7 +894,11 @@
			{
			Application.RunOnMainThread(() =>
			{
			NomallyOpenModeInvalidDialog();
			Action<bool> action = (obj) =>
			{
			UpdateNomallyOpenStatus();
			};
			DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
			});
			}
			}
			@@ -962,7 +967,7 @@
			}
			#endregion

			#region 音量
			#region 音量
			/// <summary>
			/// 更新音量
			/// </summary>
			@@ -1037,13 +1042,12 @@
			}
			#endregion

			#region 常开模式
			#region 常开模式
			/// <summary>
			/// 常开模式处理
			/// </summary>
			private async void NomallyOpenDialog()
			{
			#region 后续版本
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
			@@ -1079,18 +1083,19 @@
			addLogicPage.action += (w) =>
			{
			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)
			{
			@@ -1116,7 +1121,7 @@
			{
			if (IsFromReport)
			{
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			Application.RunOnMainThread(() =>
			{
			@@ -1131,7 +1136,7 @@
			}
			else
			{
			//app默认“常开模式”还是开启
			//app默认“常开模式”还是开启
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			@@ -1178,14 +1183,14 @@
			}
			else
			{
			//保持“常开成功”
			//保持“常开成功”
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			Application.RunOnMainThread(() =>
			{
			UpdateNomallyOpenStatus();
			});

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

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

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