From fffd8afca5b69a592e9ba8913204f83f478e2f17 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 06 五月 2020 17:28:35 +0800
Subject: [PATCH] 增加获取颜色接口（请合并代码）
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 96 +++++++++++++++++++++++++++---------------------
1 files changed, 54 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 285699d..61f363c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -47,7 +47,7 @@
/// </summary>
bool canVolume = false;
/// <summary>
- /// 淇濈暀涓婁竴娆￠煶閲�
+ /// 鏄惁鏀寔甯稿紑
/// </summary>
bool canOpenNormallyMode = false;
/// <summary>
@@ -605,15 +605,11 @@
{
return;
}
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
- {
- if (doorLock.IsDoorLockNormallyMode[key] == true)
- {
- if (canOpenNormallyMode)
- {
- Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
- }
+ if (doorLock.IsDoorLockNormallyMode)
+ {
+ 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(2);
if (resTemp == 1)
{
HaveLogicNormallyOpenMode = true;
@@ -788,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;
@@ -848,26 +845,17 @@
//寮�閿佷簨浠�
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)
{
- if (canOpenNormallyMode)
- {
- NomallyOpenModeInvalidDialog(false);
- }
- else
- {
- OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
- }
+ NomallyOpenModeInvalidDialog(false);
}
else
{
OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
}
- }
+ }
else
{
OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
@@ -885,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
@@ -1040,6 +1024,35 @@
/// </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)
@@ -1095,6 +1108,7 @@
AlreadyOpenNormallyMode();
}
};
+
};
HdlCheckLogic.Current.CheckSecondarySecurity(action);
}
@@ -1102,6 +1116,8 @@
{
NomallyOpenModeInvalidDialog();
}
+
+ #endregion
}
/// <summary>
@@ -1177,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);
- DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
Application.RunOnMainThread(() =>
{
+ string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+ this.ShowTipMsg(msg0);
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
UpdateNomallyOpenStatus();
});
return;
@@ -1376,12 +1392,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 +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;
@@ -1478,6 +1489,7 @@
CommonPage.Instance.IsDrawerLockMode = false;
}
ZbGateway.StatusList.Remove(this);
+ DoorLockCommonInfo.LogicAction = null;
base.RemoveFromParent();
}
#endregion
--
Gitblit v1.8.0