diff --git a/v2rayN/PacLib/PacHandler.cs b/v2rayN/PacLib/PacHandler.cs index c8c326d74b..1481b94d39 100644 --- a/v2rayN/PacLib/PacHandler.cs +++ b/v2rayN/PacLib/PacHandler.cs @@ -1,5 +1,4 @@ -using System; -using System.IO; +using System.IO; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; diff --git a/v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs index b2ffe2adaa..5a6a208174 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs @@ -10,7 +10,7 @@ public class TrojanFmt : BaseFmt { ConfigType = EConfigType.Trojan }; - + var url = Utils.TryUri(str); if (url == null) return null; diff --git a/v2rayN/ServiceLib/Models/RoutingItem.cs b/v2rayN/ServiceLib/Models/RoutingItem.cs index 13e560cca9..5212c35942 100644 --- a/v2rayN/ServiceLib/Models/RoutingItem.cs +++ b/v2rayN/ServiceLib/Models/RoutingItem.cs @@ -7,6 +7,7 @@ public class RoutingItem { [PrimaryKey] public string Id { get; set; } + public string Remarks { get; set; } public string Url { get; set; } public string RuleSet { get; set; } diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs index 42eced5b60..e0af705d5c 100644 --- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs @@ -181,6 +181,7 @@ private async Task Init() { SelectedRouting = new(); SelectedServer = new(); + RunningServerToolTipText = "-"; if (_config.TunModeItem.EnableTun && AppHandler.Instance.IsAdministrator) { diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs index c4ce8123ca..5e9186e0e7 100644 --- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs +++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs @@ -321,7 +321,7 @@ private void menuSettingsSetUWP_Click(object? sender, RoutedEventArgs e) public async Task ScanScreenTaskAsync() { //ShowHideWindow(false); - + NoticeHandler.Instance.SendMessageAndEnqueue("Not yet implemented.(还未实现)"); return; //if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) @@ -332,9 +332,10 @@ public async Task ScanScreenTaskAsync() //ShowHideWindow(true); } + private async Task ScanImageTaskAsync() { - var fileName = await UI.OpenFileDialog(this,null ); + var fileName = await UI.OpenFileDialog(this, null); if (fileName.IsNullOrEmpty()) { return; diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml index f0b4456459..5327b70526 100644 --- a/v2rayN/v2rayN/App.xaml +++ b/v2rayN/v2rayN/App.xaml @@ -1,9 +1,9 @@  diff --git a/v2rayN/v2rayN/Common/QRCodeHelper.cs b/v2rayN/v2rayN/Common/QRCodeHelper.cs index e677037ac5..2791c52176 100644 --- a/v2rayN/v2rayN/Common/QRCodeHelper.cs +++ b/v2rayN/v2rayN/Common/QRCodeHelper.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Drawing; -using System.IO; using System.Windows; using System.Windows.Interop; using System.Windows.Media; diff --git a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml index e5781abec6..8ea9ca0b4d 100644 --- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml +++ b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml @@ -1,11 +1,11 @@ - diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml index 74ea94532c..f3c86a7402 100644 --- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml +++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml @@ -1,14 +1,14 @@  vm.SaveCmd, v => v.btnSave).DisposeWith(disposables); }); WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark); - } private async Task UpdateViewHandler(EViewAction action, object? obj) diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml index f27799959c..d6594e7098 100644 --- a/v2rayN/v2rayN/Views/SubEditWindow.xaml +++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml @@ -1,14 +1,14 @@