From 4e78c9c795dff269ebea37f4e7572d8c8b7d4a69 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 20 五月 2020 15:14:17 +0800
Subject: [PATCH] 请合并门锁最新代码【1、优化门锁常开模式推送和增加机械门锁开锁功能；2、优化面板调光目标】
---
ZigbeeApp20200519/Shared/Phone/Device/Logic/SoneLogicList.cs | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp20200519/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp20200519/Shared/Phone/Device/Logic/SoneLogicList.cs
old mode 100755
new mode 100644
index a81b5a1..b8858f3
--- a/ZigbeeApp20200519/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp20200519/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -226,6 +226,22 @@
catch { }
};
+ UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) =>
+ {
+ var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint;
+ if (DoorlockKey == key)
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
+ ModeView();
+ });
+ }
+ catch { }
+ }
+ };
}
/// <summary>
/// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
@@ -471,7 +487,7 @@
listLogicFl.Width = Application.GetRealWidth(1022);
listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
- verticalRefresh.Y = Application.GetRealHeight(187);
+ verticalRefresh.Y = Application.GetRealHeight(187);
verticalRefresh.X = Application.GetRealWidth(46);
verticalRefresh.Height = listLogicFl.Height - Application.GetRealHeight(187);//鍔ㄦ�佹敼鍔ㄤ笂涓嬫粦鍔╲iew楂樺害;
verticalRefresh.Width = listLogicFl.Width - Application.GetRealWidth(46);
--
Gitblit v1.8.0