From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 222 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 175 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index 6c3064a..68f8232 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
@@ -36,7 +38,7 @@
Action actionRefresh;
#endregion
- public FunctionBaseInfoSetPage(Function func,Action action)
+ public FunctionBaseInfoSetPage(Function func, Action action)
{
bodyView = this;
function = func;
@@ -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()
{
@@ -72,8 +81,8 @@
btnFunctionName = new Button()
{
- X = Application.GetRealWidth(186),
- Width = Application.GetRealWidth(137),
+ X = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(237),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
@@ -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()
{
@@ -125,8 +133,8 @@
btnLocationValues = new Button()
{
- X = Application.GetRealWidth(186),
- Width = Application.GetRealWidth(137),
+ X = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(237),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
@@ -156,55 +164,53 @@
#endregion
#region 鍏变韩
- var sharedView = new FrameLayout()
- {
- Y = locationMagtView.Bottom,
- Height = Application.GetRealHeight(55),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(sharedView);
+ //var sharedView = new FrameLayout()
+ //{
+ // Height = Application.GetRealHeight(55),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ //};
+ //contentView.AddChidren(sharedView);
- var btnSharedText = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(160),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.Shared,
- };
- sharedView.AddChidren(btnSharedText);
+ //var btnSharedText = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // Width = Application.GetRealWidth(160),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextID = StringId.Shared,
+ //};
+ //sharedView.AddChidren(btnSharedText);
- var btnSharedRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/RightIcon.png",
- };
- sharedView.AddChidren(btnSharedRight);
+ //var btnSharedRight = new Button()
+ //{
+ // X = Application.GetRealWidth(339),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/RightIcon.png",
+ //};
+ //sharedView.AddChidren(btnSharedRight);
- sharedView.AddChidren(
- new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(54),
- BackgroundColor = CSS_Color.DividingLineColor,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(1)
- });
-
+ //sharedView.AddChidren(
+ // new Button()
+ // {
+ // Gravity = Gravity.CenterHorizontal,
+ // Y = Application.GetRealHeight(54),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(1)
+ // });
#endregion
+#if stage2
#region 娣诲姞鍒版闈�
var addToDesktopView = new FrameLayout()
{
- Y = sharedView.Bottom,
Height = Application.GetRealHeight(55),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(addToDesktopView);
+ contentView.AddChidren(addToDesktopView);
var btnAddToDesktopText = new Button()
{
@@ -228,6 +234,128 @@
addToDesktopView.AddChidren(btnAddToDesktopRight);
#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);
+
+
+ double realTimePower = 0;
+ double.TryParse(function.GetAttrState(FunctionAttributeKey.Power), out realTimePower);
+ realTimePower /= 1000;
+
+ var energyValue1 = new Button()
+ {
+ Width = Application.GetRealWidth(355),
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ Text = realTimePower + "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 btnEnergyValue2 = new Button()
+ {
+ Width = Application.GetRealWidth(355),
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ Text = "--kW",
+ };
+ energyView2.AddChidren(btnEnergyValue2);
+
+ 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 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)
+ {
+ try
+ {
+ var dataValue = dataPack.GetValue("monthDiff").ToString();
+ if (!string.IsNullOrEmpty(dataValue))
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnEnergyValue2.Text = dataValue + "kW鈥";
+ });
+ }
+ }
+ catch
+ {
+
+ }
+ }
+ }
+ }
+
+ })
+ { IsBackground = true }.Start();
+
+ #endregion
+ }
LoadEventList();
}
--
Gitblit v1.8.0