From 1830691fd179285d2df7f035e4f7f5a260e819c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 19 九月 2023 09:32:47 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
index bd0a8ba..8124d16 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
@@ -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")
{
--
Gitblit v1.8.0