From 36e3dfdfa83fbcd75c29712f75490a67e985cd09 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:37:06 +0800 Subject: [PATCH] Code clean --- clashN/clashN/Handler/StatisticsHandler.cs | 4 ++-- clashN/clashN/Mode/CoreKind.cs | 2 +- clashN/clashN/Tool/Utils.cs | 5 ++--- clashN/clashN/ViewModels/HelpViewModel.cs | 4 +++- clashN/clashN/Views/HelpView.xaml | 3 --- clashN/clashN/clashN.csproj | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/clashN/clashN/Handler/StatisticsHandler.cs b/clashN/clashN/Handler/StatisticsHandler.cs index c98da78..ea0d068 100644 --- a/clashN/clashN/Handler/StatisticsHandler.cs +++ b/clashN/clashN/Handler/StatisticsHandler.cs @@ -106,9 +106,9 @@ namespace ClashN.Handler if (!string.IsNullOrEmpty(result)) { var serverStatItem = config_.GetProfileItem(config_.IndexId); - + ParseOutput(result, out ulong up, out ulong down); - if (serverStatItem != null && (up + down) > 0) + if (serverStatItem != null && (up + down) > 0) { serverStatItem.uploadRemote += up; serverStatItem.downloadRemote += down; diff --git a/clashN/clashN/Mode/CoreKind.cs b/clashN/clashN/Mode/CoreKind.cs index e873e09..95003c3 100644 --- a/clashN/clashN/Mode/CoreKind.cs +++ b/clashN/clashN/Mode/CoreKind.cs @@ -5,7 +5,7 @@ Clash = 1, ClashMeta = 2, ClashPremium = 3, - Mihomo = 4, + Mihomo = 4, ClashN = 99 } } \ No newline at end of file diff --git a/clashN/clashN/Tool/Utils.cs b/clashN/clashN/Tool/Utils.cs index 9f61b6c..d4ed9f6 100644 --- a/clashN/clashN/Tool/Utils.cs +++ b/clashN/clashN/Tool/Utils.cs @@ -14,7 +14,6 @@ using System.Net.NetworkInformation; using System.Net.Sockets; using System.Reflection; using System.Runtime.InteropServices; -using System.Runtime.Serialization.Formatters.Binary; using System.Security.Principal; using System.Text; using System.Text.RegularExpressions; @@ -613,7 +612,7 @@ namespace ClashN } return Path.Combine(startupPath, fileName); } - + /// /// 获取启动了应用程序的数据文件的路径 /// @@ -909,7 +908,7 @@ namespace ClashN /// public static T DeepCopy(T obj) { - return FromJson(ToJson(obj, false))!; + return FromJson(ToJson(obj, false))!; } /// diff --git a/clashN/clashN/ViewModels/HelpViewModel.cs b/clashN/clashN/ViewModels/HelpViewModel.cs index 590f83c..f80a6e1 100644 --- a/clashN/clashN/ViewModels/HelpViewModel.cs +++ b/clashN/clashN/ViewModels/HelpViewModel.cs @@ -14,8 +14,10 @@ namespace ClashN.ViewModels private NoticeHandler? _noticeHandler; public ReactiveCommand CheckUpdateCmd { get; } + //public ReactiveCommand CheckUpdateClashCoreCmd { get; } public ReactiveCommand CheckUpdateMihomoCoreCmd { get; } + //public ReactiveCommand CheckUpdateGeoDataCmd { get; } public HelpViewModel() @@ -40,7 +42,7 @@ namespace ClashN.ViewModels // CheckUpdateGeoData(); //}); } - + //private void CheckUpdateGeoData() //{ // void _updateUI(bool success, string msg) diff --git a/clashN/clashN/Views/HelpView.xaml b/clashN/clashN/Views/HelpView.xaml index b38a7c0..b821531 100644 --- a/clashN/clashN/Views/HelpView.xaml +++ b/clashN/clashN/Views/HelpView.xaml @@ -96,7 +96,6 @@ - - - diff --git a/clashN/clashN/clashN.csproj b/clashN/clashN/clashN.csproj index 22fc98a..a928a86 100644 --- a/clashN/clashN/clashN.csproj +++ b/clashN/clashN/clashN.csproj @@ -23,9 +23,9 @@ - + - +