From 2614964c9c3e0c8740e208d4d0606fa8a518b9c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 九月 2021 15:16:39 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs
index 720eab6..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();
@@ -116,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