From e8aadda1855895fe67a5e1a66e62d346995ae077 Mon Sep 17 00:00:00 2001
From: Diego <2248356998@qq.com>
Date: Thu, 6 Mar 2025 17:46:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=98=BE=E7=A4=BA=E6=9C=AA?=
 =?UTF-8?q?=E7=9F=A5=E7=B1=BB=E5=9E=8B=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChannelDeviceTree.razor.cs                | 34 +++++++++----------
 src/ThingsGateway.Server/targets/Pro3.targets |  2 +-
 src/ThingsGateway.Server/targets/Pro5.targets |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
index ed757b194..3386c123d 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
@@ -1054,12 +1054,12 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
     private ChannelDeviceTreeItem BusinessItem = new() { ChannelDevicePluginType = ChannelDevicePluginTypeEnum.PluginType, PluginType = PluginTypeEnum.Business };
     private ChannelDeviceTreeItem UnknownItem = new() { ChannelDevicePluginType = ChannelDevicePluginTypeEnum.PluginType, PluginType = null };
 
-    private TreeViewItem<ChannelDeviceTreeItem> BusinessTreeViewItem;
+    private TreeViewItem<ChannelDeviceTreeItem> UnknownTreeViewItem;
     protected override async Task OnInitializedAsync()
     {
 
 
-        BusinessTreeViewItem = new TreeViewItem<ChannelDeviceTreeItem>(UnknownItem)
+        UnknownTreeViewItem = new TreeViewItem<ChannelDeviceTreeItem>(UnknownItem)
         {
             Text = GatewayLocalizer["Unknown"],
             IsActive = Value == UnknownItem,
@@ -1085,22 +1085,22 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
         var item2 = ResourceUtil.BuildTreeItemList(channels.Where(a => a.IsCollect == null), new List<ChannelDeviceTreeItem> { Value }, RenderTreeItem);
         if (item2.Count > 0)
         {
-            BusinessTreeViewItem.Items = item2;
-            if (ZItem.Count >= 2)
+            UnknownTreeViewItem.Items = item2;
+            if (ZItem.Count >= 3)
             {
 
             }
             else
             {
-                ZItem.Add(BusinessTreeViewItem);
+                ZItem.Add(UnknownTreeViewItem);
             }
 
         }
         else
         {
-            if (ZItem.Count >= 2)
+            if (ZItem.Count >= 3)
             {
-                ZItem.Remove(BusinessTreeViewItem);
+                ZItem.Remove(UnknownTreeViewItem);
             }
             else
             {
@@ -1197,22 +1197,22 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             var item2 = ResourceUtil.BuildTreeItemList(items.Where(a => a.IsCollect == null), new List<ChannelDeviceTreeItem> { Value }, RenderTreeItem);
             if (item2.Count > 0)
             {
-                BusinessTreeViewItem.Items = item2;
-                if (ZItem.Count >= 2)
+                UnknownTreeViewItem.Items = item2;
+                if (ZItem.Count >= 3)
                 {
 
                 }
                 else
                 {
-                    ZItem.Add(BusinessTreeViewItem);
+                    ZItem.Add(UnknownTreeViewItem);
                 }
 
             }
             else
             {
-                if (ZItem.Count >= 2)
+                if (ZItem.Count >= 3)
                 {
-                    ZItem.Remove(BusinessTreeViewItem);
+                    ZItem.Remove(UnknownTreeViewItem);
                 }
                 else
                 {
@@ -1280,22 +1280,22 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             var item2 = otherChannelDevices.BuildTreeItemList(new List<ChannelDeviceTreeItem> { Value }, RenderTreeItem);
             if (item2.Count > 0)
             {
-                BusinessTreeViewItem.Items = item2;
-                if (ZItem.Count >= 2)
+                UnknownTreeViewItem.Items = item2;
+                if (ZItem.Count >= 3)
                 {
 
                 }
                 else
                 {
-                    ZItem.Add(BusinessTreeViewItem);
+                    ZItem.Add(UnknownTreeViewItem);
                 }
 
             }
             else
             {
-                if (ZItem.Count >= 2)
+                if (ZItem.Count >= 3)
                 {
-                    ZItem.Remove(BusinessTreeViewItem);
+                    ZItem.Remove(UnknownTreeViewItem);
                 }
                 else
                 {
diff --git a/src/ThingsGateway.Server/targets/Pro3.targets b/src/ThingsGateway.Server/targets/Pro3.targets
index 6b447b6d6..da5cd2716 100644
--- a/src/ThingsGateway.Server/targets/Pro3.targets
+++ b/src/ThingsGateway.Server/targets/Pro3.targets
@@ -7,7 +7,7 @@
 		<PackageReference Include="ThingsGateway.Plugin.YPSFSK" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets="native;" />
 	</ItemGroup>
 
-	<Target Name="CopyOtherPluginNugetPackages" AfterTargets="Build">
+	<Target Name="CopyOtherPlugin3NugetPackages" AfterTargets="Build">
 		<PropertyGroup>
 			<PluginTargetFramework>net8.0</PluginTargetFramework>
 		</PropertyGroup>
diff --git a/src/ThingsGateway.Server/targets/Pro5.targets b/src/ThingsGateway.Server/targets/Pro5.targets
index ed4b3272b..cb1dc3a67 100644
--- a/src/ThingsGateway.Server/targets/Pro5.targets
+++ b/src/ThingsGateway.Server/targets/Pro5.targets
@@ -5,7 +5,7 @@
 		<PackageReference Include="ThingsGateway.Plugin.MqttYINGKE" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets="native;" />
 	</ItemGroup>
 
-	<Target Name="CopyOtherPluginNugetPackages" AfterTargets="Build">
+	<Target Name="CopyOtherPlugin5NugetPackages" AfterTargets="Build">
 		<PropertyGroup>
 			<PluginTargetFramework>net8.0</PluginTargetFramework>
 		</PropertyGroup>