From b3f565b6c588e3eb64d3c1f00dc9f8d272e8d2d0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 02 三月 2022 11:48:40 +0800
Subject: [PATCH] 2022-3-2-01
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index 72ba698..96945a4 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) => {
@@ -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) => {
@@ -293,9 +295,11 @@
new System.Threading.Thread(() =>
{
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, this.function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", function.trait_on_off.curValue.ToString());
+ if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null) {
+ d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
+ }
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
@@ -307,9 +311,12 @@
new System.Threading.Thread(() =>
{
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, this.function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", function.trait_on_off.curValue.ToString());
+ if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
+ {
+ d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
+ }
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0