From 39cf2411b59772d56ee731f229f09ff472889bad Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 九月 2022 15:12:04 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into hxb
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 5b6cfd4..bf6e34d 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1122,7 +1122,7 @@
//鍏変紡鏁版嵁
- if (FunctionList.List.InverterList.Count > 0 )
+ if (FunctionList.List.InverterList().Count > 0 )
{
FrameLayout inverterListView = new FrameLayout()
{
@@ -1170,26 +1170,26 @@
Button btnFunctionCount = new Button()
{
- X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * FunctionList.List.InverterList.Count.ToString().Length),
+ X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * FunctionList.List.InverterList().Count.ToString().Length),
Y = btnName.Bottom,
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(24),
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = "/" + FunctionList.List.InverterList.Count,
+ Text = "/" + FunctionList.List.InverterList().Count,
};
inverterListView.AddChidren(btnFunctionCount);
Button btnOpenCount = new Button()
{
X = Application.GetRealWidth(16),
Y = btnName.Bottom,
- Width = Application.GetRealWidth(14 * FunctionList.List.InverterList.Count.ToString().Length),
+ Width = Application.GetRealWidth(14 * FunctionList.List.InverterList().Count.ToString().Length),
Height = Application.GetRealHeight(24),
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = FunctionList.List.InverterList.Count.ToString(),
+ Text = FunctionList.List.InverterList().Count.ToString(),
Tag = "inverter_onCount",
BorderWidth = 0,
};
@@ -1314,7 +1314,7 @@
}
var function = new Function();
function.sid = data["sid"].ToString();
- var inObj = FunctionList.List.InverterList.Find((obj) => obj.sid == function.sid);
+ var inObj = FunctionList.List.InverterList().Find((obj) => obj.sid == function.sid);
if (inObj == null)
{
return;
@@ -1346,7 +1346,7 @@
Application.RunOnMainThread(() =>
{
btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
- btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.systemStatus);
+ btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.workMode);
btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
});
@@ -1527,4 +1527,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0