From 7cfcdb7a90f59bf9001c948e166fd9af09752fe1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 24 五月 2022 17:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs
index 5ca7239..5e78767 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs
@@ -32,7 +32,7 @@
VerticalScrolViewLayout histroyView = new VerticalScrolViewLayout()
{
Y = btnTitle.Bottom,
- Height = Application.GetRealHeight(450),
+ Height = Application.GetRealHeight(0),
};
FrameWhiteCentet2.AddChidren(histroyView);
@@ -53,6 +53,14 @@
Application.RunOnMainThread(() =>
{
var startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
+ if (revData.list.Count > 9)
+ {
+ histroyView.Height = Application.GetRealHeight(450);
+ }
+ else
+ {
+ histroyView.Height = Application.GetRealHeight(50*revData.list.Count);
+ }
foreach (var data in revData.list)
{
var yearString = startTime.AddMilliseconds(Convert.ToDouble(data.createTime)).ToString("yyyy") + Language.StringByID(StringId.Years);
--
Gitblit v1.8.0