diff --git a/V2RayGCon/Controllers/FormMainComponent/FlyServer.cs b/V2RayGCon/Controllers/FormMainComponent/FlyServer.cs index c3d8c08a..77e90b1f 100644 --- a/V2RayGCon/Controllers/FormMainComponent/FlyServer.cs +++ b/V2RayGCon/Controllers/FormMainComponent/FlyServer.cs @@ -729,6 +729,7 @@ private void InitComboBoxMarkFilter() void PerformSearch() { searchKeywords = cboxKeyword.Text; + this.tslbTotal.Text = I18N.Searching; RefreshFlyPanelNow(); } diff --git a/V2RayGCon/Controllers/FormOptionComponent/TabCustomInboundSettings.cs b/V2RayGCon/Controllers/FormOptionComponent/TabCustomInboundSettings.cs index 8808eea0..f0892fc7 100644 --- a/V2RayGCon/Controllers/FormOptionComponent/TabCustomInboundSettings.cs +++ b/V2RayGCon/Controllers/FormOptionComponent/TabCustomInboundSettings.cs @@ -53,7 +53,23 @@ public override bool SaveOptions() var requireUpdateSummary = settings.ReplaceCustomConfigTemplates(datas); if (requireUpdateSummary) { - VgcApis.Misc.Utils.DoItLater(servers.UpdateAllServersSummary, 3000); + VgcApis.Misc.Utils.DoItLater( + () => + { + var servs = servers + .GetAllServersOrderByIndex() + .Where(s => s.GetCoreStates().IsAcceptInjection()) + .ToList(); + foreach (var serv in servs) + { + serv.GetConfiger().UpdateSummary(); + VgcApis.Misc.Logger.Debug( + $"update summary: {serv.GetCoreStates().GetTitle()}" + ); + } + }, + 3000 + ); } return true; } diff --git a/V2RayGCon/Misc/Caches/ZipStrLru.cs b/V2RayGCon/Misc/Caches/ZipStrLru.cs index a7ff22f5..4e961d91 100644 --- a/V2RayGCon/Misc/Caches/ZipStrLru.cs +++ b/V2RayGCon/Misc/Caches/ZipStrLru.cs @@ -58,8 +58,12 @@ public static bool TryGet(string key, out string content) public static bool TryRemove(string key) { key = HashOnDemand(key); - VgcApis.Misc.Logger.Debug($"ZipStrLru remove cache : {key}"); - return cache.Remove(key); + if (cache.Remove(key)) + { + VgcApis.Misc.Logger.Debug($"ZipStrLru remove cache : {key}"); + return true; + } + return false; } #endregion diff --git a/V2RayGCon/Properties/AssemblyInfo.cs b/V2RayGCon/Properties/AssemblyInfo.cs index e42352ae..6f964e15 100644 --- a/V2RayGCon/Properties/AssemblyInfo.cs +++ b/V2RayGCon/Properties/AssemblyInfo.cs @@ -33,11 +33,12 @@ // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.9.2.19")] +[assembly: AssemblyVersion("1.9.3.0")] [assembly: AssemblyFileVersion("1.0.0.0")] /* +-------------------------------------------------------------------- v1.9.2.19 Refresh summary after inject-template-settings changed. v1.9.2.18 Add timeout to StringLruCache(). v1.9.2.17 Adjust save user settings interval from 5 minutes to 20 minutes. diff --git a/V2RayGCon/Resources/Resx/I18N.resx b/V2RayGCon/Resources/Resx/I18N.resx index 48ab0b89..95283b97 100644 --- a/V2RayGCon/Resources/Resx/I18N.resx +++ b/V2RayGCon/Resources/Resx/I18N.resx @@ -833,4 +833,7 @@ c:\vgc\V2RayGCon.exe -s s2.json Template + + Searching... + \ No newline at end of file diff --git a/V2RayGCon/Resources/Resx/I18N.zh-CN.resx b/V2RayGCon/Resources/Resx/I18N.zh-CN.resx index d38d66f2..5f066208 100644 --- a/V2RayGCon/Resources/Resx/I18N.zh-CN.resx +++ b/V2RayGCon/Resources/Resx/I18N.zh-CN.resx @@ -824,4 +824,7 @@ c:\vgc\V2RayGCon.exe -s s2.json 模板 + + 搜索中... + \ No newline at end of file diff --git a/V2RayGCon/Resources/Resx/I18N1.Designer.cs b/V2RayGCon/Resources/Resx/I18N1.Designer.cs index 5ecbd6d7..61c659ea 100644 --- a/V2RayGCon/Resources/Resx/I18N1.Designer.cs +++ b/V2RayGCon/Resources/Resx/I18N1.Designer.cs @@ -19,7 +19,7 @@ namespace V2RayGCon.Resources.Resx { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen // (以 /str 作为命令选项),或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class I18N { @@ -1635,6 +1635,15 @@ internal static string ScanQRCode { } } + /// + /// 查找类似 Searching... 的本地化字符串。 + /// + internal static string Searching { + get { + return ResourceManager.GetString("Searching", resourceCulture); + } + } + /// /// 查找类似 Please select ther servers first. 的本地化字符串。 ///