From 9b76aa77b9c5bf8ccb373cb30e3dca85d224175e Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 25 十月 2024 11:36:49 +0800
Subject: [PATCH] 金茂UI走查，字体更换
---
HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs | 115 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
index 306332d..1883669 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
@@ -143,6 +143,12 @@
/// </summary>
Button btnPowerControl;
+#if __ANDROID__
+ private string fontName = "BEBAS2.otf";
+#else
+ private string fontName = "BEBAS";
+#endif
+
public WaterHeaterJinmaoPage(Function deviceFunction)
{
bodyView = this;
@@ -159,14 +165,14 @@
contentView = new VerticalScrolViewLayout()
{
Y = topView.contentView.Height,
- Height = Application.GetRealHeight(Application.DesignHeight - 94 - 5) - topView.contentView.Height,
+ Height = Application.GetRealHeight(Application.DesignHeight) - topView.contentView.Height - Application.GetRealWidth(94),
};
bodyView.AddChidren(contentView);
bottomView = new FrameLayout()
{
- Y = Application.GetRealHeight(Application.DesignHeight - 94),
- Height = Application.GetRealHeight(94 + 16),
+ Y = Application.GetRealHeight(Application.DesignHeight) - Application.GetRealWidth(94),
+ Height = Application.GetRealWidth(94 + 16),
BackgroundColor = CSS_Color.MainBackgroundColor,
Radius = (uint)Application.GetRealHeight(16),
BorderColor = 0x00FFFFFF,
@@ -187,14 +193,14 @@
/// </summary>
private void initContentView()
{
- contentView.AddChidren(new Button() { Height = Application.GetRealHeight(16) });
+ contentView.AddChidren(new Button() { Height = Application.GetRealWidth(16) });
#region 鐑按鍣ㄧ姸鎬�
FrameLayout infoView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(181),
+ Height = Application.GetRealWidth(181),
BackgroundColor = CSS_Color.MainBackgroundColor,
Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
@@ -238,22 +244,23 @@
var infoView_Temp_View = new FrameLayout()
{
Gravity = Gravity.Center,
- Width = Application.GetRealWidth(133),
- Height = Application.GetRealWidth(133),
+ Width = Application.GetRealWidth(181),
+ Height = Application.GetRealWidth(181),
BackgroundImagePath = "FunctionIcon/Acst/WaterHeater/TempBg.png"
};
infoView.AddChidren(infoView_Temp_View);
btnTempValues = new Button()
{
- Y = Application.GetRealWidth(34),
+ Y = Application.GetRealWidth(58),
Gravity = Gravity.CenterVertical,
Height = Application.GetRealWidth(43),
IsBold = true,
TextSize = 32,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.TopCenter,
- Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString(), "---"),
+ Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString(), "--"),
+ FontName = fontName,
};
btnTempValues.Width = btnTempValues.GetTextWidth() + Application.GetRealWidth(6);
if (btnTempValues.Width > Application.GetRealWidth(80))
@@ -267,7 +274,7 @@
btnTempValuesUint = new Button()
{
X = btnTempValues.Right,
- Y = Application.GetRealWidth(40),
+ Y = Application.GetRealWidth(64),
Height = Application.GetRealWidth(66),
TextAlignment = TextAlignment.TopLeft,
Width = Application.GetRealWidth(30),
@@ -279,7 +286,7 @@
var infoView_Temp_Text = new Button()
{
- Y = Application.GetRealWidth(80),
+ Y = Application.GetRealWidth(104),
Height = Application.GetRealWidth(23),
TextAlignment = TextAlignment.Center,
TextSize = 12,
@@ -433,6 +440,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.TopCenter,
Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString(), "---"),
+ FontName = fontName,
};
setTemp_ValuesButton.Width = setTemp_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
setTemp_ValuesButton.Gravity = Gravity.CenterHorizontal;
@@ -503,7 +511,6 @@
setTempView.AddChidren(setTemp_Temp_MaxValuesTextButton);
#endregion
-
#region flow 鐑按娴侀噺
if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.flow.ToString()) != null)
{
@@ -536,6 +543,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
Text = "鐑按娴侀噺锛�" + function.GetAttrState(WaterHeaterJinmao_AttrEnum.flow.ToString()) + "L/min",
IsBold = true,
+ FontName = fontName,
};
flowView.AddChidren(flow_ValuesButton);
@@ -571,6 +579,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
+ FontName = fontName,
};
flowView.AddChidren(flow_VolumeButton);
@@ -617,7 +626,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
TextColor = 0xFF00C22D,
- Text = recyclVolumePercent + "%"
+ Text = recyclVolumePercent + "%",
+ FontName = fontName,
};
flowView.AddChidren(flow_HeatRecoveryProgressButton);
@@ -630,7 +640,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = recyclVolume + "t"
+ Text = recyclVolume + "t",
+ FontName = fontName,
};
flowView.AddChidren(flow_HeatRecoverytValuesButton);
@@ -656,7 +667,8 @@
TextAlignment = TextAlignment.CenterRight,
TextSize = 14,
TextColor = 0xFFFC9C04,
- Text = "0%"
+ Text = "0%",
+ FontName = fontName,
};
if (volume > 0)
{
@@ -673,7 +685,8 @@
TextAlignment = TextAlignment.CenterRight,
TextSize = 14,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = Math.Round((volume - recyclVolume),1) + "t"
+ Text = Math.Round((volume - recyclVolume),1) + "t",
+ FontName = fontName,
};
flowView.AddChidren(flow_ElectricDriveValuesButton);
@@ -707,7 +720,7 @@
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(142),
+ Height = Application.GetRealWidth(130),
ScrollEnabled = false,
};
contentView.AddChidren(socialContributionView);
@@ -732,33 +745,41 @@
};
socialContribution_InfoView_1.AddChidren(socialContribution_Info1_IconButton);
+ var socialContribution_Info1_ValuesView = new FrameLayout()
+ {
+ Y = Application.GetRealWidth(68),
+ Height = Application.GetRealWidth(25),
+ };
+ socialContribution_InfoView_1.AddChidren(socialContribution_Info1_ValuesView);
+
socialContribution_Info1_ValuesButton = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(68),
+ //Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(36),
- Height = Application.GetRealWidth(25),
+ //Height = Application.GetRealWidth(25),
Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.energy_electricity.ToString()),
TextSize = 18,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
+ FontName = fontName,
};
socialContribution_Info1_ValuesButton.Width = socialContribution_Info1_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
- socialContribution_InfoView_1.AddChidren(socialContribution_Info1_ValuesButton);
+ socialContribution_Info1_ValuesView.AddChidren(socialContribution_Info1_ValuesButton);
socialContribution_Info1_UintButton = new Button()
{
X = socialContribution_Info1_ValuesButton.Right,
- Y = Application.GetRealWidth(68),
+ //Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(50),
- Height = Application.GetRealWidth(23),
+ //Height = Application.GetRealWidth(23),
Text = "kwh",
TextSize = 12,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
};
- socialContribution_InfoView_1.AddChidren(socialContribution_Info1_UintButton);
+ socialContribution_Info1_ValuesView.AddChidren(socialContribution_Info1_UintButton);
var socialContribution_Info1_TipButton = new Button()
{
@@ -800,37 +821,41 @@
};
socialContribution_InfoView_2.AddChidren(socialContribution_Info2_IconButton);
+ var socialContribution_Info2_ValuesView = new FrameLayout()
+ {
+ Y = Application.GetRealWidth(68),
+ Height = Application.GetRealWidth(25),
+ };
+ socialContribution_InfoView_2.AddChidren(socialContribution_Info2_ValuesView);
+
socialContribution_Info2_ValuesButton = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(68),
+ //Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(36),
- Height = Application.GetRealWidth(25),
+ //Height = Application.GetRealWidth(25),
Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.co2.ToString()),
TextSize = 18,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
+ FontName = fontName,
};
socialContribution_Info2_ValuesButton.Width = socialContribution_Info2_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
- socialContribution_InfoView_2.AddChidren(socialContribution_Info2_ValuesButton);
-
+ socialContribution_Info2_ValuesView.AddChidren(socialContribution_Info2_ValuesButton);
socialContribution_Info2_UintButton = new Button()
{
X = socialContribution_Info2_ValuesButton.Right,
- Y = Application.GetRealWidth(68),
+ //Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(50),
- Height = Application.GetRealWidth(23),
+ //Height = Application.GetRealWidth(23),
Text = "鍚�",
TextSize = 12,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
};
-#if __IOS__
- socialContribution_Info2_UintButton.Y = Application.GetRealWidth(66);
-#endif
- socialContribution_InfoView_2.AddChidren(socialContribution_Info2_UintButton);
+ socialContribution_Info2_ValuesView.AddChidren(socialContribution_Info2_UintButton);
var socialContribution_Info2_TipButton = new Button()
{
@@ -872,36 +897,41 @@
};
socialContribution_InfoView_3.AddChidren(socialContribution_Info3_IconButton);
+ var socialContribution_Info3_ValuesView = new FrameLayout()
+ {
+ Y = Application.GetRealWidth(68),
+ Height = Application.GetRealWidth(25),
+ };
+ socialContribution_InfoView_3.AddChidren(socialContribution_Info3_ValuesView);
+
socialContribution_Info3_ValuesButton = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(68),
+ //Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(36),
- Height = Application.GetRealWidth(25),
+ //Height = Application.GetRealWidth(25),
Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.trees.ToString()),
TextSize = 18,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
+ FontName = fontName,
};
socialContribution_Info3_ValuesButton.Width = socialContribution_Info3_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
- socialContribution_InfoView_3.AddChidren(socialContribution_Info3_ValuesButton);
+ socialContribution_Info3_ValuesView.AddChidren(socialContribution_Info3_ValuesButton);
socialContribution_Info3_UintButton = new Button()
{
X = socialContribution_Info3_ValuesButton.Right,
- Y = Application.GetRealWidth(68),
+ //Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(50),
- Height = Application.GetRealWidth(23),
+ //Height = Application.GetRealWidth(23),
Text = "妫�",
TextSize = 12,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
};
-#if __IOS__
- socialContribution_Info3_UintButton.Y = Application.GetRealWidth(66);
-#endif
- socialContribution_InfoView_3.AddChidren(socialContribution_Info3_UintButton);
+ socialContribution_Info3_ValuesView.AddChidren(socialContribution_Info3_UintButton);
var socialContribution_Info3_TipButton = new Button()
{
@@ -922,6 +952,7 @@
#endregion
+ contentView.AddChidren(new Button() { Height = Application.GetRealWidth(12) });
}
/// <summary>
--
Gitblit v1.8.0