From 8ba5e953c240f1ad966520c1e86dc772581dbda9 Mon Sep 17 00:00:00 2001 From: lxm <1274844347@qq.com> Date: Tue, 26 Aug 2025 21:47:56 +0800 Subject: [PATCH] =?UTF-8?q?fix(ble=5Fmanager):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9C=B0=E5=8C=BA=E4=BB=A3=E7=A0=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将Get.locale改为Get.deviceLocale以正确获取设备地区代码 同时在version_update_service中统一使用设备地区代码判断服务器地址 --- lib/data/services/ble_manager.dart | 2 +- lib/data/services/version_update_service.dart | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/data/services/ble_manager.dart b/lib/data/services/ble_manager.dart index b9f48be6e..a835a5e39 100644 --- a/lib/data/services/ble_manager.dart +++ b/lib/data/services/ble_manager.dart @@ -532,7 +532,7 @@ class BleManager extends GetxService { try { // 从.env文件直接读取环境变量 var serverurl = dotenv.env['SERVER_URL'] ?? ''; - if (Get.locale?.countryCode != 'CN') { + if (Get.deviceLocale?.countryCode != 'CN') { serverurl = dotenv.env['HW_SERVER_URL'] ?? ''; } diff --git a/lib/data/services/version_update_service.dart b/lib/data/services/version_update_service.dart index e959227ce..a15251857 100644 --- a/lib/data/services/version_update_service.dart +++ b/lib/data/services/version_update_service.dart @@ -30,7 +30,9 @@ class VersionUpdateService extends GetxService { static final String? _countryCode = Get.deviceLocale?.countryCode; //国家地区编码 static final String? _languageCode = Get.deviceLocale?.languageCode; //语言编码 // ignore: non_constant_identifier_names - static final String? _SERVER_URL = dotenv.env['SERVER_URL']; //服务器地址 + static final String? _SERVER_URL = (_countryCode == 'CN') + ? dotenv.env['SERVER_URL'] + : dotenv.env['HW_SERVER_URL']; //服务器地址 // 添加 getter 方法来访问缓存的静态数据 /// 获取缓存的应用版本