From 75c4c1dbfa6a2f93284d363d2071292a3060d7ae Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 九月 2022 17:52:15 +0800
Subject: [PATCH] 第一个打包
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 168 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 129 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 48b9a3e..d9f98ea 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -5,6 +5,7 @@
using HDL_ON.Entity;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Shared;
@@ -1062,6 +1063,16 @@
break;
case ShowFunction.Acst:
btnName.TextID = StringId.Acst;
+
+ Button btnJMLogo = new Button()
+ {
+ Y = specialList.Contains(index) ? Application.GetRealWidth(147) : Application.GetRealWidth(104),
+ UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
+ Width = Application.GetRealWidth(105),
+ Height = Application.GetRealWidth(57),
+ };
+ functionView.AddChidren(btnJMLogo);
+
Button btnAcstPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -1074,8 +1085,18 @@
Tag = item + "_AllControl",
};
functionView.AddChidren(btnAcstPower);
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
- //缁垮缓绉戞妧绯荤粺todo
+ btnAcstPower.MouseUpEventHandler = (sender, e) =>
+ {
+ btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
+ 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);
+ };
+
+
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
var page = new AcstParentPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -1087,7 +1108,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) =>
@@ -1103,11 +1124,11 @@
//鍏変紡鏁版嵁
- if (FunctionList.List.InverterList.Count > 0 )
+ if (FunctionList.List.InverterList().Count > 0)
{
FrameLayout inverterListView = new FrameLayout()
{
- Height = Application.GetRealHeight(223),
+ Height = Application.GetRealHeight(204),
Radius = (uint)Application.GetRealWidth(6),
BackgroundColor = CSS_Color.MainBackgroundColor,
Tag = "inverterList_View",
@@ -1136,7 +1157,7 @@
Button btnName = new Button()
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(22),//14),//
+ Y = Application.GetRealHeight(16),//14),//
Width = Application.GetRealWidth(140),
Height = Application.GetRealHeight(20),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1148,22 +1169,50 @@
};
inverterListView.AddChidren(btnName);
- Button btnWorkStatus = new Button()
+
+ Button btnFunctionCount = new Button()
{
- Y = Application.GetRealHeight(24),
- Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(18),
- TextAlignment = TextAlignment.CenterRight,
- TextColor = 0xFF0BAF31,
- TextID = StringId.NormalOperation,
- TextSize = CSS_FontSize.TextFontSize
+ 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,
};
- inverterListView.AddChidren(btnWorkStatus);
+ inverterListView.AddChidren(btnFunctionCount);
+ Button btnOpenCount = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnName.Bottom,
+ 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(),
+ Tag = "inverter_onCount",
+ BorderWidth = 0,
+ };
+ inverterListView.AddChidren(btnOpenCount);
+
+ //Button btnWorkStatus = new Button()
+ //{
+ // Y = Application.GetRealHeight(24),
+ // Width = Application.GetRealWidth(148),
+ // Height = Application.GetRealHeight(18),
+ // TextAlignment = TextAlignment.CenterRight,
+ // TextColor = 0xFF0BAF31,
+ // TextID = StringId.NormalOperation,
+ // TextSize = CSS_FontSize.TextFontSize
+ //};
+ //inverterListView.AddChidren(btnWorkStatus);
Button btnWorkingMode = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnWorkStatus.Bottom + Application.GetRealHeight(16),
+ Y = btnOpenCount.Bottom,// + Application.GetRealHeight(16),
Width = Application.GetRealWidth(148),
Height = Application.GetRealHeight(18),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1176,9 +1225,9 @@
Button btnPowerTenerationToday = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnWorkingMode.Bottom + Application.GetRealHeight(16),
+ Y = btnWorkingMode.Bottom,
Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(18),
+ Height = Application.GetRealHeight(21),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.PowerTenerationToday,
@@ -1190,9 +1239,9 @@
Button btnCurrentPowerGeneration = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(16),
+ Y = btnPowerTenerationToday.Bottom,
Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(18),
+ Height = Application.GetRealHeight(21),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.CurrentPowerGeneration,
@@ -1203,7 +1252,7 @@
Button btnBatterySOC = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnCurrentPowerGeneration.Bottom + Application.GetRealHeight(16),
+ Y = btnCurrentPowerGeneration.Bottom,
Width = Application.GetRealWidth(148),
Height = Application.GetRealHeight(18),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1213,18 +1262,18 @@
};
inverterListView.AddChidren(btnBatterySOC);
- Button btnOperationDataTotalData = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = btnBatterySOC.Bottom + Application.GetRealHeight(16),
- Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(18),
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = StringId.OperationDataTotalData,
- TextAlignment = TextAlignment.CenterLeft,
- };
- inverterListView.AddChidren(btnOperationDataTotalData);
+ //Button btnOperationDataTotalData = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // Y = btnBatterySOC.Bottom + Application.GetRealHeight(16),
+ // Width = Application.GetRealWidth(148),
+ // Height = Application.GetRealHeight(18),
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextID = StringId.OperationDataTotalData,
+ // TextAlignment = TextAlignment.CenterLeft,
+ //};
+ //inverterListView.AddChidren(btnOperationDataTotalData);
var clickButton = new Button();
inverterListView.AddChidren(clickButton);
@@ -1235,14 +1284,19 @@
#if __Android__
//閫傞厤瀹夊崜娌夋蹈寮忓鑸爮
- h5BasePage.Y = Application.GetRealHeight(16);
- h5BasePage.Height = Application.GetRealHeight(651);
+ 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 url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}";
+ string lz = "zh";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ 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}";
Inverter.Ins.ShowWebviewFormUrl(url);
Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
{
@@ -1262,7 +1316,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;
@@ -1279,10 +1333,12 @@
{
h5BasePage.RemoveFromParent();
});
+ refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
}
};
};
+ refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
index++;
}
@@ -1290,6 +1346,40 @@
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)
+ {
+ 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 鍒囨崲妤煎眰
@@ -1388,7 +1478,7 @@
foreach (var floor in chooseList)
{
- if (!string.IsNullOrEmpty( floor.roomId))// != Language.StringByID(StringId.All))
+ if (!string.IsNullOrEmpty( floor.roomId))
{
//---鍒嗗壊绾�
contentView.AddChidren(new Button()
@@ -1451,4 +1541,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0