From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index d9f98ea..511af3b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1091,7 +1091,11 @@
string onoff = btnAcstPower.IsSelected ? "on" : "off";
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, onoff);
- Control.Ins.SendWriteCommand(FunctionList.List.GetAcstParentList()[0], d);
+
+ foreach (var temp in FunctionList.List.GetAcstParentList())
+ {
+ Control.Ins.SendWriteCommand(temp, d);
+ }
};
@@ -1191,7 +1195,7 @@
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = FunctionList.List.InverterList().Count.ToString(),
+ Text = FunctionList.List.InverterList().FindAll((temp)=>temp.trait_on_off.curValue.ToString() == "on").Count.ToString(),
Tag = "inverter_onCount",
BorderWidth = 0,
};
@@ -1212,7 +1216,7 @@
Button btnWorkingMode = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnOpenCount.Bottom,// + Application.GetRealHeight(16),
+ Y = btnOpenCount.Bottom + Application.GetRealHeight(5),// + Application.GetRealHeight(16),
Width = Application.GetRealWidth(148),
Height = Application.GetRealHeight(18),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1225,7 +1229,7 @@
Button btnPowerTenerationToday = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnWorkingMode.Bottom,
+ Y = btnWorkingMode.Bottom + Application.GetRealHeight(5),
Width = Application.GetRealWidth(148),
Height = Application.GetRealHeight(21),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1239,7 +1243,7 @@
Button btnCurrentPowerGeneration = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnPowerTenerationToday.Bottom,
+ Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(5),
Width = Application.GetRealWidth(148),
Height = Application.GetRealHeight(21),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1260,7 +1264,7 @@
TextID = StringId.BatterySOC,
TextAlignment = TextAlignment.CenterLeft,
};
- inverterListView.AddChidren(btnBatterySOC);
+ //inverterListView.AddChidren(btnBatterySOC);
//Button btnOperationDataTotalData = new Button()
//{
@@ -1280,13 +1284,15 @@
clickButton.MouseUpEventHandler = (sender2, e2) =>
{
- var h5BasePage = new FrameLayout();
+ var h5BasePage = new FrameLayout() {
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
-#if __Android__
+//#if __Android__
//閫傞厤瀹夊崜娌夋蹈寮忓鑸爮
h5BasePage.Y = Application.GetRealHeight(20);
h5BasePage.Height = Application.GetRealHeight(646);
-#endif
+//#endif
MainPage.BasePageView.AddChidren(h5BasePage);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -1335,7 +1341,15 @@
});
refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
}
+ else if(jObj["method"].ToString() == "setPageIndex")
+ {
+ var data = jObj["data"].ToString();
+ Inverter.Ins.PageIndex = data.ToString();
+ }
};
+
+
+
};
refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
@@ -1356,6 +1370,10 @@
var pack = http.GetInverterStatisticsInfo();
if (pack != null)
{
+ if(pack.Data == null)
+ {
+ return;
+ }
var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data?.ToString());
if (info == null)
{
--
Gitblit v1.8.0