From 4f0ab0ad21ce450b7856d50f98322a7899361386 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 10:30:01 +0800
Subject: [PATCH] 不要下载这个备份
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 91 ++++++++++++++++-----------------------------
1 files changed, 33 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 0562afe..9856a3c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -25,14 +25,9 @@
ZbGateway.StatusList.Add(this);
Application.RunOnMainThread(() =>
{
- ControlCommonResourse.UpdateDoorLockStatusAction = (obj) =>
- {
- UpdateNomallyOpenStatus();
- };
-
UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, status) =>
{
- var key = doorLock.DeviceAddr + doorLock.DeviceEpoint;
+ var key = doorLock.DeviceAddr;
if (DoorlockKey == key)
{
DoorLockCommonInfo.NormallyOpenModeValue(this.doorLock, status);
@@ -638,35 +633,6 @@
}
}
- //缃戝叧鎵ц閫昏緫锛屽父寮�妯″紡澶辨晥涓婃姤
- //if (typeTag == "DoorLockAlarmsSendAlarmInform" && tempDevice != null)
- //{
- // var doorL = (ZigBee.Device.DoorLock)tempDevice;
-
- // if (doorL.DeviceAddr + doorL.DeviceEpoint == doorLock.DeviceAddr + doorLock.DeviceEpoint)
- // {
- // //闈炰富浜轰笉寮硅繖涓獥鍙�
- // if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- // {
- // return;
- // }
- // if (doorLock.IsDoorLockNormallyMode)
- // {
- // if (canOpenNormallyMode)
- // {
- // Application.RunOnMainThread(() =>
- // {
- // Action<bool> action = (obj) =>
- // {
- // UpdateNomallyOpenStatus();
- // };
- // DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.ServicePush, haveLogicNormallyOpenMode, action);
- // });
- // }
- // }
- // }
- //}
-
if (typeTag == "DeviceStatusReport" && tempDevice != null)
{
if (tempDevice != null)
@@ -734,18 +700,18 @@
}
DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
- //Application.RunOnMainThread(async () =>
- //{
- //var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
- //if (resTemp == 1)
- //{
- // haveLogicNormallyOpenMode = true;
- //}
- //else if (resTemp == 0)
- //{
- // haveLogicNormallyOpenMode = false;
- //}
- //});
+ Application.RunOnMainThread(async () =>
+ {
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2, doorLock);
+ if (resTemp == 0)
+ {
+ haveLogicNormallyOpenMode = false;
+ }
+ else
+ {
+ haveLogicNormallyOpenMode = true;
+ }
+ });
}
}
else
@@ -1102,7 +1068,7 @@
action = () =>
{
- //绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
+ //WJC鐨勪唬鐮侊細绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
if (doorLock == null)
{
///闃叉鎶涘紓甯�
@@ -1120,13 +1086,25 @@
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
- addLogicPage.action += (w) =>
- {
- doorLock.IsDoorLockNormallyMode = w;
- UpdateNomallyOpenStatus();
- //杩斿洖鎸夐敭娓呯┖褰撳墠閫昏緫瀹氫箟鐨凩ogicAction
- UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
- };
+ addLogicPage.action += async (w) =>
+ {
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, w);
+ UpdateNomallyOpenStatus();
+ //杩斿洖鎸夐敭娓呯┖褰撳墠閫昏緫瀹氫箟鐨凩ogicAction
+ UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
+ //鏄惁瀛樺湪甯稿紑妯″紡
+ var resTemp = Shared.Common.Logic.SoneLogicList;
+ if (resTemp.Count == 0)
+ {
+ haveLogicNormallyOpenMode = false;
+ }
+ else
+ {
+ haveLogicNormallyOpenMode = true;
+ }
+
+ UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction -= addLogicPage.updateCurrentDoorlockActionTemp;
+ };
};
HdlCheckLogic.Current.CheckSecondarySecurity(action);
@@ -1232,9 +1210,6 @@
/// </summary>
public override void RemoveFromParent()
{
- //寰愭鐨勯棬閿佺晫闈㈠叧闂�(缃戝叧鍏ㄥ眬鎺ユ敹鏃朵娇鐢�)
- //ControlCommonResourse.IsDoorLockPageOpen = false;
- ControlCommonResourse.UpdateDoorLockStatusAction = null;
UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction = null;
if (IsDrawerLockMode)
{
--
Gitblit v1.8.0