Code clean

v2rayN/AmazTool/Assets/en-US.json

@@ -1,14 +1,14 @@
 {
-    "Restart_v2rayN": "Start v2rayN, please wait...",
+  "Restart_v2rayN": "Start v2rayN, please wait...",
-    "Guidelines": "Please run it from the main application.",
+  "Guidelines": "Please run it from the main application.",
-    "Upgrade_File_Not_Found": "Upgrade failed, file not found.",
+  "Upgrade_File_Not_Found": "Upgrade failed, file not found.",
-    "In_Progress": "In progress, please wait...",
+  "In_Progress": "In progress, please wait...",
-    "Try_Terminate_Process": "Try to terminate the v2rayN process.",
+  "Try_Terminate_Process": "Try to terminate the v2rayN process.",
-    "Failed_Terminate_Process": "Failed to terminate the v2rayN.Close it manually,or the upgrade may fail.",
+  "Failed_Terminate_Process": "Failed to terminate the v2rayN.Close it manually,or the upgrade may fail.",
-    "Start_Unzipping": "Start extracting the update package.",
+  "Start_Unzipping": "Start extracting the update package.",
-    "Success_Unzipping": "Successfully extracted the update package!",
+  "Success_Unzipping": "Successfully extracted the update package!",
-    "Failed_Unzipping": "Failed to extract the update package!",
+  "Failed_Unzipping": "Failed to extract the update package!",
-    "Failed_Upgrade": "Upgrade failed!",
+  "Failed_Upgrade": "Upgrade failed!",
-    "Success_Upgrade": "Upgrade success!",
+  "Success_Upgrade": "Upgrade success!",
-    "Information": "Information"
+  "Information": "Information"
 }

v2rayN/AmazTool/Assets/zh-CN.json

@@ -1,14 +1,14 @@
 {
-    "Restart_v2rayN": "正在重启，请等待...",
+  "Restart_v2rayN": "正在重启，请等待...",
-    "Guidelines": "请从主应用运行！",
+  "Guidelines": "请从主应用运行！",
-    "Upgrade_File_Not_Found": "升级失败，文件不存在！",
+  "Upgrade_File_Not_Found": "升级失败，文件不存在！",
-    "In_Progress": "正在进行中，请等待...",
+  "In_Progress": "正在进行中，请等待...",
-    "Try_Terminate_Process": "尝试结束 v2rayN 进程...",
+  "Try_Terminate_Process": "尝试结束 v2rayN 进程...",
-    "Failed_Terminate_Process": "请手动关闭正在运行的v2rayN，否则可能升级失败。",
+  "Failed_Terminate_Process": "请手动关闭正在运行的v2rayN，否则可能升级失败。",
-    "Start_Unzipping": "开始解压缩更新包...",
+  "Start_Unzipping": "开始解压缩更新包...",
-    "Success_Unzipping": "解压缩更新包成功！",
+  "Success_Unzipping": "解压缩更新包成功！",
-    "Failed_Unzipping": "解压缩更新包失败！",
+  "Failed_Unzipping": "解压缩更新包失败！",
-    "Failed_Upgrade": "升级失败！",
+  "Failed_Upgrade": "升级失败！",
-    "Success_Upgrade": "升级成功！",
+  "Success_Upgrade": "升级成功！",
-    "Information": "提示"
+  "Information": "提示"
 }

v2rayN/AmazTool/LocalizationHelper.cs

@@ -29,7 +29,7 @@ namespace AmazTool
 
                 using var stream = assembly.GetManifestResourceStream(resourceName);
                 if (stream == null) return;
-                
+
                 using StreamReader reader = new(stream);
                 var json = reader.ReadToEnd();
                 if (!string.IsNullOrEmpty(json))
@@ -56,4 +56,4 @@ namespace AmazTool
             return _languageResources.TryGetValue(key, out var translation) ? translation : key;
         }
     }
-}
+}

v2rayN/AmazTool/UpgradeApp.cs

@@ -9,7 +9,7 @@ namespace AmazTool
         public static void Upgrade(string fileName)
         {
             Console.WriteLine($"{LocalizationHelper.GetLocalizedValue("Start_Unzipping")}\n{fileName}");
-            
+
             Thread.Sleep(9000);
 
             if (!File.Exists(fileName))

v2rayN/ServiceLib/Handler/StatisticsHandler.cs

@@ -9,8 +9,10 @@
         private ServerStatItem? _serverStatItem;
         private List<ServerStatItem> _lstServerStat;
         private Action<ServerSpeedItem>? _updateFunc;
+
         //private StatisticsV2rayService? _statisticsV2Ray;
         private StatisticsXrayService? _statisticsXray;
+
         private StatisticsSingboxService? _statisticsSingbox;
 
         public List<ServerStatItem> ServerStat => _lstServerStat;

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -5,6 +5,7 @@
         /*
          * 仅测试了，MacOS 13.7.1 x86 版本，其他版本有待确认
          */
+
         /// <summary>
         /// 应用接口类型
         /// </summary>
@@ -21,14 +22,12 @@
             await ExecCmd(lstCmd);
         }
 
-
         public static async Task UnsetProxy()
         {
             var lstCmd = GetUnsetCmds();
             await ExecCmd(lstCmd);
         }
 
-
         private static async Task ExecCmd(List<CmdItem> lstCmd)
         {
             foreach (var cmd in lstCmd)

v2rayN/ServiceLib/Models/Config.cs

@@ -20,6 +20,7 @@
                 case ECoreType.Xray when RunningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5:
                 case ECoreType.sing_box when RunningCoreType is ECoreType.sing_box or ECoreType.mihomo:
                     return true;
+
                 default:
                     return false;
             }

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -209,7 +209,7 @@ namespace v2rayN.Desktop.Views
                 this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.Path, v => v.txtPath.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.Extra, v => v.txtExtra.Text).DisposeWith(disposables);
-                
+
                 this.Bind(ViewModel, vm => vm.SelectedSource.StreamSecurity, v => v.cmbStreamSecurity.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.AllowInsecure, v => v.cmbAllowInsecure.SelectedValue).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -382,7 +382,7 @@ namespace v2rayN.Desktop.Views
         #endregion Event
 
         #region UI
-         
+
         public void ShowHideWindow(bool? blShow)
         {
             var bl = blShow ?? !_config.UiItem.ShowInTaskbar;

v2rayN/v2rayN/App.xaml

@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -203,7 +203,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.Path, v => v.txtPath.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.Extra, v => v.txtExtra.Text).DisposeWith(disposables);
-                
+
                 this.Bind(ViewModel, vm => vm.SelectedSource.StreamSecurity, v => v.cmbStreamSecurity.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.AllowInsecure, v => v.cmbAllowInsecure.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/ClashConnectionsView.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashConnectionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     d:DesignHeight="450"

v2rayN/v2rayN/Views/ClashProxiesView.xaml

@@ -1,14 +1,14 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashProxiesView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:ClashProxiesViewModel"

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"