From 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs b/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
index 625812c..958b494 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
@@ -136,18 +136,16 @@
showCount = 0;
functionListView.RemoveAll();
}
- int i = 0;
-
-
- foreach (var function in functions)
+ for(var i =0;i<100;i++)
+ //foreach (var function in functions)
{
- i++;
- if (i > 100)
+ showCount++;
+ if (showCount >= functions.Count)
{
break;
}
- showCount++;
+ var function = functions[showCount];
var functionDiv = new OrderFunctionRow()
{
Gravity = Gravity.CenterHorizontal,
@@ -175,12 +173,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "鍔犺浇鏇村",
+ TextID = StringId.LoadMore,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnAppend.Text = "Load more";
- }
functionListView.AddChidren(btnAppend);
btnAppend.MouseUpEventHandler = (sender, e) =>
{
--
Gitblit v1.8.0