From 5a4966ba8de1ac8fc76803106d00e86cd6a6f0e7 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 17 Mar 2023 10:32:56 +0800
Subject: [PATCH] Adjust  speed test

---
 v2rayN/v2rayN/Base/DownloaderHelper.cs    | 2 +-
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs | 6 ++++--
 v2rayN/v2rayN/Resx/ResUI.Designer.cs      | 9 +++++++++
 v2rayN/v2rayN/Resx/ResUI.resx             | 3 +++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx     | 3 +++
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/v2rayN/v2rayN/Base/DownloaderHelper.cs b/v2rayN/v2rayN/Base/DownloaderHelper.cs
index f6969938..59623816 100644
--- a/v2rayN/v2rayN/Base/DownloaderHelper.cs
+++ b/v2rayN/v2rayN/Base/DownloaderHelper.cs
@@ -115,7 +115,7 @@ namespace v2rayN.Base
                     }
                 }
             };
-            progress.Report("......");
+            //progress.Report("......");
 
             using var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
 
diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index 1608689e..8e22454e 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -58,11 +58,11 @@ namespace v2rayN.Handler
                         ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         break;
                     case ESpeedActionType.Speedtest:
-                        UpdateFunc(it.indexId, "", ResUI.Speedtesting);
+                        UpdateFunc(it.indexId, "", ResUI.SpeedtestingWait);
                         ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
                         break;
                     case ESpeedActionType.Mixedtest:
-                        UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.Speedtesting);
+                        UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
                         ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
                         break;
@@ -236,6 +236,7 @@ namespace v2rayN.Handler
                 //    continue;
                 //}
                 ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
+                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
@@ -287,6 +288,7 @@ namespace v2rayN.Handler
                     continue;
                 }
                 ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
+                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index f7237def..9d65e55c 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -1788,6 +1788,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Waiting for testing 的本地化字符串。
+        /// </summary>
+        public static string SpeedtestingWait {
+            get {
+                return ResourceManager.GetString("SpeedtestingWait", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 PAC failed to start. Please run this program as Administrator. 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index f6fdf2f0..04b1ccfe 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1144,4 +1144,7 @@
   <data name="TbSettingsEnableHWA" xml:space="preserve">
     <value>Enable hardware acceleration(Require restart)</value>
   </data>
+  <data name="SpeedtestingWait" xml:space="preserve">
+    <value>Waiting for testing</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 1861a091..de7bfe11 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1144,4 +1144,7 @@
   <data name="TbSettingsEnableHWA" xml:space="preserve">
     <value>启用硬件加速(需重启)</value>
   </data>
+  <data name="SpeedtestingWait" xml:space="preserve">
+    <value>等待测试中...</value>
+  </data>
 </root>
\ No newline at end of file