Merge branch 'develop_sky' into 'release_sky'

Develop sky

See merge request StarlockTeam/app-starlock!136
This commit is contained in:
李仪 2025-06-04 01:19:31 +00:00
commit 2a2e6d31f5
2 changed files with 33 additions and 33 deletions

View File

@ -188,23 +188,23 @@ class StarLockLoginLogic extends BaseGetXController {
late StreamSubscription _agreePrivacySubscription; late StreamSubscription _agreePrivacySubscription;
void _initEventListen() { void _initEventListen() {
_agreePrivacySubscription = eventBus // _agreePrivacySubscription = eventBus
.on<AgreePrivacyAgreement>() // .on<AgreePrivacyAgreement>()
.listen((AgreePrivacyAgreement event) async { // .listen((AgreePrivacyAgreement event) async {
/// ip如果属于国内才进行初始化 // /// ip如果属于国内才进行初始化
final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: ''); // final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: '');
String currentLanguage = // String currentLanguage =
CurrentLocaleTool.getCurrentLocaleString(); // // CurrentLocaleTool.getCurrentLocaleString(); //
// ip是国内的且选的是中文才初始化一键登录 // // ip是国内的且选的是中文才初始化一键登录
if (entity.data!.abbreviation?.toLowerCase() == 'cn' && // if (entity.data!.abbreviation?.toLowerCase() == 'cn' &&
currentLanguage == 'zh_CN') { // currentLanguage == 'zh_CN') {
// // //
await JverifyOneClickLoginManage(); // await JverifyOneClickLoginManage();
state.isCheckVerifyEnable.value = // state.isCheckVerifyEnable.value =
await JverifyOneClickLoginManage().checkVerifyEnable(); // await JverifyOneClickLoginManage().checkVerifyEnable();
AppLog.log('一键登录初始化认证结果:${state.isCheckVerifyEnable.value}'); // AppLog.log('一键登录初始化认证结果:${state.isCheckVerifyEnable.value}');
} // }
}); // });
} }
@override @override

View File

@ -106,20 +106,20 @@ Future<void> privacySDKInitialization() async {
await jpushProvider.initJPushService(); await jpushProvider.initJPushService();
NotificationService().init(); // NotificationService().init(); //
/// ip如果属于国内才进行初始化 // /// ip如果属于国内才进行初始化
final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: ''); // final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: '');
if (entity.errorCode!.codeIsSuccessful) { // if (entity.errorCode!.codeIsSuccessful) {
String currentLanguage = // String currentLanguage =
CurrentLocaleTool.getCurrentLocaleString(); // // CurrentLocaleTool.getCurrentLocaleString(); //
// ip是国内的且选的是中文才初始化一键登录 // // ip是国内的且选的是中文才初始化一键登录
if (entity.data!.abbreviation?.toLowerCase() == 'cn' && // if (entity.data!.abbreviation?.toLowerCase() == 'cn' &&
currentLanguage == 'zh_CN') { // currentLanguage == 'zh_CN') {
// // //
final StarLockLoginLogic loginLogic = Get.put(StarLockLoginLogic()); // final StarLockLoginLogic loginLogic = Get.put(StarLockLoginLogic());
await JverifyOneClickLoginManage(); // await JverifyOneClickLoginManage();
loginLogic.state.isCheckVerifyEnable.value = // loginLogic.state.isCheckVerifyEnable.value =
await JverifyOneClickLoginManage().checkVerifyEnable(); // await JverifyOneClickLoginManage().checkVerifyEnable();
eventBus.fire(AgreePrivacyAgreement()); // eventBus.fire(AgreePrivacyAgreement());
} // }
} // }
} }