diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs index 4593b3ca..12a9154e 100644 --- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs +++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs @@ -6,7 +6,9 @@ using System.Net; using System.Net.Sockets; using System.Threading; using v2rayN.Mode; +using v2rayN.Properties; using v2rayN.Protos.Statistics; +using v2rayN.Tool; namespace v2rayN.Handler { @@ -66,6 +68,23 @@ namespace v2rayN.Handler public StatisticsHandler(Mode.Config config, Action> update) { + try + { + if (Environment.Is64BitOperatingSystem) + { + FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x64.dll"), Resources.grpc_csharp_ext_x64_dll); + } + else + { + FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x86.dll"), Resources.grpc_csharp_ext_x86_dll); + } + } + catch (IOException ex) + { + Utils.SaveLog(ex.Message, ex); + + } + config_ = config; enabled_ = config.enableStatistics; UpdateUI = false; diff --git a/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs b/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs index 3bbe6d1d..6dc229d3 100644 --- a/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs +++ b/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs @@ -34,7 +34,6 @@ namespace v2rayN.HttpProxyHandler _privoxyJob = new Job(); FileManager.UncompressFile(Utils.GetTempPath("v2ray_privoxy.exe"), Resources.privoxy_exe); - FileManager.UncompressFile(Utils.GetTempPath("mgwz.dll"), Resources.mgwz_dll); } catch (IOException ex) { diff --git a/v2rayN/v2rayN/Properties/Resources.Designer.cs b/v2rayN/v2rayN/Properties/Resources.Designer.cs index 3935f663..f2d8f030 100644 --- a/v2rayN/v2rayN/Properties/Resources.Designer.cs +++ b/v2rayN/v2rayN/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace v2rayN.Properties { // 类通过类似于 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", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -91,25 +91,35 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// 查找 System.Byte[] 类型的本地化资源。 /// - internal static System.Drawing.Bitmap help { + internal static byte[] grpc_csharp_ext_x64_dll { get { - object obj = ResourceManager.GetObject("help", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + object obj = ResourceManager.GetObject("grpc_csharp_ext_x64_dll", resourceCulture); + return ((byte[])(obj)); } } /// /// 查找 System.Byte[] 类型的本地化资源。 /// - internal static byte[] mgwz_dll { + internal static byte[] grpc_csharp_ext_x86_dll { get { - object obj = ResourceManager.GetObject("mgwz_dll", resourceCulture); + object obj = ResourceManager.GetObject("grpc_csharp_ext_x86_dll", resourceCulture); return ((byte[])(obj)); } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap help { + get { + object obj = ResourceManager.GetObject("help", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -157,6 +167,7 @@ namespace v2rayN.Properties { ///show-on-task-bar 0 ///activity-animation 0 ///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ . + ///max-client-connections 2048 ///hide-console /// 的本地化字符串。 /// diff --git a/v2rayN/v2rayN/Properties/Resources.resx b/v2rayN/v2rayN/Properties/Resources.resx index f69a06b9..2488ee55 100644 --- a/v2rayN/v2rayN/Properties/Resources.resx +++ b/v2rayN/v2rayN/Properties/Resources.resx @@ -127,12 +127,15 @@ ..\resources\checkupdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\grpc_csharp_ext.x64.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\resources\grpc_csharp_ext.x86.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\mgwz.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/v2rayN/v2rayN/Resources/grpc_csharp_ext.x64.dll.gz b/v2rayN/v2rayN/Resources/grpc_csharp_ext.x64.dll.gz new file mode 100644 index 00000000..b69a16bd Binary files /dev/null and b/v2rayN/v2rayN/Resources/grpc_csharp_ext.x64.dll.gz differ diff --git a/v2rayN/v2rayN/Resources/grpc_csharp_ext.x86.dll.gz b/v2rayN/v2rayN/Resources/grpc_csharp_ext.x86.dll.gz new file mode 100644 index 00000000..d56025ca Binary files /dev/null and b/v2rayN/v2rayN/Resources/grpc_csharp_ext.x86.dll.gz differ diff --git a/v2rayN/v2rayN/Resources/mgwz.dll.gz b/v2rayN/v2rayN/Resources/mgwz.dll.gz deleted file mode 100644 index 40a33e5d..00000000 Binary files a/v2rayN/v2rayN/Resources/mgwz.dll.gz and /dev/null differ diff --git a/v2rayN/v2rayN/grpc_csharp_ext.x64.dll b/v2rayN/v2rayN/grpc_csharp_ext.x64.dll deleted file mode 100644 index 8c10df69..00000000 Binary files a/v2rayN/v2rayN/grpc_csharp_ext.x64.dll and /dev/null differ diff --git a/v2rayN/v2rayN/grpc_csharp_ext.x86.dll b/v2rayN/v2rayN/grpc_csharp_ext.x86.dll deleted file mode 100644 index dd3876df..00000000 Binary files a/v2rayN/v2rayN/grpc_csharp_ext.x86.dll and /dev/null differ diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index 53b582b3..d11b4a76 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -198,6 +198,11 @@ + + True + True + Resources.resx + True True @@ -319,14 +324,9 @@ ResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - Designer @@ -342,6 +342,8 @@ + + @@ -392,7 +394,6 @@ - @@ -420,12 +421,6 @@ - - Always - - - Always -