From b47f91b91bc5371bba0c8801dbd648772ab331fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十一月 2022 13:54:15 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index e9eeac7..6b7887f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -170,7 +170,7 @@
this.picLockControl = new PicViewControl(256, 260);
picLockControl.Y = Application.GetRealHeight(129);
picLockControl.Gravity = Gravity.CenterHorizontal;
- picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue1.png";
+ picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue1.png";
FrameWhiteCentet1.AddChidren(picLockControl);
picLockControl.ButtonClickEvent += (sender, e) =>
{
@@ -980,7 +980,7 @@
/// </summary>
private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)
{
- this.doorLockData.IsOnline = i_LocalDevice.online2d;
+ this.doorLockData.IsOnline = i_LocalDevice.online;
for (int i = 0; i < i_LocalDevice.attributes.Count; i++)
{
var data = i_LocalDevice.attributes[i];
--
Gitblit v1.8.0