金茂UI走查，字体更换

wxr

2024-10-25 9b76aa77b9c5bf8ccb373cb30e3dca85d224175e

金茂UI走查，字体更换

 HDL-ON_Android/Assets/BEBAS.ttf

Binary files differ

 HDL-ON_Android/Assets/BEBAS2.otf

Binary files differ

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/PowerIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/PowerIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/PowerIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -672,9 +672,9 @@
    <AndroidAsset Include="Assets\Phone\Collection\TokenInvalidTipIcon.png" />
    <AndroidAsset Include="Assets\Phone\Public\RightIcon2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\Power80pIcon.png" />
    <AndroidAsset Include="Assets\BEBAS.ttf" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgDischargeBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgRunBg.png" />
    <AndroidAsset Include="Assets\BEBAS2.otf" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -1850,9 +1850,9 @@
      <BundleResource Include="Resources\Phone\Collection\TokenInvalidTipIcon.png" />
      <BundleResource Include="Resources\Phone\Public\RightIcon2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\Power80pIcon.png" />
      <BundleResource Include="Resources\BEBAS.ttf" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvBgDischargeBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvBgRunBg.png" />
      <BundleResource Include="Resources\BEBAS.ttf" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Resources/BEBAS.ttf

Binary files differ

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/WaterHeater/TempBg.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/PowerIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/PowerIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/PowerIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -859,6 +859,10 @@
        static void ReceiveNotifySqueezeAsync(string mMes)
        {
            MainPage.Log($"推送标识：{mMes};本地标识：{PushSignStr}");
#if DEBUG
            MainPage.Log("调试模式，不触发挤下线。");
            return;
#endif
            if (mMes == PushSignStr) return;//是自己的登录推送不处理//或者当前不是远程链接状态

            DisConnectRemoteMqttClient("挤下线");

 HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs

@@ -1323,7 +1323,7 @@
                Radius = (uint)Application.GetRealWidth(12),
            };
            optionBaseView.AddChidren(topView);
            topView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
            optionBaseView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });

            var btnCancel = new Button()
            {

 HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs

@@ -556,7 +556,7 @@
                Y = Application.GetRealWidth(191),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(24),
                Text = "---",
                Text = "--",
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = 18,
@@ -944,7 +944,7 @@

                esRunStatus_BatteryIconButton = new Button()
                {
                    X = Application.GetRealWidth(343 - 12 - 20) - esRunStatus_BatteryValuesButton.Width,
                    X = Application.GetRealWidth(343 - 12 - 18) - esRunStatus_BatteryValuesButton.Width,
                    Y = Application.GetRealWidth(16),
                    Width = Application.GetRealWidth(20),
                    Height = Application.GetRealWidth(20),
@@ -956,10 +956,10 @@

                var esRunStatus_ValuesInfoView = new FrameLayout()
                {
                    Width = Application.GetRealWidth(282),
                    Height = Application.GetRealWidth(153),
                    Width = Application.GetRealWidth(564/2),
                    Height = Application.GetRealWidth(306/2),
                    Gravity = Gravity.CenterHorizontal,
                    Y = Application.GetRealWidth(40),
                    Y = Application.GetRealWidth(40-7),
                    BackgroundImagePath = "FunctionIcon/Acst/Inverter/EnergyStorageStatusBg.png",
                };
                esStatusView.AddChidren(esRunStatus_ValuesInfoView);
@@ -968,6 +968,7 @@
                var esRunStatus_ChargeValuesView = new FrameLayout()
                {
                    X = Application.GetRealWidth(15),
                    Y = Application.GetRealWidth(6),
                    Width = Application.GetRealWidth(128),
                    Height = Application.GetRealWidth(128),
                };
@@ -975,21 +976,21 @@

                esRunStatus_ChargeValuesButton = new Button()
                {
                    Y = Application.GetRealWidth(36),
                    Y = Application.GetRealWidth(39),
                    Height = Application.GetRealWidth(32),
                    TextAlignment = TextAlignment.Center,
                    Text = function.GetAttrState(InverterJinmao_AttrEnum.ess_charge_power.ToString()),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = 24,
                    IsBold = true,
                FontName = fontName,
                    FontName = fontName,
                };
                esRunStatus_ChargeValuesView.AddChidren(esRunStatus_ChargeValuesButton);

                var esRunStatus_ChargeTextButton = new Button()
                {
                    X = Application.GetRealWidth(1),
                    Y = Application.GetRealWidth(76),
                    Y = Application.GetRealWidth(78),
                    Height = Application.GetRealWidth(17),
                    TextAlignment = TextAlignment.Center,
                    Text = "实时充电功率(kw)",
@@ -1003,6 +1004,7 @@
                var esRunStatus_DischargeValuesView = new FrameLayout()
                {
                    X = Application.GetRealWidth(132 + 13),
                    Y = Application.GetRealWidth(6),
                    Width = Application.GetRealWidth(128),
                    Height = Application.GetRealWidth(128),
                };

 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);


 HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs

@@ -1328,7 +1328,7 @@
                Radius = (uint)Application.GetRealWidth(12),
            };
            optionBaseView.AddChidren(topView);
            topView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
            optionBaseView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });

            var btnCancel = new Button()
            {