From cb1476f1197b8730038b4ef485f8f036e1d93422 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 16:49:32 +0800
Subject: [PATCH] 合并文本缺漏
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 99 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 6521986..0d4f5f3 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -35,13 +35,21 @@
/// </summary>
FrameLayout environmentalView;
/// <summary>
- /// 褰撳墠娓╁害淇℃伅
+ /// 褰撳墠娓╁害淇℃伅-瀹ゅ
/// </summary>
TextButton btnTempValues;
/// <summary>
- /// 褰撳墠婀垮害淇℃伅
+ /// 褰撳墠婀垮害淇℃伅-瀹ゅ
/// </summary>
TextButton btnHumidityValues;
+ /// <summary>
+ /// 褰撳墠娓╁害淇℃伅-瀹ゅ唴
+ /// </summary>
+ TextButton btnIndoorTempValues;
+ /// <summary>
+ /// 褰撳墠婀垮害淇℃伅-瀹ゅ唴
+ /// </summary>
+ TextButton btnIndoorHumiValues;
/// <summary>
/// 褰撳墠pm2.5鐘舵��
/// </summary>
@@ -184,9 +192,27 @@
};
topView.AddChidren(environmentalView);
#region 鐜鏁版嵁
+ var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
+ var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
+
+ var btnEnvirValuesTitle = new Button() {
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.InOutdoor,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ if (tempSensorList.Count > 0 || humiSensorList.Count > 0)
+ {
+ btnEnvirValuesTitle.Width = Application.GetRealWidth(8)+ btnEnvirValuesTitle.GetTextWidth();
+ }
+ environmentalView.AddChidren(btnEnvirValuesTitle);
+
Button btnTempIcon = new Button()
{
- X = Application.GetRealWidth(12),
+ X = btnEnvirValuesTitle.Right,//+ Application.GetRealWidth(4),
+ //X = Application.GetRealWidth(12),
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
@@ -197,18 +223,44 @@
btnTempValues = new TextButton()
{
X = btnTempIcon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
Gravity = Gravity.CenterVertical,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = MainPage.cityInfo.temperature + "掳",
TextAlignment = TextAlignment.CenterLeft,
};
+ btnTempValues.Width = btnTempValues.GetTextWidth();
environmentalView.AddChidren(btnTempValues);
+
+ btnIndoorTempValues = new TextButton()
+ {
+ X = btnTempValues.Right,
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "/--掳",
+ };
+ if (tempSensorList.Count > 0)
+ {
+ double tempTotalValues = 0;
+ foreach (var temp in tempSensorList)
+ {
+ double tempValue = 0;
+ double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out tempValue);
+ tempTotalValues += tempValue;
+ }
+ if (tempTotalValues > 0)
+ {
+ btnIndoorTempValues.Text = "/" + tempTotalValues + "掳";
+ }
+ btnIndoorTempValues.Width = btnIndoorTempValues.GetTextWidth();
+ }
+ environmentalView.AddChidren(btnIndoorTempValues);
Button btnHumidityIcon = new Button()
{
- X = btnTempValues.Right + Application.GetRealWidth(2),
+ X = btnIndoorTempValues.Right + Application.GetRealWidth(8),
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
@@ -219,18 +271,44 @@
btnHumidityValues = new TextButton()
{
X = btnHumidityIcon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
Gravity = Gravity.CenterVertical,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = MainPage.cityInfo.humidity + "%",
TextAlignment = TextAlignment.CenterLeft,
};
+ btnHumidityValues.Width = btnHumidityValues.GetTextWidth();
environmentalView.AddChidren(btnHumidityValues);
+
+ btnIndoorHumiValues = new TextButton()
+ {
+ X = btnHumidityValues.Right,
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "/--%",
+ };
+ if (tempSensorList.Count > 0)
+ {
+ double humiTotalValues = 0;
+ foreach (var humi in humiSensorList)
+ {
+ double humiValue = 0;
+ double.TryParse(humi.GetAttrState(FunctionAttributeKey.Value), out humiValue);
+ humiTotalValues += humiValue;
+ }
+ if (humiTotalValues > 0)
+ {
+ btnIndoorHumiValues.Text = "/" + humiTotalValues + "%";
+ }
+ btnIndoorHumiValues.Width = btnIndoorHumiValues.GetTextWidth();
+ }
+ environmentalView.AddChidren(btnIndoorHumiValues);
Button btnPm25Icon = new Button()
{
- X = btnHumidityValues.Right + Application.GetRealWidth(2),
+ X = btnIndoorHumiValues.Right + Application.GetRealWidth(4),
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
@@ -241,13 +319,13 @@
btnPm25Values = new TextButton()
{
X = btnPm25Icon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(130),
Gravity = Gravity.CenterVertical,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = MainPage.cityInfo.pm25,
TextAlignment = TextAlignment.CenterLeft,
};
+ btnPm25Values.Width = btnPm25Values.GetTextWidth();
environmentalView.AddChidren(btnPm25Values);
#endregion
@@ -868,10 +946,9 @@
LoadEvent_ControlCurtain(function, btnCurtainClose, btnCurtainOpen);
}
- else if (function.spk == SPK.ElectricTV || function.spk == SPK.TvIr
- ||function.spk == SPK.StbIr || function.spk == SPK.PjtIr)
+ else if (function.spk == SPK.ElectricTV || function.spk == SPK.TvIr || function.spk == SPK.TvXmIr
+ || function.spk == SPK.StbIr || function.spk == SPK.PjtIr)
{
-
//btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
//btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
--
Gitblit v1.8.0