Merge remote-tracking branch 'origin/wxr0114' into wjc

wjc

2022-01-19 07b0239f824ddb5a0cadf93f20ff6247f72baca2

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