From 6aae0b4d094c54cd5d7d27cda7b439d9d62d0bc7 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期日, 23 五月 2021 14:43:04 +0800 Subject: [PATCH] 能耗功能,红外宝功能 --- HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 127 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 119 insertions(+), 8 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs index ed8ba3b..bbb692a 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs @@ -1,6 +1,8 @@ 锘縰sing System; +using HDL_ON.DAL.Server; using HDL_ON.Entity; using HDL_ON.UI.CSS; +using Newtonsoft.Json.Linq; using Shared; namespace HDL_ON.UI @@ -50,14 +52,21 @@ bodyView.BackgroundColor = CSS_Color.BackgroundColor; new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView(actionRefresh); + var contentView = new VerticalScrolViewLayout() + { + Y = Application.GetRealHeight(64), + Height = Application.GetRealHeight(600), + ScrollEnabled = false, + }; + bodyView.AddChidren(contentView); + #region name view var nameView = new FrameLayout() { - Y = Application.GetRealHeight(64), Height = Application.GetRealHeight(50), BackgroundColor = CSS_Color.MainBackgroundColor, }; - bodyView.AddChidren(nameView); + contentView.AddChidren(nameView); var btnNameText = new Button() { @@ -106,11 +115,10 @@ #region 浣嶇疆绠$悊 var locationMagtView = new FrameLayout() { - Y = nameView.Bottom, Height = Application.GetRealHeight(55), BackgroundColor = CSS_Color.MainBackgroundColor, }; - bodyView.AddChidren(locationMagtView); + contentView.AddChidren(locationMagtView); var btnLocationMagtTitle = new Button() { @@ -158,11 +166,10 @@ #region 鍏变韩 //var sharedView = new FrameLayout() //{ - // Y = locationMagtView.Bottom, // Height = Application.GetRealHeight(55), // BackgroundColor = CSS_Color.MainBackgroundColor, //}; - //bodyView.AddChidren(sharedView); + //contentView.AddChidren(sharedView); //var btnSharedText = new Button() //{ @@ -200,11 +207,10 @@ #region 娣诲姞鍒版闈� var addToDesktopView = new FrameLayout() { - Y = locationMagtView.Bottom, Height = Application.GetRealHeight(55), BackgroundColor = CSS_Color.MainBackgroundColor, }; - bodyView.AddChidren(addToDesktopView); + contentView.AddChidren(addToDesktopView); var btnAddToDesktopText = new Button() { @@ -229,6 +235,111 @@ #endregion #endif + + if (function.spk == SPK.ElectricEnergy) + { + #region 鑳芥簮鏁版嵁 + var energyView1 = new FrameLayout() + { + Height = Application.GetRealHeight(55), + BackgroundColor = CSS_Color.MainBackgroundColor, + }; + contentView.AddChidren(energyView1); + + var btnEnergyText1 = new Button() + { + X = Application.GetRealWidth(16), + Width = Application.GetRealWidth(160), + TextAlignment = TextAlignment.CenterLeft, + TextColor = CSS_Color.FirstLevelTitleColor, + TextSize = CSS_FontSize.SubheadingFontSize, + TextID = StringId.RealTimeEnergyConsumption, + }; + energyView1.AddChidren(btnEnergyText1); + + var energyValue1 = new Button() + { + Width = Application.GetRealWidth(355), + TextAlignment = TextAlignment.CenterRight, + TextSize = CSS_FontSize.TextFontSize, + TextColor = CSS_Color.PromptingColor1, + Text = function.GetAttrState(FunctionAttributeKey.Power) + "kW", + }; + energyView1.AddChidren(energyValue1); + + energyView1.AddChidren( + new Button() + { + Gravity = Gravity.CenterHorizontal, + Y = Application.GetRealHeight(54), + BackgroundColor = CSS_Color.DividingLineColor, + Width = Application.GetRealWidth(343), + Height = Application.GetRealHeight(1) + }); + //----------------- + + var energyView2 = new FrameLayout() + { + Height = Application.GetRealHeight(55), + BackgroundColor = CSS_Color.MainBackgroundColor, + }; + contentView.AddChidren(energyView2); + + var btnEnergyText2 = new Button() + { + X = Application.GetRealWidth(16), + Width = Application.GetRealWidth(160), + TextAlignment = TextAlignment.CenterLeft, + TextColor = CSS_Color.FirstLevelTitleColor, + TextSize = CSS_FontSize.SubheadingFontSize, + TextID = StringId.EnergyConsumptionOfThisMonth, + }; + energyView2.AddChidren(btnEnergyText2); + + var energyValue2 = new Button() + { + Width = Application.GetRealWidth(355), + TextAlignment = TextAlignment.CenterRight, + TextSize = CSS_FontSize.TextFontSize, + TextColor = CSS_Color.PromptingColor1, + Text = "--kW", + }; + energyView2.AddChidren(energyValue2); + + energyView2.AddChidren( + new Button() + { + Gravity = Gravity.CenterHorizontal, + Y = Application.GetRealHeight(54), + BackgroundColor = CSS_Color.DividingLineColor, + Width = Application.GetRealWidth(343), + Height = Application.GetRealHeight(1) + }); + + new System.Threading.Thread(() => { + var pm = new DAL.Server.HttpServerRequest(); + var data = pm.GetLastMonthHistory(function.deviceId,FunctionAttributeKey.TotalElectricity); + if(data!= null) + { + if(data.Code == StateCode.SUCCESS) + { + var dataPack = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(data.Data.ToString()); + if(dataPack!=null) + { + var dataValue = dataPack.GetValue("property").ToString(); + if(!string.IsNullOrEmpty(dataValue)) + { + btnEnergyText2.Text = dataValue + "kW"; + } + } + } + } + + }) { IsBackground = true }.Start(); + + #endregion + } + LoadEventList(); } -- Gitblit v1.8.0