up 6.29

解决当订阅数量较多时,占用窗口空间太大的问题

v2rayN/v2rayN/Global.cs

@@ -22,6 +22,7 @@
         public const string geoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
         public const string singboxGeoUrl = "https://github.com/soffchen/sing-{0}/releases/latest/download/{0}.db";
         public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
+        public const string juicityCoreUrl = "https://github.com/juicity/juicity/releases";
         public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
@@ -170,4 +171,4 @@
 
         #endregion global variable
     }
-}
+}

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -353,8 +353,16 @@ namespace v2rayN.Handler
                 match = "sing-box",
                 versionArg = "version",
             });
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.juicity,
+                coreExes = new List<string> { "juicity-client", "juicity" },
+                arguments = "run -c config.json",
+                coreUrl = Global.juicityCoreUrl
+            });
         }
 
         #endregion Core Type
     }
-}
+}

v2rayN/v2rayN/Mode/ECoreType.cs

@@ -12,6 +12,7 @@
         naiveproxy = 22,
         tuic = 23,
         sing_box = 24,
+        juicity = 25,
         v2rayN = 99
     }
-}
+}

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -386,7 +386,7 @@
                         x:Name="lstGroup"
                         FontSize="{DynamicResource StdFontSize}"
                         ItemContainerStyle="{StaticResource MyChipListBoxItem}"
-                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
+                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}" MaxHeight="120">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding remarks}" />

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -36,6 +36,8 @@ namespace v2rayN.Views
                 this.Height = SystemParameters.WorkArea.Height;
             }
 
+            lstGroup.MaxHeight = Math.Floor(SystemParameters.WorkArea.Height * 0.20 / 40) * 40;
+
             _config = LazyConfig.Instance.GetConfig();
 
             App.Current.SessionEnding += Current_SessionEnding;

v2rayN/v2rayN/v2rayN.csproj

@@ -10,13 +10,13 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.28</FileVersion>
+		<FileVersion>6.29</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Downloader" Version="3.0.6" />		
 		<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
-		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.108" />
+		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.118" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
@@ -25,7 +25,7 @@
 		<PackageReference Include="ReactiveUI.Fody" Version="18.4.1" />
 		<PackageReference Include="ReactiveUI.Validation" Version="3.0.22" />
 		<PackageReference Include="ReactiveUI.WPF" Version="18.4.1" />
-		<PackageReference Include="Splat.NLog" Version="14.6.37" />
+		<PackageReference Include="Splat.NLog" Version="14.7.1" />
 		<PackageReference Include="System.Reactive" Version="6.0.0" />
 	</ItemGroup>
 	

v2rayN/v2rayUpgrade/MainForm.cs

@@ -92,9 +92,9 @@ namespace v2rayUpgrade
                             File.Move(Application.ExecutablePath, thisAppOldFile);
                         }
 
-                        string entryOuputPath = GetPath(fullName);
-                        Directory.CreateDirectory(Path.GetDirectoryName(entryOuputPath)!);
-                        entry.ExtractToFile(entryOuputPath, true);
+                        string entryOutputPath = GetPath(fullName);
+                        Directory.CreateDirectory(Path.GetDirectoryName(entryOutputPath)!);
+                        entry.ExtractToFile(entryOutputPath, true);
                     }
                     catch (Exception ex)
                     {
@@ -145,4 +145,4 @@ namespace v2rayUpgrade
             return Path.Combine(startupPath, fileName);
         }
     }
-}
+}