From f6c4e9886b924d8f5271e8b58378d7a07269dcb8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 05 十一月 2021 10:28:57 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorPirPage.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorPirPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorPirPage.cs
index 1599610..891b2cf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorPirPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorPirPage.cs
@@ -28,7 +28,7 @@
public override void InitFrameWhiteContent()
{
base.ShowColltionButton = false;
- base.SetTitleText(device.name);
+ base.SetTitleText(Language.StringByID(StringId.Sensor));
//娣诲姞绗簩绱㈠紩椤�
this.AddSecondPage();
@@ -114,6 +114,10 @@
{
Application.RunOnMainThread(()=>{
var temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.Status);
+ if(temp== null)
+ {
+ temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.PeopleStatus);
+ }
if (temp != null)
{
if (temp.state == "true")
--
Gitblit v1.8.0