From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 15 三月 2021 14:55:49 +0800 Subject: [PATCH] 合并前上传一个版本 --- HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorDoorWinwsPage.cs | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorDoorWinwsPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorDoorWinwsPage.cs index 65c7aa3..0d777d9 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorDoorWinwsPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorDoorWinwsPage.cs @@ -2,6 +2,8 @@ using HDL_ON.Stan; using HDL_ON.UI.CSS; using HDL_ON.Entity; +using System.Collections.Generic; +using System; namespace HDL_ON.UI { @@ -79,6 +81,8 @@ /// </summary> private void InitFrameWhiteContent2() { + var paging = new ArmSensorHistroyPaging(device); + paging.InitFrame(FrameWhiteCentet2); } #endregion @@ -114,10 +118,10 @@ private void RefreshFormStatu() { Application.RunOnMainThread(() => { - var temp = device.status.Find((sta) => sta.key == FunctionAttributeKey.Status); + var temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.Status); if (temp != null) { - if (temp.value == "open") + if (temp.state == "open") { btnIcon.IsSelected = true; btnSuctionView.TextID = StringId.Open; @@ -167,4 +171,5 @@ #endregion } + } -- Gitblit v1.8.0