From b002d7e8709e4d6566124bdf7daa4bc3c3fd05d5 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 16 三月 2023 09:55:20 +0800
Subject: [PATCH] 1.新增大华摄像头dll及相关功能 2.更换LCVideoOnsdk.dll(跟大华摄像头有冲突) 3.修改适配版本为12.2(含有swift，需12.2以上支持)
---
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