From 650db9718764f7e80385ed28f1122209aa854c0a Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Mon, 1 Dec 2025 19:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9C=8D=E5=8A=A1=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/data/services/version_update_service.dart             | 8 ++++----
 lib/modules/login/controllers/login_controller.dart       | 7 ++++---
 .../meeting/views/bottomSheet/share_bottom_sheet.dart     | 3 ++-
 lib/modules/settings/controllers/settings_controller.dart | 3 ++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/data/services/version_update_service.dart b/lib/data/services/version_update_service.dart
index ac65871e8..b8bf1da1f 100644
--- a/lib/data/services/version_update_service.dart
+++ b/lib/data/services/version_update_service.dart
@@ -31,9 +31,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 = (_countryCode == 'CN')
-      ? dotenv.env['SERVER_URL']
-      : dotenv.env['HW_SERVER_URL']; //服务器地址
+  // static final String? _SERVER_URL = (_countryCode == 'CN')
+  //     ? dotenv.env['SERVER_URL']
+  //     : dotenv.env['HW_SERVER_URL']; //服务器地址
 
   // 添加 getter 方法来访问缓存的静态数据
   /// 获取缓存的应用版本
@@ -83,7 +83,7 @@ class VersionUpdateService extends GetxService {
   String get cachedLanguageCode => _languageCode ?? '';
 
   /// 获取缓存的服务器地址
-  String get cachedServerUrl => _SERVER_URL ?? '';
+  // String get cachedServerUrl => _SERVER_URL ?? '';
 
   final Logger _logger = Logger();
 
diff --git a/lib/modules/login/controllers/login_controller.dart b/lib/modules/login/controllers/login_controller.dart
index 0773d62c4..a568f820c 100644
--- a/lib/modules/login/controllers/login_controller.dart
+++ b/lib/modules/login/controllers/login_controller.dart
@@ -113,9 +113,6 @@ class LoginController extends GetxController {
     _contactController = TextEditingController();
     _verificationCodeController = TextEditingController();
 
-    isChinaMainland.value =
-        Get.deviceLocale?.countryCode?.toUpperCase() == 'CN'; //是否中国大陆地区
-
     // 初始化默认国家代码
     _initDefaultCountryCode();
 
@@ -125,6 +122,10 @@ class LoginController extends GetxController {
     _initDeviceInfo();
     _initAppInfo(); // 新增：初始化APP信息
     _checkGuestLoginConfig(); // 检查游客登录配置
+
+    isChinaMainland.value =
+        Get.deviceLocale?.countryCode?.toUpperCase() == 'CN' &&
+            _userChannel != UserChannel.GLOBAL_GOOGLE; //是否中国大陆地区
   }
 
   @override
diff --git a/lib/modules/meeting/views/bottomSheet/share_bottom_sheet.dart b/lib/modules/meeting/views/bottomSheet/share_bottom_sheet.dart
index 1f7d48615..7d2b276ed 100644
--- a/lib/modules/meeting/views/bottomSheet/share_bottom_sheet.dart
+++ b/lib/modules/meeting/views/bottomSheet/share_bottom_sheet.dart
@@ -10,6 +10,7 @@ import 'package:get_storage/get_storage.dart';
 import 'package:htmltopdfwidgets/htmltopdfwidgets.dart' as pdf;
 import 'package:path_provider/path_provider.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:voitrans/data/services/network/dio_manager.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
 import '../../../../core/utils/synchrodata.dart';
@@ -102,7 +103,7 @@ class _ShareBottomSheetState extends State<ShareBottomSheet> {
                       // );
 
                       // 获取动态服务器地址
-                      final serverUrl = VersionUpdateService.to.cachedServerUrl;
+                      final serverUrl = DioManager().baseUrl;
                       final serverHost = serverUrl
                           .replaceFirst('https://', '')
                           .replaceFirst('http://', '');
diff --git a/lib/modules/settings/controllers/settings_controller.dart b/lib/modules/settings/controllers/settings_controller.dart
index 618adae96..4eff2d73e 100644
--- a/lib/modules/settings/controllers/settings_controller.dart
+++ b/lib/modules/settings/controllers/settings_controller.dart
@@ -10,6 +10,7 @@ import 'package:package_info_plus/package_info_plus.dart';
 
 import '../../../core/themes/theme_service.dart';
 import '../../../core/translations/app_translations.dart';
+import '../../../data/services/network/dio_manager.dart';
 import '../../../data/services/speech_factory.dart';
 import '../../../routes/app_routes.dart';
 import '../models/language_model.dart';
@@ -651,7 +652,7 @@ class SettingsController extends GetxController {
 最近版本检查时间: ${versionService.lastCheckTime ?? '未检查'}
 国家地区编码: ${versionService.cachedCountryCode}
 语言编码: ${versionService.cachedLanguageCode}
-服务器地址: ${versionService.cachedServerUrl}
+服务器地址: ${DioManager().baseUrl}
       ''';
     } catch (e) {
       return '获取版本服务数据失败: $e';