AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-10 12:26:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

优化系统版本检测 (#3924)

Browse Source
This commit is contained in:
Glavo 2025-05-20 13:33:57 +08:00 committed by GitHub
parent 2f3bf61d94
commit d347b0c6cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java
View File

@ -119,6 +119,8 @@ public enum OperatingSystem {
private static final String[] INVALID_RESOURCE_BASENAMES; private static final String[] INVALID_RESOURCE_BASENAMES;
private static final String[] INVALID_RESOURCE_FULLNAMES; private static final String[] INVALID_RESOURCE_FULLNAMES;
private static final boolean IS_WINDOWS_7_OR_LATER;
static { static {
String nativeEncoding = System.getProperty("native.encoding"); String nativeEncoding = System.getProperty("native.encoding");
String hmclNativeEncoding = System.getProperty("hmcl.native.encoding"); String hmclNativeEncoding = System.getProperty("hmcl.native.encoding");
@ -183,6 +185,23 @@ public enum OperatingSystem {
if (versionNumber == null) if (versionNumber == null)
versionNumber = System.getProperty("os.version"); versionNumber = System.getProperty("os.version");
int major;
int dotIndex = versionNumber.indexOf('.');
try {
if (dotIndex < 0)
major = Integer.parseInt(versionNumber);
else
major = Integer.parseInt(versionNumber.substring(0, dotIndex));
} catch (NumberFormatException ignored) {
major = -1;
}
// Windows XP: NT 5.1~5.2
// Windows Vista: NT 6.0
// Windows 7: NT 6.1
IS_WINDOWS_7_OR_LATER = major >= 6 && !versionNumber.startsWith("6.0");
// Get Code Page // Get Code Page
if (kernel32 != null) if (kernel32 != null)
@ -218,6 +237,7 @@ public enum OperatingSystem {
SYSTEM_VERSION = System.getProperty("os.version"); SYSTEM_VERSION = System.getProperty("os.version");
SYSTEM_BUILD_NUMBER = -1; SYSTEM_BUILD_NUMBER = -1;
CODE_PAGE = -1; CODE_PAGE = -1;
IS_WINDOWS_7_OR_LATER = false;
} }
Map<String, String> osRelease = Collections.emptyMap(); Map<String, String> osRelease = Collections.emptyMap();
@ -273,27 +293,7 @@ public enum OperatingSystem {
} }
public static boolean isWindows7OrLater() { public static boolean isWindows7OrLater() {
if (CURRENT_OS != WINDOWS) { return IS_WINDOWS_7_OR_LATER;
return false;
}
int major;
int dotIndex = SYSTEM_VERSION.indexOf('.');
try {
if (dotIndex < 0) {
major = Integer.parseInt(SYSTEM_VERSION);
} else {
major = Integer.parseInt(SYSTEM_VERSION.substring(0, dotIndex));
}
} catch (NumberFormatException ignored) {
return false;
}
// Windows XP: NT 5.1~5.2
// Windows Vista: NT 6.0
// Windows 7: NT 6.1
return major >= 6 && !SYSTEM_VERSION.startsWith("6.0");
} }
@SuppressWarnings("removal") @SuppressWarnings("removal")