From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
index dc80600..2278e48 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -57,14 +57,15 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction)).LoadTopView();
- //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.AddFunction));
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction));
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 鏄剧ず鐨勫姛鑳界被鍨嬪垏鎹㈠尯鍩�
showdFunctionTypeRow = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(62),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(showdFunctionTypeRow);
@@ -93,30 +94,14 @@
};
showdFunctionTypeRow.AddChidren(btnFloor);
-
- //btnScreenIcon = new Button()
- //{
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // X = Application.GetRealWidth(122),
- // Y = Application.GetRealHeight(18),
- // UnSelectedImagePath = "Public/DownIcon.png",
- //};
- //showdFunctionTypeRow.AddChidren(btnScreenIcon);
-
- //btnScreenText = new Button()
- //{
- // X = btnScreenIcon.Right,
- // Y = Application.GetRealHeight(18),
- // Width = Application.GetRealWidth(200),
- // Height = Application.GetMinRealAverage(16),
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // TextAlignment = TextAlignment.CenterLeft,
- // TextID = StringId.Screen
- //};
- //showdFunctionTypeRow.AddChidren(btnScreenText);
-
+ showdFunctionTypeRow.AddChidren(new Button()
+ {
+ Y = Application.GetRealHeight(49),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealWidth(1),
+ BackgroundColor = CSS_Color.DividingLineColor,
+ });
#endregion
@@ -200,9 +185,8 @@
/// <summary>
/// 鏄剧ず鍔熻兘Row
/// </summary>
- void LoadFunctionListRow(List<Function> functions)
+ void LoadFunctionListRow(List<Function> functions, bool isAppend = false)
{
- functionListView.RemoveAll();
if (functions == null)
{
//鍒濆鍊�
@@ -210,8 +194,20 @@
functions.AddRange(unallocatedList);
functions.AddRange(allocatedList);
}
- foreach (var function in functions)
+ if (!isAppend)
{
+ showCount = -1;
+ functionListView.RemoveAll();
+ }
+ for (var i = 0; i < 100; i++)
+ //foreach (var function in functions)
+ {
+ showCount++;
+ if (showCount >= functions.Count)
+ {
+ break;
+ }
+ var function = functions[showCount];
if (!MainPage.SceneSupportFunctionList.Contains(function.spk))
{
continue;
@@ -290,10 +286,33 @@
};
functionRow.AddChidren(btnChooseIcon);
LoadEvent_SkipEditFunctionInfo(functionRow, btnFunctionFloorName, btnChooseIcon, btnFunctionName, function);
+
+ }
+ if (functions.Count > showCount)
+ {
+ var btnAppend = new Button()
+ {
+ Height = Application.GetRealHeight(60),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextID = StringId.LoadMore,
+ };
+ functionListView.AddChidren(btnAppend);
+ btnAppend.MouseUpEventHandler = (sender, e) =>
+ {
+ btnAppend.RemoveFromParent();
+ LoadFunctionListRow(functions, true);
+ };
}
}
+ /// <summary>
+ /// 鏄剧ず鐨勮澶囩殑鎬绘暟
+ /// </summary>
+ int showCount = -1;
+
/// <summary>
/// 浣忓畢鍒楄〃鐐瑰嚮浜嬩欢
--
Gitblit v1.8.0