From ac8660d2dd439e8074c1760cbe6cc9465a452193 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 17:50:17 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 82a771e..eb216d9 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1090,7 +1090,6 @@
#region ContextView
gcFunctionView.RemoveAll();
- functionViews.Clear();
var rowView = new FrameLayout();
try
{
@@ -1566,6 +1565,10 @@
// btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
// btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
//}
+ else if (function.spk == SPK.ElectricEnergy || function.spk == SPK.AirSwitch || function.spk == SPK.AirSwitchP3)
+ {
+
+ }
else
{
Button btnSwitch;
@@ -1623,7 +1626,7 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
Tag = "OnlineTag",
- Visible = !function.online
+ Visible = !function.isOnline()
};
view.AddChidren(btnOffline);
--
Gitblit v1.8.0