2dust 2 سال پیش
والد
کامیت
36e3dfdfa8

+ 2 - 2
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;

+ 1 - 1
clashN/clashN/Mode/CoreKind.cs

@@ -5,7 +5,7 @@
         Clash = 1,
         ClashMeta = 2,
         ClashPremium = 3,
-        Mihomo = 4, 
+        Mihomo = 4,
         ClashN = 99
     }
 }

+ 2 - 3
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);
         }
-        
+
         /// <summary>
         /// 获取启动了应用程序的数据文件的路径
         /// </summary>
@@ -909,7 +908,7 @@ namespace ClashN
         /// <returns></returns>
         public static T DeepCopy<T>(T obj)
         {
-            return FromJson<T>(ToJson(obj, false))!;             
+            return FromJson<T>(ToJson(obj, false))!;
         }
 
         /// <summary>

+ 3 - 1
clashN/clashN/ViewModels/HelpViewModel.cs

@@ -14,8 +14,10 @@ namespace ClashN.ViewModels
         private NoticeHandler? _noticeHandler;
 
         public ReactiveCommand<Unit, Unit> CheckUpdateCmd { get; }
+
         //public ReactiveCommand<Unit, Unit> CheckUpdateClashCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateMihomoCoreCmd { get; }
+
         //public ReactiveCommand<Unit, Unit> CheckUpdateGeoDataCmd { get; }
 
         public HelpViewModel()
@@ -40,7 +42,7 @@ namespace ClashN.ViewModels
             //    CheckUpdateGeoData();
             //});
         }
-        
+
         //private void CheckUpdateGeoData()
         //{
         //    void _updateUI(bool success, string msg)

+ 0 - 3
clashN/clashN/Views/HelpView.xaml

@@ -96,7 +96,6 @@
                     </DockPanel>
                 </materialDesign:Card>
 
-
                 <materialDesign:Card
                     Width="300"
                     Margin="8"
@@ -133,8 +132,6 @@
                         </Grid>
                     </DockPanel>
                 </materialDesign:Card>
-
-
             </WrapPanel>
         </ScrollViewer>
     </DockPanel>

+ 2 - 2
clashN/clashN/clashN.csproj

@@ -23,9 +23,9 @@
 		<PackageReference Include="TaskScheduler" Version="2.10.1" />
 		<PackageReference Include="YamlDotNet" Version="13.7.1" />
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
-		<PackageReference Include="ReactiveUI.Fody" Version="19.5.31" />
+		<PackageReference Include="ReactiveUI.Fody" Version="19.5.39" />
 		<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-		<PackageReference Include="ReactiveUI.WPF" Version="19.5.31" />
+		<PackageReference Include="ReactiveUI.WPF" Version="19.5.39" />
 		<PackageReference Include="Splat.NLog" Version="14.8.12" />
 		<PackageReference Include="System.Reactive" Version="6.0.0" />
 	</ItemGroup>