Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-05-02 05:08:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix something

Browse source
This commit is contained in:
2dust 2023-12-22 09:46:55 +08:00
parent f5deb8e168
commit 655d411afe
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
v2rayN/v2rayN/Tool/Utils.cs
View file

@ -12,7 +12,6 @@ using System.Net.NetworkInformation;
using System.Net.Sockets; using System.Net.Sockets;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Runtime.Serialization.Formatters.Binary;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Security.Principal; using System.Security.Principal;
using System.Text; using System.Text;
@ -898,22 +897,26 @@ namespace v2rayN
} }
/// <summary> /// <summary>
/// 深度拷贝 /// DeepCopy
/// </summary> /// </summary>
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <param name="obj"></param> /// <param name="obj"></param>
/// <returns></returns> /// <returns></returns>
public static T DeepCopy<T>(T obj) public static T DeepCopy<T>(T obj)
{ {
object retval; return FromJson<T>(ToJson(obj, false))!;
MemoryStream ms = new();
BinaryFormatter bf = new(); // object retval;
//序列化成流 // MemoryStream ms = new();
bf.Serialize(ms, obj); //#pragma warning disable SYSLIB0011 // 类型或成员已过时
ms.Seek(0, SeekOrigin.Begin); // BinaryFormatter bf = new();
//反序列化成对象 //#pragma warning restore SYSLIB0011 // 类型或成员已过时
retval = bf.Deserialize(ms); // //序列化成流
return (T)retval; // bf.Serialize(ms, obj);
// ms.Seek(0, SeekOrigin.Begin);
// //反序列化成对象
// retval = bf.Deserialize(ms);
// return (T)retval;
} }
/// <summary> /// <summary>

1
v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
View file

@ -367,6 +367,7 @@ namespace v2rayN.ViewModels
break; break;
case 7: case 7:
case 8:
continue; continue;
} }
item.coreType = (ECoreType)Enum.Parse(typeof(ECoreType), type); item.coreType = (ECoreType)Enum.Parse(typeof(ECoreType), type);

4
v2rayN/v2rayN/v2rayN.csproj
View file

@ -22,9 +22,9 @@
<PackageReference Include="sqlite-net-pcl" Version="1.8.116" /> <PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
<PackageReference Include="TaskScheduler" Version="2.10.1" /> <PackageReference Include="TaskScheduler" Version="2.10.1" />
<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" /> <PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.1" /> <PackageReference Include="ReactiveUI.Fody" Version="19.5.31" />
<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" /> <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
<PackageReference Include="ReactiveUI.WPF" Version="19.5.1" /> <PackageReference Include="ReactiveUI.WPF" Version="19.5.31" />
<PackageReference Include="Splat.NLog" Version="14.8.12" /> <PackageReference Include="Splat.NLog" Version="14.8.12" />
<PackageReference Include="System.Reactive" Version="6.0.0" /> <PackageReference Include="System.Reactive" Version="6.0.0" />
</ItemGroup> </ItemGroup>