From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs index 7021c55..8124d16 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs @@ -153,7 +153,7 @@ TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.TextFontSize, }; - //controlView.AddChidren(btnRunStatus); //鐘舵�佹棤娉曟祴璇曪紝鏆傛椂闅愯棌--2021-10-14 13:58:48 钁f辰鏂� + controlView.AddChidren(btnRunStatus); UpdataRunStatus(); } @@ -210,7 +210,7 @@ }; controlView.AddChidren(btnSwitch); - new TopViewDiv(bodyView, Language.StringByID(StringId.Electric)).LoadTopView_FunctionTop(function, actionRefresh,false); + new TopViewDiv(bodyView, Language.StringByID(StringId.EnergyMonitoring)).LoadTopView_FunctionTop(function, actionRefresh,false); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(function); @@ -258,6 +258,11 @@ { if (btnRunStatus == null) return; + if(function.GetAttrState(FunctionAttributeKey.OnOff) == "off") + { + btnRunStatus.Text = ""; + return; + } var runStatus = function.GetAttrState("run_status"); if (Language.CurrentLanguage == "Chinese") { @@ -417,7 +422,7 @@ { btnSwitchIcon.MouseUpEventHandler = (sender, e) => { - if (!function.online) + if (!function.isOnline()) { new Tip() { @@ -439,7 +444,7 @@ }; btnSwitch.MouseUpEventHandler = (sender, e) => { - if (!function.online) + if (!function.isOnline()) { new Tip() { -- Gitblit v1.8.0