From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 八月 2021 13:21:21 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1 --- 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