From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone
---
HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
index aca8e0a..1757757 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
@@ -179,6 +179,7 @@
double tt = 0;
double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt);
tt *= 100;//涔樹互100锛屽皬浜�1鏃犳硶鍔犺浇echart
+ tt = Math.Round(tt, 2);
list.Add(ene.name, tt.ToString());
}
myEchartsView_Pie.ShowWithOption(new EchartsOption_Pie().InitDateJson(list));
@@ -506,10 +507,13 @@
row.Y = btnLine.Bottom;
view.AddChidren(row);
+ //璁板綍闇�瑕佹洿鏂扮殑鏇存柊鎸夐挳
listButton_value.Add(row.btnValue);
}
-
+ /// <summary>
+ /// 璁板綍闇�瑕佹洿鏂扮殑鏇存柊鎸夐挳
+ /// </summary>
public List<Button> listButton_value = new List<Button>();
/// <summary>
@@ -530,7 +534,7 @@
var newValue = updataTemp.GetAttrState(FunctionAttributeKey.Power);
//if (newValue != btn.Text)
{
- btn.Text = newValue;
+ btn.Text = Math.Round(double.Parse(newValue), 2).ToString();
UpdataValue();
}
}
@@ -553,17 +557,20 @@
Dictionary<string, string> list = new Dictionary<string, string>();//楗煎浘鏁版嵁
foreach (var ene in bodyView.energyList)
{
- double power = 0;
+ double power = 0.00;
double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out power);
+ power = Math.Round(power, 2);
totalValue += power;
- int realTimePower = 0;
- int.TryParse(ene.GetAttrState(FunctionAttributeKey.Power), out realTimePower);
+ double realTimePower = 0;
+ double.TryParse(ene.GetAttrState(FunctionAttributeKey.Power), out realTimePower);
realtimeValue += realTimePower;
+ realtimeValue = Math.Round(realtimeValue, 2);
#region 楗煎浘鏁版嵁
- double tt = 0;
+ double tt = 0.00;
double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt);
+ tt = Math.Round(tt, 2);
tt *= 100;//涔樹互100锛屽皬浜�1鏃犳硶鍔犺浇echart
list.Add(ene.name, tt.ToString());
#endregion
--
Gitblit v1.8.0