From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 547 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 421 insertions(+), 126 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 0df5996..59d643c 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -5,12 +5,16 @@
using HDL_ON.Entity;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Shared;
namespace HDL_ON.UI
{
+ /// <summary>
+ /// 鍒嗙被鐣岄潰
+ /// </summary>
public partial class ClassificationPage : FrameLayout
{
@@ -85,14 +89,14 @@
#region top
FrameLayout topView = new FrameLayout()
{
- Height = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(74),
BackgroundColor = CSS_Color.TopViewColor,
};
bodyView.AddChidren(topView);
btnRoomTilte = new Button()
{
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Width = Application.GetRealWidth(170),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.CenterRight,
@@ -107,7 +111,7 @@
btnFuncTitle = new Button()
{
X = Application.GetRealWidth(209),
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Width = Application.GetRealWidth(170),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.CenterLeft,
@@ -121,8 +125,8 @@
contentPageView = new PageLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64 - 49 + 30),
+ Y = Application.GetRealHeight(74),
+ Height = Application.GetRealHeight(667 - 74 - 49 + 30),
BackgroundColor = CSS_Color.MainBackgroundColor,
IsShowPoint = false
};
@@ -605,21 +609,35 @@
};
}
-
/// <summary>
/// 鍔犺浇鍔熻兘鍒楄〃鐣岄潰
/// </summary>
- void LoadFunctionPageView()
+ void LoadFunctionPageView ()
{
- #region
functionsPageView = new VerticalScrolViewLayout()
{
BackgroundColor = CSS_Color.BackgroundColor,
Height = Application.GetRealHeight(667 - 64 - 49 + 20),
};
contentPageView.AddChidren(functionsPageView);
+ this.RefreshFunctionView();
- FrameLayout functionContentView;
+ }
+ FrameLayout functionContentView;
+ /// <summary>
+ /// 鏄剧ず鍔熻兘鍒楄〃鐣岄潰
+ /// </summary>
+ void RefreshFunctionView()
+ {
+ #region
+ //functionsPageView = new VerticalScrolViewLayout()
+ //{
+ // BackgroundColor = CSS_Color.BackgroundColor,
+ // Height = Application.GetRealHeight(667 - 64 - 49 + 20),
+ //};
+ //contentPageView.AddChidren(functionsPageView);
+
+ //FrameLayout functionContentView;
functionContentView = new FrameLayout()
{
Y = Application.GetRealHeight(16),
@@ -649,12 +667,23 @@
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.Series:
+ functionCount = FunctionList.List.GetSeries().Count;
+ //functionOnCount = FunctionList.List.GetSeries().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ break;
+ 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;
@@ -685,8 +714,12 @@
break;
case ShowFunction.Electric:
#region 鐢靛櫒
+
functionCount = FunctionList.List.GetElectricals().Count;
- functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.spk!=SPK.ElectricalTvHisense&&obj.trait_on_off.curValue.ToString() == "on").Count;
+//#if DEBUG
+// functionCount = 1;
+//#endif
#endregion
break;
case ShowFunction.EnergyMonitoring:
@@ -715,7 +748,14 @@
case ShowFunction.SecurityMonitoring:
if (!MainPage.NoLoginMode)
{
- functionCount = 1;
+ if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain") || !Common.ApiUtlis.Ins.hadInternet)
+ {
+ functionCount = 0;
+ }
+ else
+ {
+ functionCount = 1;
+ }
}
break;
case ShowFunction.Sensor:
@@ -729,15 +769,28 @@
break;
case ShowFunction.SecurityCenter:
functionCount = FunctionList.List.securities.Count;
- //if (DB_ResidenceData.Instance.GatewayType == 1)
- //{
- // functionCount = 1;
- //}
break;
case ShowFunction.Acst:
functionCount = FunctionList.List.GetAcstParentList().Count;
functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
+ case ShowFunction.VideoDoorLock:
+ if (Common.ApiUtlis.Ins.hadInternet)
+ {
+ functionCount = FunctionList.List.GetVideoDoorLockList().Count;
+ functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
+ || obj.GetAttrState("status").ToString() == "normal_open").Count;
+ }
+ else
+ {
+ functionCount = 0;
+ }
+ break;
+ case ShowFunction.Aks:
+ functionCount = FunctionList.List.GetVideoControlsList().Count;
+ functionOnCount = 1;
+ break;
+
}
@@ -793,13 +846,22 @@
};
functionView.AddChidren(btnName);
- 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
+ //涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
+ Button btnFunctionCount=null;
+ if (item != ShowFunction.Aks
+ && item != ShowFunction.VideoDoorLock
+ && 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.IpCam
&& functionCount != 0)
{
- Button btnFunctionCount = new Button()
+ btnFunctionCount = new Button()
{
X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
Y = btnName.Bottom,
@@ -810,21 +872,29 @@
TextAlignment = TextAlignment.CenterLeft,
Text = "/" + functionCount,
};
- functionView.AddChidren(btnFunctionCount);
- Button btnOpenCount = new Button()
+ if (item == ShowFunction.Series)
{
- X = Application.GetRealWidth(16),
- Y = btnName.Bottom,
- Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
- Height = Application.GetRealHeight(24),
- TextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Text = functionOnCount.ToString(),
- Tag = item + "_onCount",
- BorderWidth = 0,
- };
- functionView.AddChidren(btnOpenCount);
+ btnFunctionCount.Text = functionCount.ToString();
+ }
+ functionView.AddChidren(btnFunctionCount);
+
+ if (item != ShowFunction.Series)
+ {
+ Button btnOpenCount = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnName.Bottom,
+ Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
+ Height = Application.GetRealHeight(24),
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = functionOnCount.ToString(),
+ Tag = item + "_onCount",
+ BorderWidth = 0,
+ };
+ functionView.AddChidren(btnOpenCount);
+ }
}
@@ -839,6 +909,16 @@
int functionPageTitleId = 0;
switch (item)
{
+ case ShowFunction.Series:
+ btnName.TextID = StringId.HorseRaceLamp;
+ functionPageTitleId = StringId.HorseRaceLamp;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ var page2 = new UI2.Classification.SeriesFunctionListPage();
+ MainPage.BasePageView.AddChidren(page2);
+ page2.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ break;
case ShowFunction.Light:
#region Light
btnName.TextID = StringId.Lights;
@@ -862,6 +942,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
@@ -973,13 +1083,15 @@
case ShowFunction.EnergyMonitoring:
#region 鑳芥簮鐩戞祴
btnName.TextID = StringId.EnergyMonitoring;
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new EnergyMainPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.EnergyMonitoring;
+
+ //btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ //{
+ // var skipView = new EnergyMainPage();
+ // MainPage.BasePageView.AddChidren(skipView);
+ // skipView.LoadPage();
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //};
#endregion
break;
case ShowFunction.Environmental:
@@ -1033,7 +1145,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,48 +1185,92 @@
};
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);
- Control.Ins.SendWriteCommand(FunctionList.List.GetAcstParentList()[0], d);
- };
-
-
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
var page = new AcstParentPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
break;
+ case ShowFunction.VideoDoorLock:
+ //钀ょ煶瑙嗛闂ㄩ攣
+ btnName.TextID = StringId.yingshishipinmensuo;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var list =CommonMethod.Current.GetVideoDoorLockList();
+ var form = new VideoDoorLockListPage(()=> {
+ UpdateBottomView();
+ });
+ form.AddForm(list);
+ };
+ break;
+ case ShowFunction.Aks:
+ btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
+ //鍩冨厠鏂奖闊充腑鎺�
+ btnName.TextID = StringId.jiatingyingyuan;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var list = HDL_ON.UI.UI2.FuntionControlView.Aks.AksCommonMethod.Current.GetVideoControlsList();
+ var form = new HDL_ON.UI.UI2.FuntionControlView.Aks.AksListPage(() => {
+ UpdateBottomView();
+ });
+ form.AddForm(list);
+ };
+ break;
}
- //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
- && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
+ //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�--鍩冨厠鏂奖闊充腑鎺�
+ if (item != ShowFunction.VideoDoorLock
+ && item != ShowFunction.Aks
+ && item != ShowFunction.Music
+ && item != ShowFunction.Environmental
+ && item != ShowFunction.SecurityMonitoring
+ && item != ShowFunction.DoorLock
+ //&& ShowFunction.EnergyMonitoring != item
+ && ShowFunction.VideoIntercom != item
+ && ShowFunction.SecurityCenter != item
+ && ShowFunction.Series != item
&& ShowFunction.Acst != item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
+
var skipView = new FunctionPage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage(functionPageTitleId);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ skipView.DelAction += () =>
+ {
+
+ UpdateBottomView();
+ };
};
}
index++;
@@ -1122,7 +1278,7 @@
//鍏変紡鏁版嵁
- if (FunctionList.List.InverterList().Count > 0 )
+ if (FunctionList.List.InverterList().Count > 0)
{
FrameLayout inverterListView = new FrameLayout()
{
@@ -1180,20 +1336,34 @@
Text = "/" + FunctionList.List.InverterList().Count,
};
inverterListView.AddChidren(btnFunctionCount);
+
+ int count = 0;
+ foreach (var temp in FunctionList.List.InverterList())
+ {
+ if (temp.isOnline())
+ {
+ 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()
//{
@@ -1207,12 +1377,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,
@@ -1220,12 +1401,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,
@@ -1233,13 +1425,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,
@@ -1247,18 +1448,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()
//{
@@ -1278,27 +1479,53 @@
clickButton.MouseUpEventHandler = (sender2, e2) =>
{
- var h5BasePage = new FrameLayout();
+ var h5BasePage = new FrameLayout() {
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
-#if __Android__
- //閫傞厤瀹夊崜娌夋蹈寮忓鑸爮
- h5BasePage.Y = Application.GetRealHeight(16);
- h5BasePage.Height = Application.GetRealHeight(651);
-#endif
+//#if __Android__
+ //閫傞厤娌夋蹈寮忓鑸爮
+ h5BasePage.Y = Application.GetRealHeight(35);
+ 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 == "Ukraine") {
+ lz = "ua";
+ }
+ else if (Language.CurrentLanguage == "Chinese")
+ {
+ lz = "zh";
+ }
+ else
{
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);
+
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ var status = new Dictionary<string, object> { ["method"] = "weather", ["data"] = MainPage.cityInfo.weather };
+ Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
+ });
+ })
+ { IsBackground = true }.Start();
Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
{
+#if __IOS__
JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
+#else
+ var valuePairs = "";
+ dictionary.TryGetValue("method", out valuePairs);
+ JObject jObj = JObject.Parse(valuePairs);
+#endif
if (!jObj.ContainsKey("method") || !jObj.ContainsKey("data"))
{
@@ -1331,41 +1558,97 @@
{
h5BasePage.RemoveFromParent();
});
+ refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration);
+ }
+ else if (jObj["method"].ToString() == "setPageIndex")
+ {
+ var data = jObj["data"].ToString();
+ Inverter.Ins.PageIndex = data.ToString();
}
};
+
+
+
};
- new System.Threading.Thread(() => {
- var http = new HttpServerRequest();
- var pack = http.GetInverterStatisticsInfo();
- if(pack!= null)
- {
- var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data.ToString());
- 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++;
}
s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40);
- #endregion
+#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 鍒囨崲妤煎眰
@@ -1525,6 +1808,18 @@
{
}
-#endregion
+ #endregion
+
+ /// <summary>
+ /// 鏇存柊搴曢儴鐣岄潰
+ /// </summary>
+ void UpdateBottomView()
+ {
+ Application.RunOnMainThread(() =>
+ {
+ functionContentView?.RemoveFromParent();
+ this.RefreshFunctionView();
+ });
+ }
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0