Skip to content

Commit 06346bc

Browse files
committed
fix: Version number comparison error
1 parent acf11d6 commit 06346bc

File tree

6 files changed

+15
-95
lines changed

6 files changed

+15
-95
lines changed

src/SwashbucklerDiary.Maui/Services/VersionUpdataManager/VersionUpdataManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ protected override void InitializeVersionHandlers()
3535
{
3636
base.InitializeVersionHandlers();
3737

38-
AddVersionHandler("0.64.7", HandleVersionUpdate647);
38+
AddVersionHandler("0.65.5", HandleVersionUpdate655);
3939
}
4040

4141
//此版本之后更改了资源的链接
42-
private async Task HandleVersionUpdate647()
42+
private async Task HandleVersionUpdate655()
4343
{
4444
var key = "Avatar";
4545
string avatar = await _settingService.GetAsync<string>(key, string.Empty);

src/SwashbucklerDiary.Rcl/Services/DiaryFileManager/DiaryFileManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ public async Task<bool> ImportDBAsync(string filePath)
402402
else
403403
{
404404
RestoreDiaryResource(outputFolder);
405-
if (version <= new Version("1.16.8"))
405+
if (version < new Version("1.17.0"))
406406
{
407407
await UpdateTemplateForOldDiaryAsync();
408408
}

src/SwashbucklerDiary.Rcl/Services/VersionUpdataManager/VersionUpdataManager.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ protected virtual void InitializeVersionHandlers()
119119
{
120120
AddVersionHandler("0.69.7", HandleVersionUpdate697);
121121
AddVersionHandler("0.80.9", HandleVersionUpdate809);
122-
AddVersionHandler("0.86.0", HandleVersionUpdate860);
122+
AddVersionHandler("0.87.8", HandleVersionUpdate878);
123123
AddVersionHandler("1.01.5", HandleVersionUpdate1015);
124-
AddVersionHandler("1.03.9", HandleVersionUpdate1039);
125-
AddVersionHandler("1.12.9", HandleVersionUpdate1129);
126-
AddVersionHandler("1.16.8", HandleVersionUpdate1168);
124+
AddVersionHandler("1.05.5", HandleVersionUpdate1055);
125+
AddVersionHandler("1.13.2", HandleVersionUpdate1132);
126+
AddVersionHandler("1.17.0", HandleVersionUpdate1170);
127127
}
128128

129129
protected void AddVersionHandler(string versionString, Func<Task> handler)
@@ -146,7 +146,7 @@ protected async Task HandleVersionUpdate(string versionString, Func<Task> func)
146146
return;
147147
}
148148

149-
if (new Version(previousVersionString) > new Version(versionString))
149+
if (new Version(previousVersionString) >= new Version(versionString))
150150
{
151151
return;
152152
}
@@ -187,7 +187,7 @@ private async Task HandleUpdateInstruction()
187187
await _diaryService.AddAsync(diary);
188188
}
189189

190-
private async Task HandleVersionUpdate860()
190+
private async Task HandleVersionUpdate878()
191191
{
192192
string[] keys = ["PrivacyMode", "PrivatePassword"];
193193
await _settingService.RemoveAsync(keys);
@@ -204,12 +204,12 @@ private async Task HandleVersionUpdate1015()
204204
}
205205
}
206206

207-
private async Task HandleVersionUpdate1039()
207+
private async Task HandleVersionUpdate1055()
208208
{
209209
await _diaryService.MovePrivacyDiariesAsync();
210210
}
211211

212-
private async Task HandleVersionUpdate1129()
212+
private async Task HandleVersionUpdate1132()
213213
{
214214
var oldKey = "UserName";
215215
var oldValue = await _settingService.GetAsync(oldKey, string.Empty);
@@ -220,7 +220,7 @@ private async Task HandleVersionUpdate1129()
220220
}
221221
}
222222

223-
private async Task HandleVersionUpdate1168()
223+
private async Task HandleVersionUpdate1170()
224224
{
225225
await _diaryFileManager.UpdateTemplateForOldDiaryAsync();
226226
_settingService.SetTemp(it => it.PrivacyMode, true);
Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,5 @@
11
# Update Announcement
22

3-
[toc]
4-
5-
Hello everyone. Wishing everyone a happy May Day International Labor Day
6-
7-
Precautions for this update
8-
9-
* Supported Linux platform (deb package) (Due to known issues, audio and video loading is not supported)
10-
* Packaged Windows free installation version (compared to the MSIX package, it lacks features such as sharing and urlscheme)
11-
12-
## New addition
13-
14-
* Support Linux
15-
* Set the calendar for the first day of each week [click to jump](calendarSetting)
16-
* Diary Template
17-
* Quoting Diary
18-
* View Cited Items
19-
* Mobile Outline
20-
* Diary time format setting [click to jump](diarySetting)
21-
* Quick record settings (after opening the application, directly enter the editing page) [click to jump](setting)
22-
233
## Repair
244

25-
* Edit diary, sometimes the title input box is not displayed
26-
* After touching, the left navigation drawer is hidden
27-
* The achievements related to diary writing have not been counted
28-
* When opening the outline, images may fail to load
29-
* Images with links, when clicked, a preview of the image will appear
30-
* Version 1.16.8, privacy mode diary not displayed
31-
* Android client, encountered an exception after inserting the keyboard
32-
* Android client, some keys do not work
33-
* Android 9.0 and below, file selection exception
34-
35-
## Optimization
36-
37-
* Update some text
38-
* Update pop-up title upon completion of LAN transmission
39-
* Remove unused permissions
40-
* Optimize word count method
41-
* Update some icons
42-
* The text part of the mobile menu can be clicked
43-
* Hide outline in non markdown mode
44-
* PWA shortcut operation
45-
* Display app name on Windows client taskbar or when playing audio and video
5+
* Partial platforms privacy mode diary not displayed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"1.16.9"
1+
"1.17.0"
Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,5 @@
11
# 更新公告
22

3-
[toc]
4-
5-
各位侠客们,大家好。祝大家五一国际劳动节快乐
6-
7-
本期更新注意事项
8-
9-
* 已支持Linux平台(deb包)(由于已知问题,不支持音视频加载)
10-
* 打包了Windows免安装版(相比于msix包,缺少分享、urlscheme等功能)
11-
12-
## 新增
13-
14-
* 支持Linux
15-
* 设置日历每周第一天 [点击跳转](calendarSetting)
16-
* 日记模板
17-
* 引用日记
18-
* 查看被引用
19-
* 移动端大纲
20-
* 日记时间格式设置 [点击跳转](diarySetting)
21-
* 快速记录设置(打开应用后,直接进入编辑页面)[点击跳转](setting)
22-
233
## 修复
244

25-
* 编辑日记,有时不显示标题输入框
26-
* 触摸后,左侧导航抽屉隐藏
27-
* 写日记相关成就未统计
28-
* 开启大纲时,图片可能加载失败
29-
* 带有链接的图片,点击后会出现图片预览
30-
* 1.16.8版本,隐私模式日记不显示
31-
* Android客户端,插入键盘后,出现异常
32-
* Android客户端,部分按键不生效
33-
* Android 9.0及以下,文件选择异常
34-
35-
## 优化
36-
37-
* 更新部分文本
38-
* 局域网传输完成时更新弹窗标题
39-
* 移除未使用的权限
40-
* 优化字数统计方式
41-
* 更新部分图标
42-
* 移动端菜单文字部分可点击
43-
* 非markdown模式时,隐藏大纲
44-
* pwa快捷操作
45-
* Windows客户端任务栏或播放音视频时显示应用名
5+
* 部分平台隐私模式日记未显示

0 commit comments

Comments
 (0)