From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:45 +0800
Subject: [PATCH] 2023年03月28日11:52:02
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 308 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 220 insertions(+), 88 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 95dcd3b..04ca7f2 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -649,12 +649,19 @@
var lastY2 = Application.GetRealWidth(16);
var functionContentViewHeight = Application.GetRealWidth(16);
- foreach (var item in DB_ResidenceData.Instance.functionTypeList)
+ foreach (var item in DB_ResidenceData.Instance.ShowFunctionTypeList)
{
int functionCount = 0;
int functionOnCount = 0;
switch (item)
{
+ case ShowFunction.IpCam:
+ functionCount = FunctionList.List.GetIpCamImouList().Count;
+ break;
+ case ShowFunction.MechanicalArm:
+ functionCount = FunctionList.List.GetMechanicalArmList().Count;
+ functionOnCount = FunctionList.List.GetMechanicalArmList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ break;
case ShowFunction.Light:
#region Light
functionCount = FunctionList.List.GetLightList().Count;
@@ -796,7 +803,7 @@
if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
&& item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
&& item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
- && item != ShowFunction.Acst
+ && item != ShowFunction.Acst && item != ShowFunction.IpCam
&& functionCount != 0)
{
Button btnFunctionCount = new Button()
@@ -862,6 +869,36 @@
functionPageTitleId = StringId.Lights;
#endregion
+ break;
+ case ShowFunction.IpCam:
+ btnName.TextID = StringId.SecurityMonitoring;
+
+ btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";
+
+ functionPageTitleId = StringId.SecurityMonitoring;
+
+ break;
+ case ShowFunction.MechanicalArm:
+ btnName.TextID = StringId.MechanicalArm;
+ Button btnMaPower = new Button()
+ {
+ X = Application.GetRealWidth(120),
+ Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ SelectedImagePath = "Public/PowerOpen.png",
+ UnSelectedImagePath = "Public/PowerClose.png",
+ IsSelected = functionOnCount > 0,
+ Tag = item + "_AllControl",
+ };
+ functionView.AddChidren(btnMaPower);
+
+ btnMaPower.MouseUpEventHandler = (sender, e) =>
+ {
+ LoadEvent_SwitchFunction(btnMaPower, item, functionView);
+ };
+ functionPageTitleId = StringId.MechanicalArm;
+
break;
case ShowFunction.AC:
#region AC
@@ -1033,7 +1070,7 @@
btnName.TextID = StringId.Panel;
break;
case ShowFunction.SecurityMonitoring:
- btnName.TextID = StringId.SecurityMonitoring;
+ btnName.TextID = StringId.EZVIZ;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
HDLCommon.Current.Go2EZvizMonitor(bodyView);
@@ -1073,32 +1110,33 @@
};
functionView.AddChidren(btnJMLogo);
- Button btnAcstPower = new Button()
+ //Button btnAcstPower = new Button()
+ //{
+ // X = Application.GetRealWidth(120),
+ // Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
+ // Width = Application.GetRealWidth(32),
+ // Height = Application.GetRealWidth(32),
+ // SelectedImagePath = "Public/PowerOpen.png",
+ // UnSelectedImagePath = "Public/PowerClose.png",
+ // IsSelected = functionOnCount > 0,
+ // Tag = item + "_AllControl",
+ //};
+ //functionView.AddChidren(btnAcstPower);
+ //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);
+ // foreach (var temp in FunctionList.List.GetAcstParentList())
+ // {
+ // Control.Ins.SendWriteCommand(temp, d);
+ // }
+ //};
+
+
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
- X = Application.GetRealWidth(120),
- Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
- Width = Application.GetRealWidth(32),
- Height = Application.GetRealWidth(32),
- SelectedImagePath = "Public/PowerOpen.png",
- UnSelectedImagePath = "Public/PowerClose.png",
- IsSelected = functionOnCount > 0,
- Tag = item + "_AllControl",
- };
- functionView.AddChidren(btnAcstPower);
- 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);
-
- foreach (var temp in FunctionList.List.GetAcstParentList())
- {
- Control.Ins.SendWriteCommand(temp, d);
- }
- };
-
-
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
var page = new AcstParentPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -1110,7 +1148,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 +1164,7 @@
//鍏変紡鏁版嵁
- if (FunctionList.List.InverterList().Count > 0 )
+ if (FunctionList.List.InverterList().Count > 0)
{
FrameLayout inverterListView = new FrameLayout()
{
@@ -1184,20 +1222,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()
//{
@@ -1211,12 +1263,23 @@
//};
//inverterListView.AddChidren(btnWorkStatus);
- Button btnWorkingMode = new Button()
+ Button btnWorkingModeIcon = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnOpenCount.Bottom,// + Application.GetRealHeight(16),
+ Y = btnOpenCount.Bottom + Application.GetRealHeight(5),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealWidth(14),
+ UnSelectedImagePath = "FunctionIcon/Inverter/Icon1.png"
+ };
+ inverterListView.AddChidren(btnWorkingModeIcon);
+
+
+ Button btnWorkingMode = new Button()
+ {
+ X = Application.GetRealWidth(37),
+ Y = btnOpenCount.Bottom + Application.GetRealHeight(5),// + Application.GetRealHeight(16),
Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(18),
+ Height = Application.GetRealHeight(14),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.WorkingMode,
@@ -1224,12 +1287,23 @@
};
inverterListView.AddChidren(btnWorkingMode);
- Button btnPowerTenerationToday = new Button()
+
+ Button btnPowerTenerationTodayIcon = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnWorkingMode.Bottom,
+ Y = btnWorkingMode.Bottom + Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealWidth(14),
+ UnSelectedImagePath = "FunctionIcon/Inverter/Icon2.png"
+ };
+ inverterListView.AddChidren(btnPowerTenerationTodayIcon);
+
+ Button btnPowerTenerationToday = new Button()
+ {
+ X = Application.GetRealWidth(37),
+ Y = btnWorkingMode.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(21),
+ Height = Application.GetRealHeight(14),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.PowerTenerationToday,
@@ -1237,13 +1311,22 @@
};
inverterListView.AddChidren(btnPowerTenerationToday);
+ Button btnCurrentPowerGenerationIcon = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealWidth(14),
+ UnSelectedImagePath = "FunctionIcon/Inverter/Icon3.png"
+ };
+ inverterListView.AddChidren(btnCurrentPowerGenerationIcon);
Button btnCurrentPowerGeneration = new Button()
{
- X = Application.GetRealWidth(16),
- Y = btnPowerTenerationToday.Bottom,
+ X = Application.GetRealWidth(37),
+ Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(21),
+ Height = Application.GetRealHeight(14),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.CurrentPowerGeneration,
@@ -1251,18 +1334,18 @@
};
inverterListView.AddChidren(btnCurrentPowerGeneration);
- Button btnBatterySOC = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = btnCurrentPowerGeneration.Bottom,
- Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(18),
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = StringId.BatterySOC,
- TextAlignment = TextAlignment.CenterLeft,
- };
- inverterListView.AddChidren(btnBatterySOC);
+ //Button btnBatterySOC = new Button()
+ //{
+ // X = Application.GetRealWidth(37),
+ // Y = btnCurrentPowerGeneration.Bottom,
+ // Width = Application.GetRealWidth(148),
+ // Height = Application.GetRealHeight(18),
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextID = StringId.BatterySOC,
+ // TextAlignment = TextAlignment.CenterLeft,
+ //};
+ //inverterListView.AddChidren(btnBatterySOC);
//Button btnOperationDataTotalData = new Button()
//{
@@ -1286,22 +1369,23 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
};
-#if __Android__
- //閫傞厤瀹夊崜娌夋蹈寮忓鑸爮
- h5BasePage.Y = Application.GetRealHeight(16);
- h5BasePage.Height = Application.GetRealHeight(651);
-#endif
+//#if __Android__
+ //閫傞厤娌夋蹈寮忓鑸爮
+ 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";
}
- 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={OnAppConfig.Instance.RequestHttpsHost}&language={lz}";
Inverter.Ins.ShowWebviewFormUrl(url);
+
Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
{
JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
@@ -1337,6 +1421,12 @@
{
h5BasePage.RemoveFromParent();
});
+ refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration);
+ }
+ else if (jObj["method"].ToString() == "setPageIndex")
+ {
+ var data = jObj["data"].ToString();
+ Inverter.Ins.PageIndex = data.ToString();
}
};
@@ -1344,33 +1434,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);
index++;
}
@@ -1378,6 +1442,74 @@
s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40);
#endregion
+ }
+
+ void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration)
+ {
+ 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 = info.totalElectricityPvToday + "kW路h";// Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
+ 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 = workModeString;// Language.StringByID(StringId.WorkingMode).Replace("----", workModeString);
+ btnCurrentPowerGeneration.Text = info.powerPvNow + "w";// 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 +1671,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0