From 7eb8b78a26accd059cf8e17d756f6d77e6b3f9dd Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 09 六月 2022 21:40:26 +0800
Subject: [PATCH] 2022年06月09日21:39:40
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index c255299..2177666 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -154,7 +154,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.TextualColor,
- TextID = StringId.InstantaneousValue
+ TextID = StringId.InstantaneousValue,
+ IsMoreLines = true
};
controlView.AddChidren(btnInstantaneousValueText);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
@@ -179,7 +180,7 @@
Text = function.GetAttrState("total_electricity"),
TextAlignment = TextAlignment.BottomLeft,
};
- btnTotalElectricity.Width = btnTotalElectricity.GetTextWidth();
+ btnTotalElectricity.Width = btnTotalElectricity.GetTextWidth()+ Application.GetRealWidth(5);
controlView.AddChidren(btnTotalElectricity);
var btnTotalElectricityUnit = new Button()
{
@@ -198,12 +199,13 @@
{
X = Application.GetRealWidth(200),
Y = btnTotalElectricity.Bottom,
- Width = Application.GetRealWidth(235),
+ Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(29),
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.TextualColor,
- TextID = StringId.CumulativePowerConsumption
+ TextID = StringId.CumulativePowerConsumption,
+ IsMoreLines = true
};
controlView.AddChidren(btnTotalElectricityText);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
@@ -288,6 +290,16 @@
{
btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
{
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
@@ -304,6 +316,16 @@
};
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
--
Gitblit v1.8.0