From adf7df175e590b7d9e0f33c0c2ea1d2897da6301 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 29 三月 2023 14:33:12 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 5ef800e..7bed343 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -73,7 +73,7 @@
};
bodyView.AddChidren(contentView);
- contentView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(16) });
FrameLayout diagramView = new FrameLayout()
{
@@ -659,6 +659,10 @@
int index = 1;
foreach (var tempSensor in sensorList)
{
+ if(index > 6)
+ {
+ break;
+ }
if (tempSensor.sid == function.sid)
{
continue;
@@ -955,5 +959,10 @@
/// <summary>
/// </summary>
public string fieldValue { get; set; }
+
+ /// <summary>
+ /// 鏃堕棿
+ /// </summary>
+ public string time { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.8.0