diff --git a/src/DownKyi/DownKyi.csproj b/src/DownKyi/DownKyi.csproj
index 1dbb390..80a3d53 100644
--- a/src/DownKyi/DownKyi.csproj
+++ b/src/DownKyi/DownKyi.csproj
@@ -561,6 +561,9 @@
+
+ 13.0.2
+
1.0.112.2
@@ -573,6 +576,10 @@
+
+ {3107CD63-E257-455E-AE81-1FD3582B067A}
+ Brotli.Core
+
{4fde0364-f65b-4812-bfe8-34e886624fbd}
DownKyi.Core
diff --git a/src/DownKyi/Models/AppInfo.cs b/src/DownKyi/Models/AppInfo.cs
index a77f7f3..66f2680 100644
--- a/src/DownKyi/Models/AppInfo.cs
+++ b/src/DownKyi/Models/AppInfo.cs
@@ -1,15 +1,53 @@
-namespace DownKyi.Models
+using System;
+using System.Text.RegularExpressions;
+
+namespace DownKyi.Models
{
public class AppInfo
{
public string Name { get; } = "哔哩下载姬";
- public int VersionCode { get; } = 513;
+ public int VersionCode { get; }
+ public string VersionName { get; }
+
+ const int a = 1;
+ const int b = 5;
+ const int c = 6;
+
+ public AppInfo()
+ {
+ VersionCode = a * 10000 + b * 100 + c;
#if DEBUG
- public string VersionName { get; } = "1.5.6 Debug";
+ VersionName = $"{a}.{b}.{c}-debug";
#else
- public string VersionName { get; } = "1.5.6";
+ VersionName = $"{a}.{b}.{c}";
#endif
+ }
+
+ public static int VersionNameToCode(string versionName)
+ {
+ int code = 0;
+
+ var isMatch = Regex.IsMatch(versionName, @"^v?([1-9]\d|\d).([1-9]\d|\d).([1-9]\d|\d)$");
+ if (!isMatch)
+ {
+ return 0;
+ }
+
+ string pattern = @"([1-9]\d|\d)";
+ var m = Regex.Matches(versionName, pattern);
+ if (m.Count == 3)
+ {
+ int i = 2;
+ foreach (var item in m)
+ {
+ code += int.Parse(item.ToString()) * (int)Math.Pow(100, i);
+ i--;
+ }
+ }
+
+ return code;
+ }
}
}
diff --git a/src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs b/src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs
index 0cdf35b..f41ee26 100644
--- a/src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs
+++ b/src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs
@@ -5,6 +5,7 @@ using DownKyi.Utils;
using Prism.Commands;
using Prism.Events;
using Prism.Regions;
+using Prism.Services.Dialogs;
namespace DownKyi.ViewModels.Settings
{
@@ -46,7 +47,7 @@ namespace DownKyi.ViewModels.Settings
#endregion
- public ViewAboutViewModel(IEventAggregator eventAggregator) : base(eventAggregator)
+ public ViewAboutViewModel(IEventAggregator eventAggregator, IDialogService dialogService) : base(eventAggregator, dialogService)
{
#region 属性初始化