mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-25 01:34:41 +00:00
Compare commits
No commits in common. "5d6c5da9d92081d849eace39d2b9526c0655d961" and "b25d4d57bd10ac3448f095b6a40bd3d1feaf1742" have entirely different histories.
5d6c5da9d9
...
b25d4d57bd
6 changed files with 197 additions and 148 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>7.15.0</Version>
|
<Version>7.14.12</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
using System.Reactive;
|
||||||
|
|
||||||
namespace ServiceLib.Manager;
|
namespace ServiceLib.Manager;
|
||||||
|
|
||||||
public sealed class AppManager
|
public sealed class AppManager
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -338,6 +338,6 @@ public class CheckUpdateViewModel : MyReactiveObject
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
found.Remarks = model.Remarks;
|
found.Remarks = model.Remarks;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
using System.Reactive;
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls.ApplicationLifetimes;
|
using Avalonia.Controls.ApplicationLifetimes;
|
||||||
using Avalonia.Markup.Xaml;
|
using Avalonia.Markup.Xaml;
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
_config = AppManager.Instance.Config;
|
_config = AppManager.Instance.Config;
|
||||||
|
|
||||||
ViewModel = StatusBarViewModel.Instance;
|
ViewModel = StatusBarViewModel.Instance;
|
||||||
ViewModel?.InitUpdateView(UpdateViewHandler);
|
ViewModel?.InitUpdateView(UpdateViewHandler);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue