From 84bad8c7dfa0f098c625c48264d47bcef1e510f0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 14:18:46 +0800
Subject: [PATCH] 提示字体修复
---
HDL-ON_iOS/Resources/Language.ini | 2 +-
HDL-ON_Android/Assets/Language.ini | 2 +-
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs | 8 ++++----
HDL_ON/UI/MainPage.cs | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index d5948ec..f20bc1e 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -2038,7 +2038,7 @@
693=鎬荤敤鐢甸噺锛圞W路h锛�
694=杩囧幓24灏忔椂鐨勬瘡灏忔椂鐢ㄧ數閲�
695=杩囧幓涓�涓湀鐨勬瘡鏃ユ暟鎹�
-694=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
+696=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index d5948ec..f20bc1e 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -2038,7 +2038,7 @@
693=鎬荤敤鐢甸噺锛圞W路h锛�
694=杩囧幓24灏忔椂鐨勬瘡灏忔椂鐢ㄧ數閲�
695=杩囧幓涓�涓湀鐨勬瘡鏃ユ暟鎹�
-694=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
+696=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index e2ce48b..3dde76f 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -623,7 +623,7 @@
if (msg.Contains("鏀跺埌鏁版嵁")
|| msg.Contains("鍙戦��")
|| msg.Contains("鎺ユ敹鍒版帹閫�")
-
+ || true
)
Console.WriteLine(msg);
#endif
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
index 359e656..fea4794 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
@@ -319,7 +319,7 @@
var btnTip = new Button()
{
- Y = Application.GetRealHeight(289),
+ Y = Application.GetRealWidth(289),
Height = Application.GetRealHeight(41),
Width = Application.GetRealWidth(300),
TextAlignment = TextAlignment.Center,
@@ -512,7 +512,7 @@
viewb.Visible = true;
viewc.Visible = true;
btnTip.TextID = StringId.AirSwitchP3HistroyTip1;
- historyDataView.Height = Application.GetRealHeight(330);
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Month.MouseUpEventHandler += (sender, e) => {
totalElectricityView.RemoveFromParent();
@@ -521,7 +521,7 @@
viewb.Visible = true;
viewc.Visible = true;
btnTip.TextID = StringId.AirSwitchP3HistroyTip2;
- historyDataView.Height = Application.GetRealHeight(330);
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Year.MouseUpEventHandler += (sender, e) => {
totalElectricityView.RemoveFromParent();
@@ -530,7 +530,7 @@
viewb.Visible = false;
viewc.Visible = false;
btnTip.TextID = StringId.AirSwitchP3HistroyTip3;
- historyDataView.Height = Application.GetRealHeight(330);
+ historyDataView.Height = Application.GetRealWidth(330);
};
btnShowHistroyData_Total.MouseUpEventHandler += (sender, e) => {
myEchartsView_Line.RemoveFromParent();
--
Gitblit v1.8.0