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 | 104 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 95dcd3b..511af3b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1085,9 +1085,10 @@
Tag = item + "_AllControl",
};
functionView.AddChidren(btnAcstPower);
- btnAcstPower.MouseUpEventHandler = (sender, e) => {
+ btnAcstPower.MouseUpEventHandler = (sender, e) =>
+ {
btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
- string onoff = btnAcstPower.IsSelected ? "on":"off";
+ string onoff = btnAcstPower.IsSelected ? "on" : "off";
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, onoff);
@@ -1098,7 +1099,8 @@
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
var page = new AcstParentPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -1110,7 +1112,7 @@
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
- && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
+ && ShowFunction.EnergyMonitoring != item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
&& ShowFunction.Acst != item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
@@ -1126,7 +1128,7 @@
//鍏変紡鏁版嵁
- if (FunctionList.List.InverterList().Count > 0 )
+ if (FunctionList.List.InverterList().Count > 0)
{
FrameLayout inverterListView = new FrameLayout()
{
@@ -1214,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,
@@ -1227,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,
@@ -1241,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,
@@ -1262,7 +1264,7 @@
TextID = StringId.BatterySOC,
TextAlignment = TextAlignment.CenterLeft,
};
- inverterListView.AddChidren(btnBatterySOC);
+ //inverterListView.AddChidren(btnBatterySOC);
//Button btnOperationDataTotalData = new Button()
//{
@@ -1286,17 +1288,17 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
};
-#if __Android__
+//#if __Android__
//閫傞厤瀹夊崜娌夋蹈寮忓鑸爮
- h5BasePage.Y = Application.GetRealHeight(16);
- h5BasePage.Height = Application.GetRealHeight(651);
-#endif
+ h5BasePage.Y = Application.GetRealHeight(20);
+ h5BasePage.Height = Application.GetRealHeight(646);
+//#endif
MainPage.BasePageView.AddChidren(h5BasePage);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
h5BasePage.AddChidren(Inverter.Ins.H5Page);//000
string lz = "zh";
- if(Language.CurrentLanguage != "Chinese")
+ if (Language.CurrentLanguage != "Chinese")
{
lz = "en";
}
@@ -1337,6 +1339,12 @@
{
h5BasePage.RemoveFromParent();
});
+ refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
+ }
+ else if(jObj["method"].ToString() == "setPageIndex")
+ {
+ var data = jObj["data"].ToString();
+ Inverter.Ins.PageIndex = data.ToString();
}
};
@@ -1344,33 +1352,7 @@
};
- new System.Threading.Thread(() => {
- var http = new HttpServerRequest();
- var pack = http.GetInverterStatisticsInfo();
- if (pack != null)
- {
- var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data.ToString());
- if (info != null)
- {
- try
- {
- Application.RunOnMainThread(() =>
- {
- btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
- 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);
- });
- }
- catch (Exception ex)
- {
- MainPage.Log($"鑾峰彇瀹跺涵鍏変紡缁熻鏁版嵁寮傚父锛歿ex.Message}");
- }
- }
- }
-
-
- }) { IsBackground = true }.Start();
+ refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
index++;
}
@@ -1378,6 +1360,44 @@
s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40);
#endregion
+ }
+
+ void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration, Button btnBatterySOC)
+ {
+ new System.Threading.Thread(() =>
+ {
+ var http = new HttpServerRequest();
+ var pack = http.GetInverterStatisticsInfo();
+ if (pack != null)
+ {
+ if(pack.Data == null)
+ {
+ return;
+ }
+ var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data?.ToString());
+ if (info == null)
+ {
+ return;
+ }
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
+ 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);
+ });
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鑾峰彇瀹跺涵鍏変紡缁熻鏁版嵁寮傚父锛歿ex.Message}");
+ }
+ }
+
+
+ })
+ { IsBackground = true }.Start();
}
#region 鍒囨崲妤煎眰
@@ -1539,4 +1559,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0