From 7ca848d61b99de89bde7af4b9c7a7cfaa4f2e031 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Wed, 16 Apr 2025 17:59:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=9B=BD=E5=86=85=E6=89=8D=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95=E7=9A=84sdk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/login/login/starLock_login_logic.dart | 21 +++++++++++++------
 lib/main.dart                             | 25 +++++++++++++++++------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/lib/login/login/starLock_login_logic.dart b/lib/login/login/starLock_login_logic.dart
index a03eca9f..f6130c6b 100755
--- a/lib/login/login/starLock_login_logic.dart
+++ b/lib/login/login/starLock_login_logic.dart
@@ -15,6 +15,7 @@ import 'package:star_lock/network/start_chart_api.dart';
 import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart';
 import 'package:star_lock/tools/appFirstEnterHandle.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
+import 'package:star_lock/translations/current_locale_tool.dart';
 
 import '../../main/lockMian/lockMain/lockMain_logic.dart';
 import '../../mine/mine/starLockMine_logic.dart';
@@ -182,11 +183,19 @@ class StarLockLoginLogic extends BaseGetXController {
     _agreePrivacySubscription = eventBus
         .on<AgreePrivacyAgreement>()
         .listen((AgreePrivacyAgreement event) async {
-      await JverifyOneClickLoginManage();
-      oneClickLoginAction();
-      state.isCheckVerifyEnable.value =
-          await JverifyOneClickLoginManage().checkVerifyEnable();
-      AppLog.log('一键登录初始化认证结果：${state.isCheckVerifyEnable.value}');
+      /// 检查ip如果属于国内才进行初始化
+      final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: '');
+      String currentLanguage =
+          CurrentLocaleTool.getCurrentLocaleString(); // 当前选择语言
+      // 判断如果ip是国内的且选的是中文才初始化一键登录
+      if (entity.data!.abbreviation?.toLowerCase() == 'cn' &&
+          currentLanguage == 'zh_CN') {
+        // 初始化一键登录服务
+        await JverifyOneClickLoginManage();
+        state.isCheckVerifyEnable.value =
+            await JverifyOneClickLoginManage().checkVerifyEnable();
+        AppLog.log('一键登录初始化认证结果：${state.isCheckVerifyEnable.value}');
+      }
     });
   }
 
@@ -204,7 +213,7 @@ class StarLockLoginLogic extends BaseGetXController {
     super.onClose();
   }
 
-  //刷新设备信息
+//刷新设备信息
   Future<void> flushedDeviceInfo() async {
     XSConstantMacro().getDeviceInfoData().then((Map<String, dynamic> data) {
       state.deviceInfoMap.value = data;
diff --git a/lib/main.dart b/lib/main.dart
index ee1c0ca7..69901fff 100755
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -10,12 +10,14 @@ import 'package:path/path.dart' as path;
 import 'package:provider/provider.dart';
 import 'package:star_lock/flavors.dart';
 import 'package:star_lock/login/login/starLock_login_logic.dart';
+import 'package:star_lock/login/register/entity/checkIP_entity.dart';
 import 'package:star_lock/mine/about/debug/debug_tool.dart';
 import 'package:star_lock/network/api_provider.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/network/start_chart_api.dart';
 import 'package:star_lock/talk/starChart/handle/impl/debug_Info_model.dart';
 import 'package:star_lock/talk/starChart/status/appLifecycle_observer.dart';
+import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/bugly/bugly_tool.dart';
 import 'package:star_lock/tools/device_info_service.dart';
 import 'package:star_lock/tools/eventBusEventManage.dart';
@@ -24,6 +26,7 @@ import 'package:star_lock/tools/platform_info_services.dart';
 import 'package:star_lock/tools/push/notification_service.dart';
 import 'package:star_lock/tools/push/xs_jPhush.dart';
 import 'package:star_lock/tools/storage.dart';
+import 'package:star_lock/translations/current_locale_tool.dart';
 import 'package:star_lock/translations/trans_lib.dart';
 
 import 'apm/apm_helper.dart';
@@ -103,10 +106,20 @@ Future<void> privacySDKInitialization() async {
   await jpushProvider.initJPushService();
   NotificationService().init(); // 初始化通知服务
 
-  // 初始化一键登录服务
-  final StarLockLoginLogic loginLogic = Get.put(StarLockLoginLogic());
-  await JverifyOneClickLoginManage();
-  loginLogic.state.isCheckVerifyEnable.value =
-      await JverifyOneClickLoginManage().checkVerifyEnable();
-  eventBus.fire(AgreePrivacyAgreement());
+  /// 检查ip如果属于国内才进行初始化
+  final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: '');
+  if (entity.errorCode!.codeIsSuccessful) {
+    String currentLanguage =
+        CurrentLocaleTool.getCurrentLocaleString(); // 当前选择语言
+    // 判断如果ip是国内的且选的是中文才初始化一键登录
+    if (entity.data!.abbreviation?.toLowerCase() == 'cn' &&
+        currentLanguage == 'zh_CN') {
+      // 初始化一键登录服务
+      final StarLockLoginLogic loginLogic = Get.put(StarLockLoginLogic());
+      await JverifyOneClickLoginManage();
+      loginLogic.state.isCheckVerifyEnable.value =
+          await JverifyOneClickLoginManage().checkVerifyEnable();
+      eventBus.fire(AgreePrivacyAgreement());
+    }
+  }
 }