diff --git a/lib/data/services/ble_manager.dart b/lib/data/services/ble_manager.dart index 5b020bf63..1a1daabd1 100644 --- a/lib/data/services/ble_manager.dart +++ b/lib/data/services/ble_manager.dart @@ -15,6 +15,7 @@ import '../../data/models/appconfig.dart'; import '../../core/utils/logger.dart'; import 'bluetooth_manager.dart'; import 'language_manager.dart'; +import 'network/dio_manager.dart'; // 重新导出BLE连接状态常量,让外部可以通过BleManager访问 export 'package:ble_service/ble_service.dart' show BleConnectionState; @@ -753,10 +754,7 @@ class BleManager extends GetxService { Future startAgentService() async { try { // 从.env文件直接读取环境变量 - var serverurl = dotenv.env['SERVER_URL'] ?? ''; - if (Get.locale?.countryCode != 'CN') { - serverurl = dotenv.env['HW_SERVER_URL'] ?? ''; - } + var serverurl = DioManager().baseUrl; var jsonString = _storage.read("logintoken"); diff --git a/lib/data/services/network/dio_manager.dart b/lib/data/services/network/dio_manager.dart index e0141cc36..43de8d723 100644 --- a/lib/data/services/network/dio_manager.dart +++ b/lib/data/services/network/dio_manager.dart @@ -14,9 +14,9 @@ class DioManager { String get baseUrl { final countryCode = Get.deviceLocale?.countryCode?.toUpperCase(); final isChinaMainland = countryCode == 'CN'; - - if (!isChinaMainland) { - return dotenv.env['HW_SERVER_URL'] ?? dotenv.env['SERVER_URL'] ?? ''; + final channel = dotenv.env['Channel'] ?? 'OFFICIAL'; + if (!isChinaMainland || channel == "GLOBAL_GOOGLE") { + return dotenv.env['HW_SERVER_URL'] ?? ''; } else { return dotenv.env['SERVER_URL'] ?? ''; } diff --git a/lib/modules/goods/controllers/goods_base_controller.dart b/lib/modules/goods/controllers/goods_base_controller.dart index 5bcdb6d17..e36dfadbe 100644 --- a/lib/modules/goods/controllers/goods_base_controller.dart +++ b/lib/modules/goods/controllers/goods_base_controller.dart @@ -437,7 +437,7 @@ abstract class GoodsBaseController extends GetxController { Future payWechat(DBGoods item, {PaymentResultCallback? onResult}) async { final cents = item.price; // DBGoods.price 单位:分 - final serverUrl = dotenv.env['SERVER_URL'] ?? DioManager().baseUrl; + final serverUrl = DioManager().baseUrl; final paymentData = await _payService.createWechatPayOrder( productId: item.id, productName: item.name,