-
Notifications
You must be signed in to change notification settings - Fork 869
feat: 修改主页下载稳定版功能为在应用内更新 #5957
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Mine-diamond
wants to merge
16
commits into
HMCL-dev:main
Choose a base branch
from
Mine-diamond:switch-stable
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat: 修改主页下载稳定版功能为在应用内更新 #5957
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
8aa165a
feat: 添加功能
Mine-diamond cf211fa
feat: 优化代码
Mine-diamond 91e92d7
feat: 优化代码
Mine-diamond d01199b
fix: 修复错误
Mine-diamond 8e33bc7
Update HMCL/src/main/resources/assets/lang/I18N.properties
Glavo 214bea6
Update HMCL/src/main/resources/assets/lang/I18N.properties
Glavo d4810d1
Update HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
Glavo b3265fd
Update HMCL/src/main/resources/assets/lang/I18N.properties
Glavo b07de03
Update HMCL/src/main/resources/assets/lang/I18N_zh.properties
Glavo 6e80372
Update HMCL/src/main/resources/assets/lang/I18N_zh.properties
Glavo 3ea88fa
Update HMCL/src/main/resources/assets/lang/I18N_zh.properties
Glavo 6c8bfbf
Update HMCL/src/main/resources/assets/lang/I18N_zh.properties
Glavo 30a8eef
Merge remote-tracking branch 'upstream/main' into switch-stable
Glavo 2f2961d
Merge remote-tracking branch 'upstream/main' into switch-stable
Glavo d76ce0f
Refactor update channel listener to use lambda expression for improve…
Glavo 1e5ac81
Refactor update check listener to use callback for improved readability
Glavo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,9 +25,11 @@ | |
| import org.jackhuang.hmcl.Metadata; | ||
| import org.jackhuang.hmcl.util.io.NetworkUtils; | ||
| import org.jackhuang.hmcl.util.versioning.VersionNumber; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import static org.jackhuang.hmcl.setting.ConfigHolder.config; | ||
| import static org.jackhuang.hmcl.util.Lang.*; | ||
|
|
@@ -102,6 +104,11 @@ private static boolean isDevelopmentVersion(String version) { | |
| } | ||
|
|
||
| public static void requestCheckUpdate(UpdateChannel channel, boolean preview) { | ||
| requestCheckUpdate(channel, preview, null); | ||
| } | ||
|
|
||
| public static void requestCheckUpdate(UpdateChannel channel, boolean preview, | ||
| @Nullable Consumer<@Nullable RemoteVersion> callback) { | ||
| Platform.runLater(() -> { | ||
| if (isCheckingUpdate()) | ||
| return; | ||
|
Comment on lines
113
to
114
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
@@ -122,6 +129,10 @@ public static void requestCheckUpdate(UpdateChannel channel, boolean preview) { | |
| if (finalResult != null) { | ||
| latestVersion.set(finalResult); | ||
| } | ||
|
|
||
| if (callback != null) { | ||
| callback.accept(finalResult); | ||
| } | ||
| }); | ||
| }, "Update Checker", true); | ||
| }); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
在切换到稳定通道时,建议将
preview参数硬编码为false。用户点击“切换至稳定版”通常是为了获取当前的正式稳定版本。如果使用全局的acceptPreviewUpdate设置(在开发版/预览版中通常为true),可能会导致请求stable-preview通道,如果服务器没有该通道则可能无法获取到预期的更新。