From 2d03454a09569c60ac1e658bacccd2bf0e2d0dfd Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 九月 2023 11:08:23 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
index 2f801c5..a1a754e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
@@ -217,7 +217,7 @@
//function.SaveFunctionData(true);
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.Electric)).LoadTopView_FunctionTop(function, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.EnergyMonitoring)).LoadTopView_FunctionTop(function, actionRefresh);
new System.Threading.Thread(() =>
{
DriverLayer.Control.Ins.SendReadCommand(function);
@@ -265,6 +265,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