Skip to content

Commit ec366c2

Browse files
committed
fix isHiddenLoading -> isHiddenToast
add autoHideLoginLoading
1 parent bdcdce5 commit ec366c2

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

ios/Classes/AliAuthPlugin.m

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
126126
else if ([@"quitPage" isEqualToString:call.method]) {
127127
[[TXCommonHandler sharedInstance] cancelLoginVCAnimated:YES complete:nil];
128128
}
129+
else if ([@"hideLoading" isEqualToString:call.method]) {
130+
[[TXCommonHandler sharedInstance] hideLoginLoading];
131+
}
129132
else if ([@"appleLogin" isEqualToString:call.method]) {
130133
[self handleAuthorizationAppleIDButtonPress:call result:result];
131134
}
@@ -336,14 +339,14 @@ - (void)loginWithModel:(TXCustomModel *)model complete:(void (^)(void))completi
336339
[[weakSelf findCurrentViewController].view hitTest:CGPointMake(_vc.view.bounds.size.width, _vc.view.bounds.size.height) withEvent:nil];
337340
// [[weakSelf findCurrentViewController].view addSubview:headerView];
338341

339-
bool isHiddenLoading = [self->_callData.arguments boolValueForKey: @"isHiddenLoading" defaultValue: YES];
342+
bool isHiddenToast = [self->_callData.arguments boolValueForKey: @"isHiddenToast" defaultValue: YES];
340343
// 当未勾选隐私协议时,弹出 Toast 提示
341344
if ([PNSCodeLoginControllerClickLoginBtn isEqualToString:code] &&
342345
!self->_isChecked) {
343346
NSDictionary *dic = self->_callData.arguments;
344347
[self showToast:[dic stringValueForKey:@"toastText" defaultValue:@"请先阅读用户协议"]];
345-
// 当存在isHiddenLoading时需要执行loading
346-
} else if ([PNSCodeLoginControllerClickLoginBtn isEqualToString:code] && !isHiddenLoading) {
348+
// 当存在autoHideLoginLoading时需要执行loading
349+
} else if ([PNSCodeLoginControllerClickLoginBtn isEqualToString:code] && !isHiddenToast) {
347350
dispatch_async(dispatch_get_main_queue(), ^{
348351
[MBProgressHUD showHUDAddedTo:[weakSelf findCurrentViewController].view animated:YES];
349352
});
@@ -420,8 +423,8 @@ -(void) resultData:(NSDictionary *)dict{
420423

421424
#pragma mark - 格式化数据utils返回数据
422425
- (void)showResult:(id __nullable)showResult {
423-
// 当存在isHiddenLoading时需要执行关闭
424-
if (![self->_callData.arguments boolValueForKey: @"isHiddenLoading" defaultValue: YES]) {
426+
// 当存在autoHideLoginLoading时需要执行关闭
427+
if (![self->_callData.arguments boolValueForKey: @"autoHideLoginLoading" defaultValue: YES]) {
425428
dispatch_async(dispatch_get_main_queue(), ^{
426429
[MBProgressHUD hideHUDForView: [self findCurrentViewController].view animated:YES];
427430
});

lib/ali_auth_model.dart

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,10 @@ class AliAuthModel {
406406
late String? loadingBackgroundPath;
407407

408408
/// 是否隐藏loading
409-
late bool? isHiddenLoading;
409+
late bool? isHiddenToast;
410+
411+
/// 是否隐藏loading
412+
late bool? autoHideLoginLoading;
410413

411414
/// 底部虚拟导航栏
412415
late String? bottomNavBarColor;
@@ -758,7 +761,8 @@ class AliAuthModel {
758761
this.protocolAction,
759762
this.packageName,
760763
this.loadingBackgroundPath,
761-
this.isHiddenLoading,
764+
this.isHiddenToast,
765+
this.autoHideLoginLoading,
762766
this.isHiddenCustom,
763767
this.customThirdView,
764768
this.backgroundColor,
@@ -1054,7 +1058,8 @@ Map<String, dynamic> _$AliAuthModelToJson(AliAuthModel instance) =>
10541058
'privacyAlertOwnTwoColor': instance.privacyAlertOwnTwoColor,
10551059
'privacyAlertOwnThreeColor': instance.privacyAlertOwnThreeColor,
10561060
'tapPrivacyAlertMaskCloseAlert': instance.tapPrivacyAlertMaskCloseAlert,
1057-
'isHiddenLoading': instance.isHiddenLoading,
1061+
'isHiddenToast': instance.isHiddenToast,
1062+
'autoHideLoginLoading': instance.autoHideLoginLoading ?? true,
10581063
'autoQuitPage': instance.autoQuitPage,
10591064
'isHideToast': instance.isHideToast,
10601065
'toastText': instance.toastText,

0 commit comments

Comments
 (0)