From 20f58a08f7ff9746312a41f1cfe014b3893043a4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 十月 2022 11:24:13 +0800
Subject: [PATCH] 场景色温功能再次编辑状态异常显示
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index d9f98ea..f2177b9 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);
+ }
};
@@ -1182,20 +1186,34 @@
Text = "/" + FunctionList.List.InverterList().Count,
};
inverterListView.AddChidren(btnFunctionCount);
+
+ int count = 0;
+ foreach (var temp in FunctionList.List.InverterList())
+ {
+ if (temp.online)
+ {
+ if (temp.trait_on_off.state.ToString() == "on")
+ {
+ ++count;
+ }
+ }
+ }
+
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 * 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 = count.ToString(),
Tag = "inverter_onCount",
BorderWidth = 0,
};
inverterListView.AddChidren(btnOpenCount);
+
//Button btnWorkStatus = new Button()
//{
@@ -1212,7 +1230,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 +1243,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 +1257,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 +1278,7 @@
TextID = StringId.BatterySOC,
TextAlignment = TextAlignment.CenterLeft,
};
- inverterListView.AddChidren(btnBatterySOC);
+ //inverterListView.AddChidren(btnBatterySOC);
//Button btnOperationDataTotalData = new Button()
//{
@@ -1280,13 +1298,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;
@@ -1296,8 +1316,9 @@
{
lz = "en";
}
- string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}&lang={lz}";
+ string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}&language={lz}";
Inverter.Ins.ShowWebviewFormUrl(url);
+
Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
{
JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
@@ -1335,7 +1356,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 +1385,10 @@
var pack = http.GetInverterStatisticsInfo();
if (pack != null)
{
+ if(pack.Data == null)
+ {
+ return;
+ }
var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data?.ToString());
if (info == null)
{
@@ -1366,7 +1399,37 @@
Application.RunOnMainThread(() =>
{
btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
- btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.workMode);
+ string workModeString = "";
+ if (Language.CurrentLanguage == "Chinese") {
+ switch (info.workMode)
+ {
+ case "self_use":
+ workModeString = "鑷彂鑷敤";
+ break;
+ case "peak_load_shifting":
+ workModeString = "鍓婂嘲濉胺";
+ break;
+ case "battery_priority":
+ workModeString = "鐢垫睜浼樺厛";
+ break;
+ }
+ }
+ else
+ {
+ switch (info.workMode)
+ {
+ case "self_use":
+ workModeString = "Self Consume";
+ break;
+ case "peak_load_shifting":
+ workModeString = "Peak Shift";
+ break;
+ case "battery_priority":
+ workModeString = "Battery Priority";
+ break;
+ }
+ }
+ btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", workModeString);
btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
});
--
Gitblit v1.8.0