From 8827fd06d8ea8bcd899e54f76004f63a447e2601 Mon Sep 17 00:00:00 2001 From: Glavo Date: Tue, 20 Oct 2026 18:06:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=8C=BA=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E9=80=BB=E8=BE=91=20(#7020)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jackhuang/hmcl/util/RegionUtils.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/RegionUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/RegionUtils.java index 00f6c14750..f9b181a135 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/RegionUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/RegionUtils.java @@ -40,9 +40,7 @@ public final class RegionUtils { /// Pre-check if the network is in China Mainland to avoid blocking the UI thread. public static void init() { - if (IS_CHINA_MAINLAND_MACHINE) { - Schedulers.io().execute(RegionUtils::isIsChinaMainlandNetwork); - } + Schedulers.io().execute(RegionUtils::isIsChinaMainlandNetwork); } private static final boolean IS_CHINA_MAINLAND_MACHINE = checkMachineIsChinaMainland(); @@ -75,6 +73,25 @@ public final class RegionUtils { private static volatile @Nullable Boolean isChinaMainlandNetwork; private static boolean checkChinaMainlandNetwork() { + if (!IS_CHINA_MAINLAND_MACHINE) + return false; + + switch (ZoneId.systemDefault().getId()) { + case "Antarctica/Casey", + "Asia/Hong_Kong", + "Asia/Irkutsk", + "Asia/Kuching", + "Asia/Macau", + "Asia/Makassar", + "Asia/Manila", + "Asia/Singapore", + "Asia/Taipei", + "Asia/Ulaanbaatar", + "Australia/Perth" -> { + return false; + } + } + @NotNullByDefault @JsonSerializable record IpWhoIsResponse(boolean success, String country_code) { @@ -91,10 +108,6 @@ public final class RegionUtils { } public static boolean isIsChinaMainlandNetwork() { - if (!IS_CHINA_MAINLAND_MACHINE) { - return false; - } - Boolean value = isChinaMainlandNetwork; if (value != null) return value;