Max/2dust_v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-10-06 05:38:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Utils

Browse Source
This commit is contained in:
2dust
2024-01-10 10:43:48 +08:00
parent 4a67e963ed
commit ea95c6de79
34 changed files with 342 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+9 -9
View File
@@ -652,13 +652,13 @@ namespace v2rayN.ViewModels
if (SelectedProfile?.indexId == item.indexId)
{
var temp = Utils.DeepCopy(item);
var temp = JsonUtils.DeepCopy(item);
_profileItems.Replace(item, temp);
SelectedProfile = temp;
}
else
{
_profileItems.Replace(item, Utils.DeepCopy(item));
_profileItems.Replace(item, JsonUtils.DeepCopy(item));
}
}
}
@@ -667,7 +667,7 @@ namespace v2rayN.ViewModels
}
catch (Exception ex)
{
Utils.SaveLog(ex.Message, ex);
Logging.SaveLog(ex.Message, ex);
}
}
@@ -700,7 +700,7 @@ namespace v2rayN.ViewModels
{
item.speedVal = $"{speed} {Global.SpeedUnit}";
}
_profileItems.Replace(item, Utils.DeepCopy(item));
_profileItems.Replace(item, JsonUtils.DeepCopy(item));
}
}
@@ -734,7 +734,7 @@ namespace v2rayN.ViewModels
{
try
{
Utils.SaveLog("MyAppExit Begin");
Logging.SaveLog("MyAppExit Begin");
StorageUI();
ConfigHandler.SaveConfig(_config);
@@ -755,7 +755,7 @@ namespace v2rayN.ViewModels
_statistics?.Close();
_coreHandler.CoreStop();
Utils.SaveLog("MyAppExit End");
Logging.SaveLog("MyAppExit End");
}
catch { }
finally
@@ -835,7 +835,7 @@ namespace v2rayN.ViewModels
totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
}).OrderBy(t => t.sort).ToList();
_lstProfile = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(lstModel));
_lstProfile = JsonUtils.FromJson<List<ProfileItem>>(JsonUtils.ToJson(lstModel));
Application.Current.Dispatcher.Invoke((Action)(() =>
{
@@ -941,7 +941,7 @@ namespace v2rayN.ViewModels
}
else
{
lstSelecteds = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(orderProfiles));
lstSelecteds = JsonUtils.FromJson<List<ProfileItem>>(JsonUtils.ToJson(orderProfiles));
}
return 0;
@@ -1456,7 +1456,7 @@ namespace v2rayN.ViewModels
CloseV2ray();
string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
string toPath = Utils.GetBinPath("", type);
string toPath = Utils.GetBinPath("", type.ToString());
FileManager.ZipExtractToFile(fileName, toPath, _config.guiItem.ignoreGeoUpdateCore ? "geo" : "");