From ed2d2c9b9e9bca8cd97136b738c2624193dd9d92 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 09 十月 2022 11:48:34 +0800
Subject: [PATCH] 百叶帘，编辑场景数据显示异常，光伏功能安卓系统返回上一次
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 511af3b..5703c4c 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1186,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().FindAll((temp)=>temp.trait_on_off.curValue.ToString() == "on").Count.ToString(),
+ Text = count.ToString(),
Tag = "inverter_onCount",
BorderWidth = 0,
};
inverterListView.AddChidren(btnOpenCount);
+
//Button btnWorkStatus = new Button()
//{
@@ -1289,7 +1303,7 @@
};
//#if __Android__
- //閫傞厤瀹夊崜娌夋蹈寮忓鑸爮
+ //閫傞厤娌夋蹈寮忓鑸爮
h5BasePage.Y = Application.GetRealHeight(20);
h5BasePage.Height = Application.GetRealHeight(646);
//#endif
@@ -1302,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));
@@ -1341,7 +1356,7 @@
});
refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
}
- else if(jObj["method"].ToString() == "setPageIndex")
+ else if (jObj["method"].ToString() == "setPageIndex")
{
var data = jObj["data"].ToString();
Inverter.Ins.PageIndex = data.ToString();
--
Gitblit v1.8.0