fix: 修复进度条的问题

server/src/UdpClientPool.cs

@@ -8,11 +8,11 @@ using server.Services;
 /// <summary>
 /// UDP客户端发送池
 /// </summary>
-public class UDPClientPool
+public sealed class UDPClientPool
 {
     private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
 
-    private static IPAddress localhost = IPAddress.Parse("127.0.0.1");
+    private static ProgressTracker _progressTracker = MsgBus.ProgressTracker;
 
     /// <summary>
     /// 发送字符串
@@ -183,40 +183,6 @@ public class UDPClientPool
         return await Task.Run(() => { return SendDataPack(endPoint, pkg); });
     }
 
-    /// <summary>
-    /// 发送字符串到本地
-    /// </summary>
-    /// <param name="port">端口</param>
-    /// <param name="stringArray">字符串数组</param>
-    /// <returns>是否成功</returns>
-    public static bool SendStringLocalHost(int port, string[] stringArray)
-    {
-        return SendString(new IPEndPoint(localhost, port), stringArray);
-    }
-
-    /// <summary>
-    /// 循环发送字符串到本地
-    /// </summary>
-    /// <param name="times">发送总次数</param>
-    /// <param name="sleepMilliSeconds">间隔时间</param>
-    /// <param name="port">端口</param>
-    /// <param name="stringArray">字符串数组</param>
-    /// <returns>是否成功</returns>
-    public static bool CycleSendStringLocalHost(int times, int sleepMilliSeconds, int port, string[] stringArray)
-    {
-        var isSuccessful = true;
-
-        while (times-- >= 0)
-        {
-            isSuccessful = SendStringLocalHost(port, stringArray);
-            if (!isSuccessful) break;
-
-            Thread.Sleep(sleepMilliSeconds);
-        }
-
-        return isSuccessful;
-    }
-
     /// <summary>
     /// 读取设备地址数据
     /// </summary>
@@ -607,11 +573,11 @@ public class UDPClientPool
     /// <param name="devAddr">设备地址</param>
     /// <param name="data">要写入的32位数据</param>
     /// <param name="timeout">超时时间（毫秒）</param>
-    /// <param name="progress">进度报告器</param>
+    /// <param name="progressId">进度报告器</param>
     /// <returns>写入结果，true表示写入成功</returns>
     public static async ValueTask<Result<bool>> WriteAddr(
             IPEndPoint endPoint, int taskID, UInt32 devAddr,
-            UInt32 data, int timeout = 1000, ProgressReporter? progress = null)
+            UInt32 data, int timeout = 1000, string progressId = "")
     {
         var ret = false;
         var opts = new SendAddrPackOptions()
@@ -622,17 +588,18 @@ public class UDPClientPool
             Address = devAddr,
             IsWrite = true,
         };
-        progress?.Report(20);
+        _progressTracker.AdvanceProgress(progressId, 10);
 
         // Write Register
         ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
         if (!ret) return new(new Exception("Send 1st address package failed!"));
-        progress?.Report(40);
+        _progressTracker.AdvanceProgress(progressId, 10);
+
         // Send Data Package
         ret = await UDPClientPool.SendDataPackAsync(endPoint,
                 new SendDataPackage(Common.Number.NumberToBytes(data, 4).Value));
         if (!ret) return new(new Exception("Send data package failed!"));
-        progress?.Report(60);
+        _progressTracker.AdvanceProgress(progressId, 10);
 
         // Check Msg Bus
         if (!MsgBus.IsRunning)
@@ -642,7 +609,7 @@ public class UDPClientPool
         var udpWriteAck = await MsgBus.UDPServer.WaitForAckAsync(
                 endPoint.Address.ToString(), taskID, endPoint.Port, timeout);
         if (!udpWriteAck.IsSuccessful) return new(udpWriteAck.Error);
-        progress?.Finish();
+        _progressTracker.AdvanceProgress(progressId, 10);
 
         return udpWriteAck.Value.IsSuccessful;
     }
@@ -655,11 +622,11 @@ public class UDPClientPool
     /// <param name="devAddr">设备地址</param>
     /// <param name="dataArray">要写入的字节数组</param>
     /// <param name="timeout">超时时间（毫秒）</param>
-    /// <param name="progress">进度报告器</param>
+    /// <param name="progressId">进度报告器</param>
     /// <returns>写入结果，true表示写入成功</returns>
     public static async ValueTask<Result<bool>> WriteAddr(
         IPEndPoint endPoint, int taskID, UInt32 devAddr,
-        byte[] dataArray, int timeout = 1000, ProgressReporter? progress = null)
+        byte[] dataArray, int timeout = 1000, string progressId = "")
     {
         var ret = false;
         var opts = new SendAddrPackOptions()
@@ -681,8 +648,6 @@ public class UDPClientPool
         var writeTimes = hasRest ?
             dataArray.Length / (max4BytesPerRead * (32 / 8)) + 1 :
             dataArray.Length / (max4BytesPerRead * (32 / 8));
-        if (progress != null)
-            progress.ExpectedSteps = writeTimes;
         for (var i = 0; i < writeTimes; i++)
         {
             // Sperate Data Array
@@ -712,10 +677,9 @@ public class UDPClientPool
             if (!udpWriteAck.Value.IsSuccessful)
                 return false;
 
-            progress?.Increase();
+            _progressTracker.AdvanceProgress(progressId, 10);
         }
 
-        progress?.Finish();
         return true;
     }