From 7e348c196edd9aea11c60d4eb8278fb753bbaa7a Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Thu, 6 Mar 2025 14:53:25 +0800 Subject: [PATCH] AI-optimized code --- v2rayN/v2rayN.Desktop/App.axaml.cs | 6 +++++- v2rayN/v2rayN.Desktop/Common/UI.cs | 4 ++++ v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs | 2 ++ .../Converters/DelayColorConverter.cs | 14 +++++++------- v2rayN/v2rayN.Desktop/Program.cs | 4 ++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/v2rayN/v2rayN.Desktop/App.axaml.cs b/v2rayN/v2rayN.Desktop/App.axaml.cs index c3388125..b7cb8d74 100644 --- a/v2rayN/v2rayN.Desktop/App.axaml.cs +++ b/v2rayN/v2rayN.Desktop/App.axaml.cs @@ -23,7 +23,7 @@ public partial class App : Application var ViewModel = new StatusBarViewModel(null); Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(StatusBarViewModel)); - this.DataContext = ViewModel; + DataContext = ViewModel; } public override void OnFrameworkInitializationCompleted() @@ -65,7 +65,9 @@ public partial class App : Application var clipboardData = await AvaUtils.GetClipboardData(desktop.MainWindow); var service = Locator.Current.GetService(); if (service != null) + { _ = service.AddServerViaClipboardAsync(clipboardData); + } } } } @@ -74,7 +76,9 @@ public partial class App : Application { var service = Locator.Current.GetService(); if (service != null) + { await service.MyAppExitAsync(true); + } service?.Shutdown(true); } } diff --git a/v2rayN/v2rayN.Desktop/Common/UI.cs b/v2rayN/v2rayN.Desktop/Common/UI.cs index 0b7cf2b4..e52970e4 100644 --- a/v2rayN/v2rayN.Desktop/Common/UI.cs +++ b/v2rayN/v2rayN.Desktop/Common/UI.cs @@ -19,7 +19,9 @@ namespace v2rayN.Desktop.Common { var sp = GetStorageProvider(owner); if (sp is null) + { return null; + } // Start async operation to open the dialog. var files = await sp.OpenFilePickerAsync(new FilePickerOpenOptions @@ -35,7 +37,9 @@ namespace v2rayN.Desktop.Common { var sp = GetStorageProvider(owner); if (sp is null) + { return null; + } // Start async operation to open the dialog. var files = await sp.SaveFilePickerAsync(new FilePickerSaveOptions diff --git a/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs b/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs index adb76063..82e04d4b 100644 --- a/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs +++ b/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs @@ -27,7 +27,9 @@ public class AutoCompleteBox : Avalonia.Controls.AutoCompleteBox { base.OnGotFocus(e); if (IsDropDownOpen) + { return; + } SetCurrentValue(IsDropDownOpenProperty, true); } diff --git a/v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs b/v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs index 3f1e2064..1f3f4a2b 100644 --- a/v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs +++ b/v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs @@ -8,14 +8,14 @@ namespace v2rayN.Desktop.Converters { public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) { - int.TryParse(value?.ToString(), out var delay); + _ = int.TryParse(value?.ToString(), out var delay); - if (delay <= 0) - return new SolidColorBrush(Colors.Red); - if (delay <= 500) - return new SolidColorBrush(Colors.Green); - else - return new SolidColorBrush(Colors.IndianRed); + return delay switch + { + <= 0 => new SolidColorBrush(Colors.Red), + <= 500 => new SolidColorBrush(Colors.Green), + _ => new SolidColorBrush(Colors.IndianRed) + }; } public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) diff --git a/v2rayN/v2rayN.Desktop/Program.cs b/v2rayN/v2rayN.Desktop/Program.cs index acc7a332..15efc023 100644 --- a/v2rayN/v2rayN.Desktop/Program.cs +++ b/v2rayN/v2rayN.Desktop/Program.cs @@ -25,8 +25,8 @@ internal class Program if (Utils.IsWindows()) { var exePathKey = Utils.GetMd5(Utils.GetExePath()); - var rebootas = (Args ?? Array.Empty()).Any(t => t == Global.RebootAs); - ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew); + var rebootas = (Args ?? []).Any(t => t == Global.RebootAs); + ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out var bCreatedNew); if (!rebootas && !bCreatedNew) { ProgramStarted.Set();