github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug fix

pull/5701/head
2dust 2024-09-06 09:40:45 +08:00
parent 7ceaf5c071
commit 8be1730719
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
View File

@ -11,6 +11,7 @@ namespace ServiceLib.ViewModels
public class CheckUpdateViewModel : MyReactiveObject public class CheckUpdateViewModel : MyReactiveObject
{ {
private const string _geo = "GeoFiles"; private const string _geo = "GeoFiles";
private string _v2rayN = ECoreType.v2rayN.ToString();
private List<CheckUpdateItem> _lstUpdated = []; private List<CheckUpdateItem> _lstUpdated = [];
private IObservableCollection<CheckUpdateItem> _checkUpdateItem = new ObservableCollectionExtended<CheckUpdateItem>(); private IObservableCollection<CheckUpdateItem> _checkUpdateItem = new ObservableCollectionExtended<CheckUpdateItem>();
@ -52,7 +53,7 @@ namespace ServiceLib.ViewModels
_checkUpdateItem.Add(new CheckUpdateItem() _checkUpdateItem.Add(new CheckUpdateItem()
{ {
isSelected = false, isSelected = false,
coreType = ECoreType.v2rayN.ToString(), coreType = _v2rayN,
remarks = ResUI.menuCheckUpdate, remarks = ResUI.menuCheckUpdate,
}); });
_checkUpdateItem.Add(new CheckUpdateItem() _checkUpdateItem.Add(new CheckUpdateItem()
@ -98,7 +99,7 @@ namespace ServiceLib.ViewModels
{ {
await CheckUpdateGeo(); await CheckUpdateGeo();
} }
else if (item.coreType == ECoreType.v2rayN.ToString()) else if (item.coreType == _v2rayN)
{ {
await CheckUpdateN(EnableCheckPreReleaseUpdate); await CheckUpdateN(EnableCheckPreReleaseUpdate);
} }
@ -153,23 +154,23 @@ namespace ServiceLib.ViewModels
&& File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll")) && File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
) )
{ {
UpdateView(ResUI.UpdateStandalonePackageTip, ResUI.UpdateStandalonePackageTip); UpdateView(_v2rayN, ResUI.UpdateStandalonePackageTip);
return; return;
} }
void _updateUI(bool success, string msg) void _updateUI(bool success, string msg)
{ {
UpdateView(ECoreType.v2rayN.ToString(), msg); UpdateView(_v2rayN, msg);
if (success) if (success)
{ {
UpdateView(ECoreType.v2rayN.ToString(), ResUI.OperationSuccess); UpdateView(_v2rayN, ResUI.OperationSuccess);
UpdatedPlusPlus(ECoreType.v2rayN.ToString(), msg); UpdatedPlusPlus(_v2rayN, msg);
} }
} }
await (new UpdateHandler()).CheckUpdateGuiN(_config, _updateUI, preRelease) await (new UpdateHandler()).CheckUpdateGuiN(_config, _updateUI, preRelease)
.ContinueWith(t => .ContinueWith(t =>
{ {
UpdatedPlusPlus(ECoreType.v2rayN.ToString(), ""); UpdatedPlusPlus(_v2rayN, "");
}); });
} }
@ -201,7 +202,7 @@ namespace ServiceLib.ViewModels
Task.Delay(1000); Task.Delay(1000);
UpgradeCore(); UpgradeCore();
if (_lstUpdated.Any(x => x.coreType == ECoreType.v2rayN.ToString() && x.isFinished == true)) if (_lstUpdated.Any(x => x.coreType == _v2rayN && x.isFinished == true))
{ {
Task.Delay(1000); Task.Delay(1000);
UpgradeN(); UpgradeN();
@ -228,7 +229,7 @@ namespace ServiceLib.ViewModels
{ {
try try
{ {
var fileName = _lstUpdated.FirstOrDefault(x => x.coreType == ECoreType.v2rayN.ToString())?.fileName; var fileName = _lstUpdated.FirstOrDefault(x => x.coreType == _v2rayN)?.fileName;
if (fileName.IsNullOrEmpty()) if (fileName.IsNullOrEmpty())
{ {
return; return;
@ -251,7 +252,7 @@ namespace ServiceLib.ViewModels
} }
catch (Exception ex) catch (Exception ex)
{ {
UpdateView(ECoreType.v2rayN.ToString(), ex.Message); UpdateView(_v2rayN, ex.Message);
} }
} }