wxr
2024-10-25 9b76aa77b9c5bf8ccb373cb30e3dca85d224175e
HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
@@ -144,7 +144,7 @@
        Button btnPowerControl;
#if __ANDROID__
        private string fontName = "BEBAS.ttf";
        private string fontName = "BEBAS2.otf";
#else
        private string fontName = "BEBAS";
#endif
@@ -244,22 +244,22 @@
            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);
@@ -274,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),
@@ -286,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,
@@ -543,6 +543,7 @@
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    Text = "热水流量:" + function.GetAttrState(WaterHeaterJinmao_AttrEnum.flow.ToString()) + "L/min",
                    IsBold = true,
                    FontName = fontName,
                };
                flowView.AddChidren(flow_ValuesButton);
@@ -578,6 +579,7 @@
                    TextAlignment = TextAlignment.CenterRight,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    FontName = fontName,
                };
                flowView.AddChidren(flow_VolumeButton);
@@ -624,7 +626,8 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = 14,
                    TextColor = 0xFF00C22D,
                    Text = recyclVolumePercent + "%"
                    Text = recyclVolumePercent + "%",
                    FontName = fontName,
                };
                flowView.AddChidren(flow_HeatRecoveryProgressButton);
@@ -637,7 +640,8 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = 14,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    Text = recyclVolume + "t"
                    Text = recyclVolume + "t",
                    FontName = fontName,
                };
                flowView.AddChidren(flow_HeatRecoverytValuesButton);
@@ -663,7 +667,8 @@
                    TextAlignment = TextAlignment.CenterRight,
                    TextSize = 14,
                    TextColor = 0xFFFC9C04,
                    Text = "0%"
                    Text = "0%",
                    FontName = fontName,
                };
                if (volume > 0)
                {
@@ -680,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);