From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs
index b2906df..1b067fc 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();
@@ -40,6 +40,12 @@
this.RefreshNowDeviceStatuMemory(this.device);
//鍒锋柊鐣岄潰鐘舵��
this.RefreshFormStatu();
+ //璇诲彇鐘舵��
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(device);
+ })
+ { IsBackground = true }.Start();
}
/// <summary>
@@ -66,6 +72,7 @@
SelectedTextColor = CSS_Color.AuxiliaryColor2,
};
FrameWhiteCentet1.AddChidren(btnSuctionView);
+ RefreshFormStatu();
}
/// <summary>
@@ -73,6 +80,8 @@
/// </summary>
private void InitFrameWhiteContent2()
{
+ var paging = new ArmSensorHistroyPaging(device);
+ paging.InitFrame(FrameWhiteCentet2);
}
#endregion
@@ -107,24 +116,35 @@
/// </summary>
private void RefreshFormStatu()
{
- Application.RunOnMainThread(() => {
- var temp = device.status.Find((sta) => sta.key == FunctionAttributeKey.Status);
+
+ Application.RunOnMainThread(() =>
+ {
+ var temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.Status);
+ if (temp == null)
+ {
+ temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.AlarmStatus);
+ }
if (temp != null)
{
- if (temp.value == "true")
+ if (temp.state == "alarm")
{
- btnIcon.IsSelected = true;
+ btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeStateBgIconOn.png";
btnSuctionView.TextID = StringId.InAlarm;
btnSuctionView.IsSelected = true;
}
- else
+ else if (temp.state == "normal")
{
- btnIcon.IsSelected = false;
+ btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeStateBgIcon.png";
btnSuctionView.TextID = StringId.SensorNormalState;
btnSuctionView.IsSelected = false;
}
}
});
+
+
+
+
+
}
#endregion
@@ -136,11 +156,24 @@
/// </summary>
private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)
{
- foreach (var data in i_LocalDevice.status)
- {
- //寮�鍏�
- //if (data.key == "on_off") { this.weepRobotData.Cleaning = data.value.ToLower() == "on"; }
- }
+ //foreach (var data in i_LocalDevice.status)
+ //{
+ // if (data.key == "status")
+ // {
+ // if (data.value.ToLower() == "alarm")
+ // {
+ // this.btnIcon.IsSelected = true;
+ // this.btnSuctionView.IsSelected = true;
+ // this.btnSuctionView.TextID = StringId.InAlarm;
+ // }
+ // else
+ // {
+ // this.btnIcon.IsSelected = false;
+ // this.btnSuctionView.IsSelected = false;
+ // this.btnSuctionView.TextID = StringId.SensorNormalState;
+ // }
+ // }
+ //}
}
#endregion
--
Gitblit v1.8.0