From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs
index c1fbef7..2b28caf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs
@@ -27,7 +27,7 @@
/// </summary>
public override void InitFrameWhiteContent()
{
- base.SetTitleText(device.name);
+ base.SetTitleText(Language.StringByID(StringId.Sensor));
//娣诲姞绗簩绱㈠紩椤�
this.AddSecondPage();
@@ -79,6 +79,8 @@
/// </summary>
private void InitFrameWhiteContent2()
{
+ var paging = new ArmSensorHistroyPaging(device);
+ paging.InitFrame(FrameWhiteCentet2);
}
#endregion
@@ -114,10 +116,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 == "alarm")
+ if (temp.state == "alarm")
{
btnIcon.IsSelected = true;
btnSuctionView.TextID = StringId.InAlarm;
--
Gitblit v1.8.0