fix and update 1.3.1

CodeGather · CodeGather · commit bdcdce5452c6 · 2025-03-12T23:02:45.000+08:00
diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
@@ -1,5 +1,13 @@
 #  
 
+## 1.3.1
+* 更新android sdk 为 2.14.5
+* 更新ios sdk 为 2.14.5
+* iOS字段：privacyAlertContentTextSize
+* iOS字段：privacyAlertBtnWidth
+* iOS字段：privacyAlertBtnHeigth
+* IOS字段：customReturnBtn
+
 ## 1.3.0
 * 更新android sdk 为 2.14.3
 * 更新ios sdk 为 2.14.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,12 @@
-#
+#  
+
+## 1.3.1
+* Update Android SDK to 2.14.5
+* Update iOS SDK to 2.14.5
+* IOS fields: privacyAlertContentTextSize
+* IOS fields: privacyAlertBtnWidth
+* IOS fields: privacyAlertBtnHeigth
+* IOS field: customReturnBtn
 
 ## 1.3.0
 * Update Android SDK to 2.14.3
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@
 由于项目的其他功能都采用阿里云的服务，在一键登录的功能上也采用阿里云利于后期的更好维护。
 本插件免费开源，高定制，如果在使用中有什么问题，欢迎反馈，如果觉得本插件还不够好可以提供您的宝贵意见，
 如果你想在自己项目中定制，请将本插件clone为本地进行修改，但是通过本插件进行修改后发布其他版本的插件也欢迎，
-但是在使用或者参考了本插件的思路或者相关内容，   
+但是在使用或者参考了本插件的思路或者相关内容，
 
 # 请注明出处并且链接到本插件，谢谢您的配合。  
 
@@ -92,6 +92,7 @@
 - [帮助文档](https://help.aliyun.com/product/75010.html)
 - [前往添加号码认证方案-获取秘钥](https://dypns.console.aliyun.com/?spm=5176.12818093.favorites.ddypns.488716d0ttKe13#/)
 - 使用秘钥初始化环境 AliAuthPlugin.initSdk()
+- [号码认证服务合规指南](https://help.aliyun.com/zh/pnvs/security-and-compliance/number-certification-service-compliance-guidelines)
 
 ## 注意事项
 
diff --git a/README_en.md b/README_en.md
@@ -23,8 +23,9 @@ This is a one click login plug-in for alicloud number authentication service
 As other functions of the project use alicloud services, Alibaba cloud is also used in the one click login function, which is conducive to better maintenance in the later stage.
 This plug-in is free, open source and highly customized. If you have any problems in use, you are welcome to give feedback. If you feel that this plug-in is not good enough, you can provide your valuable opinions,
 If you want to customize in your own project, please modify the clone of this plug-in locally. However, you are welcome to release other versions of plug-ins after modifying through this plug-in,
-However, when using or referring to the ideas or related contents of this plug-in,   
- 
+However, when using or referring to the ideas or related contents of this plug-in, 
+
+
 # Please indicate the source and link to this plug-in. Thank you for your cooperation.  
 
 
@@ -52,10 +53,14 @@ However, when using or referring to the ideas or related contents of this plug-i
 | 700005    | 点击点击第三方按钮事件 |
 
 ## 步骤
-
+- 1、配置APP的签名安装于手机
+- 2、获取签名APK文件下载地址：[点击下载快速获取签名工具](https://docs-aliyun.cn-hangzhou.oss.aliyun-inc.com/assets/attach/87870/cn_zh/1534313766610/AppSignGet.apk)
+- 3、使用签名APP获取签名
+- 4、配置appid+秘钥，阿里云后台配置签名，注意签名要和APP配置的签名一致，否则无法使用
 - [帮助文档](https://help.aliyun.com/product/75010.html)
 - [前往添加号码认证方案-获取秘钥](https://dypns.console.aliyun.com/?spm=5176.12818093.favorites.ddypns.488716d0ttKe13#/)
 - 使用秘钥初始化环境 AliAuthPlugin.initSdk()
+- [号码认证服务合规指南](https://help.aliyun.com/zh/pnvs/security-and-compliance/number-certification-service-compliance-guidelines)
 
 ## matters needing attention
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 group 'com.sean.rao.ali_auth'
-version '1.3.0'
+version '1.3.1'
 
 buildscript {
     repositories {
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 android.injected.testOnly=false
 
-authLibVersion=2.14.3
+authLibVersion=2.14.5
 loggerVersion=2.2.2
 mainVersion=2.2.3
diff --git a/android/libs/auth_number_product-2.14.3-release.aar b/android/libs/auth_number_product-2.14.3-release.aar
diff --git a/android/libs/auth_number_product-2.14.5-release.aar b/android/libs/auth_number_product-2.14.5-release.aar
diff --git a/android/src/main/java/com/sean/rao/ali_auth/AliAuthPlugin.java b/android/src/main/java/com/sean/rao/ali_auth/AliAuthPlugin.java
@@ -183,6 +183,9 @@ public IToast createToast(IToastStyle<?> style) {
       case "quitPage":
         oneKeyLoginPublic.quitPage();
         break;
+      case "hideLoading":
+        oneKeyLoginPublic.hideLoading();
+        break;
       case "openPage":
         if (flutterEngine == null) {
           flutterEngine = new FlutterEngine(mContext);
@@ -300,7 +303,6 @@ public void isNetEnabled(Context context, @NonNull Result result) {
     result.success(resultObject);
   }
 
-
   // 注册回调
   @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   private void registerNetworkCallback(Context context) {
@@ -311,8 +313,6 @@ private void registerNetworkCallback(Context context) {
     cm.registerNetworkCallback(builder.build(), callback);
   }
 
-
-
   // 注销回调
   @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   private void unregisterNetworkCallback(Context context) {
diff --git a/android/src/main/java/com/sean/rao/ali_auth/login/OneKeyLoginPublic.java b/android/src/main/java/com/sean/rao/ali_auth/login/OneKeyLoginPublic.java
@@ -228,6 +228,13 @@ public void quitPage(){
         mAuthHelper.quitLoginPage();
     }
 
+    /**
+     * 结束授权页loading dialog
+     */
+    public void hideLoading(){
+        mAuthHelper.hideLoginLoading();
+    }
+
     /**
      * 处理参数，对参数进行处理包含color、Path
      * @param parmas
diff --git a/example/android/local.properties b/example/android/local.properties
@@ -1,5 +1,3 @@
 sdk.dir=/Users/Yau/softSdk/Android/SDK
 flutter.sdk=/Users/Yau/softSdk/flutter
-flutter.buildMode=debug
-flutter.versionName=1.0.0
-flutter.versionCode=1
+flutter.buildMode=debug
diff --git a/ios/Classes/AliAuthEnum.m b/ios/Classes/AliAuthEnum.m
@@ -103,9 +103,9 @@ + (NSDictionary *)keyPair {
     @"privacyAlertContentVerticalMargin": @"privacyAlertLineSpaceDp",
     @"privacyAlertBtnText": @"privacyAlertBtnContent",
     @"privacyAlertBtnTextSize": @"privacyAlertButtonFont",
-    @"privacyAlertCloseImagPath": @"privacyAlertCloseButtonImage",
     @"privacyAlertContentTextSize": @"privacyAlertContentFont",
     @"privacyAlertBtnBackgroundImgPath": @"privacyAlertBtnBackgroundImages",
+    @"privacyAlertCloseImagPath": @"privacyAlertCloseButtonImage",
     @"privacyAlertCloseBtnShow": @"privacyAlertCloseButtonIsNeedShow",
     @"privacyAlertBefore": @"privacyAlertPreText",
     @"privacyAlertEnd": @"privacyAlertSufText",
diff --git a/ios/Classes/Utils/PNSBuildModelUtils.m b/ios/Classes/Utils/PNSBuildModelUtils.m
@@ -1579,21 +1579,29 @@ + (TXCustomModel *)buildModelOption:(NSDictionary *)dict
           /// 分为两种情况数组和字符串
           if ([dict[key] isKindOfClass:[NSArray class]]) {
             NSArray *array = [dict arrayValueForKey: key defaultValue: [NSArray array]];
-            // 使用for循环遍历数组
             NSMutableArray *mutableArray = [array mutableCopy];
-            [array enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-              // 处理数组中的每个元素，并获取其下标
-              // NSLog(@"Item at index %lu: %@", (unsigned long)idx, obj);
-              /// 处理图片路径
-              if ([key containsString:@"Path"]) {
-                mutableArray[idx] = [self changeUriPathToImage: obj];
-              } else if ([key containsString:@"Color"]) {
-                mutableArray[idx] = [self getColor: obj];
-              } else {
-                mutableArray[idx] = obj;
-              }
-            }];
-            [model setValue: array forKey:newKey];
+            if ([key isEqual: @"privacyAlertCornerRadiusArray"] && array.count == 4) {
+              // 左上、右上、右下、左下 -> 左上，左下，右下，右上
+              mutableArray[0] = array[0];
+              mutableArray[1] = array[3];
+              mutableArray[2] = array[2];
+              mutableArray[3] = array[1];
+            } else {
+              // 使用for循环遍历数组
+              [array enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                // 处理数组中的每个元素，并获取其下标
+                // NSLog(@"Item at index %lu: %@", (unsigned long)idx, obj);
+                /// 处理图片路径
+                if ([key containsString:@"Path"]) {
+                  mutableArray[idx] = [self changeUriPathToImage: obj];
+                } else if ([key containsString:@"Color"]) {
+                  mutableArray[idx] = [self getColor: obj];
+                } else {
+                  mutableArray[idx] = obj;
+                }
+              }];
+            }
+            [model setValue: [mutableArray copy] forKey:newKey];
           } else {
               /// 处理图片路径
               if ([key containsString:@"Path"]) {
@@ -1704,26 +1712,50 @@ + (TXCustomModel *)buildModelOption:(NSDictionary *)dict
     model.navTitle = attrs;
   }
   if (model.navIsHidden) {
-    /// 动态读取assets文件夹下的资源
-    UIImage * navBackImage = model.navBackImage?:[UIImage imageNamed:@"icon_close_light"];
-    model.navBackImage = navBackImage;
     if (!model.hideNavBackItem) {
-      /// 自定义返回按钮
-      model.navBackButtonFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        UIImageView *imageView = [[UIImageView alloc]init];
-        imageView.image = navBackImage;
-        imageView.frame = CGRectMake(
-           CGRectGetMinX(frame),
-           CGRectGetMaxY(frame),
-           CGRectGetWidth(frame),
-           CGRectGetHeight(frame)
-         );
-        frame.origin.y = [dict floatValueForKey: @"navReturnOffsetY" defaultValue: 5];
-        frame.origin.x = [dict floatValueForKey: @"navReturnOffsetX" defaultValue: 15];
-        frame.size.width = [dict floatValueForKey: @"navReturnImgWidth" defaultValue: 40];
-        frame.size.height = [dict floatValueForKey: @"navReturnImgHeight" defaultValue: 40];
-        return frame;
-      };
+      /// 获取自定义的参数
+      NSDictionary *customReturnBtn = [dict dictValueForKey: @"customReturnBtn" defaultValue: nil];
+      /// 获取自定义的资源路径资源
+      UIImage * navBackImagePath = [self changeUriPathToImage: [customReturnBtn stringValueForKey: @"imgPath" defaultValue: nil]];
+      if (customReturnBtn != nil && navBackImagePath != nil) {
+        model.navBackImage = navBackImagePath;
+        /// 自定义返回按钮
+        model.navBackButtonFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+          UIImageView *imageView = [[UIImageView alloc]init];
+          imageView.image = navBackImagePath;
+          imageView.frame = CGRectMake(
+             CGRectGetMinX(frame),
+             CGRectGetMaxY(frame),
+             CGRectGetWidth(frame),
+             CGRectGetHeight(frame)
+           );
+          frame.origin.y = [customReturnBtn floatValueForKey: @"top" defaultValue: 5];
+          frame.origin.x = [customReturnBtn floatValueForKey: @"left" defaultValue: 15];
+          frame.size.width = [customReturnBtn floatValueForKey: @"width" defaultValue: 40];
+          frame.size.height = [customReturnBtn floatValueForKey: @"height" defaultValue: 40];
+          return frame;
+        };
+      } else {
+        /// 动态读取assets文件夹下的资源
+        UIImage * navBackImage = model.navBackImage?:[UIImage imageNamed:@"icon_close_light"];
+        model.navBackImage = navBackImage;
+        /// 自定义返回按钮
+        model.navBackButtonFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+          UIImageView *imageView = [[UIImageView alloc]init];
+          imageView.image = navBackImage;
+          imageView.frame = CGRectMake(
+             CGRectGetMinX(frame),
+             CGRectGetMaxY(frame),
+             CGRectGetWidth(frame),
+             CGRectGetHeight(frame)
+           );
+          frame.origin.y = [dict floatValueForKey: @"navReturnOffsetY" defaultValue: 5];
+          frame.origin.x = [dict floatValueForKey: @"navReturnOffsetX" defaultValue: 15];
+          frame.size.width = [dict floatValueForKey: @"navReturnImgWidth" defaultValue: 40];
+          frame.size.height = [dict floatValueForKey: @"navReturnImgHeight" defaultValue: 40];
+          return frame;
+        };
+      }
     }
   }
   #pragma mark 3、Logo
@@ -1981,6 +2013,15 @@ + (TXCustomModel *)buildModelOption:(NSDictionary *)dict
   }
   
   #pragma mark 10、二次弹窗
+  model.privacyAlertTitleFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+    // return CGRectMake(0, 20, frame.size.width, frame.size.height);
+    return CGRectMake(
+        0,
+        [dict floatValueForKey: @"privacyAlertTitleOffsetY" defaultValue: 20],
+        frame.size.width,
+        frame.size.height
+    );
+  };
   /// 弹窗大小
   model.privacyAlertFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
     return CGRectMake(
@@ -1990,6 +2031,17 @@ + (TXCustomModel *)buildModelOption:(NSDictionary *)dict
         [dict floatValueForKey: @"privacyAlertHeight" defaultValue: 200]
     );
   };
+  /// 确认按钮
+  model.privacyAlertButtonFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+    // return CGRectMake(frame.origin.x,superViewSize.height - 50 - 20, frame.size.width, 50);
+    return CGRectMake(
+        frame.origin.x,
+        frame.origin.y,
+        [dict floatValueForKey: @"privacyAlertBtnWidth" defaultValue: frame.size.width],
+        [dict floatValueForKey: @"privacyAlertBtnHeigth" defaultValue: 50]
+    );
+  };
+  
   
   #pragma mark 屏幕方向
   if (model.privacyAlertIsNeedShow) {
diff --git a/ios/ali_auth.podspec b/ios/ali_auth.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'ali_auth'
-  s.version          = '1.3.0'
+  s.version          = '1.3.1'
   s.summary          = 'A new flutter plugin project.'
   s.description      = <<-DESC
   是一个集成阿里云号码认证服务SDK的flutter插件
diff --git a/ios/libs/ATAuthSDK.framework/ATAuthSDK b/ios/libs/ATAuthSDK.framework/ATAuthSDK
diff --git a/ios/libs/ATAuthSDK.framework/Headers/PNSReturnCode.h b/ios/libs/ATAuthSDK.framework/Headers/PNSReturnCode.h
@@ -65,6 +65,9 @@ static NSString * const PNSCodeLoginControllerClickCheckBoxBtn = @"700003";
 static NSString * const PNSCodeLoginControllerClickProtocol = @"700004";
 /// 中断页面消失的时候，也就是suspendDisMissVC设置为YES的时候，点击左上角返回按钮时透出的状态码
 static NSString * const PNSCodeLoginControllerSuspendDisMissVC = @"700010";
+/// 授权页已销毁
+static NSString * const PNSCodeLoginControllerDeallocVC = @"700020";
+
 
 /*************** 号码认证授权页相关返回码 FINISH ***************/
 
diff --git a/ios/libs/ATAuthSDK.framework/Info.plist b/ios/libs/ATAuthSDK.framework/Info.plist
diff --git a/ios/libs/YTXMonitor.framework/Info.plist b/ios/libs/YTXMonitor.framework/Info.plist
diff --git a/ios/libs/YTXMonitor.framework/YTXMonitor b/ios/libs/YTXMonitor.framework/YTXMonitor
diff --git a/ios/libs/YTXOperators.framework/Info.plist b/ios/libs/YTXOperators.framework/Info.plist
diff --git a/ios/libs/YTXOperators.framework/YTXOperators b/ios/libs/YTXOperators.framework/YTXOperators
diff --git a/lib/ali_auth.dart b/lib/ali_auth.dart
@@ -41,6 +41,11 @@ class AliAuth {
     return AliAuthPlatform.instance.quitPage();
   }
 
+  /// 强制关闭Loading
+  static Future<void> hideLoading() async {
+    return AliAuthPlatform.instance.hideLoading();
+  }
+
   /// 强制关闭一键登录授权页面
   static Future<String> getCurrentCarrierName() async {
     return AliAuthPlatform.instance.getCurrentCarrierName();
diff --git a/lib/ali_auth_method_channel.dart b/lib/ali_auth_method_channel.dart
@@ -64,6 +64,12 @@ class MethodChannelAliAuth extends AliAuthPlatform {
     return await methodChannel.invokeMethod('quitPage');
   }
 
+  /// 强制关闭Loading
+  @override
+  Future<void> hideLoading() async {
+    return await methodChannel.invokeMethod('hideLoading');
+  }
+
   /// 强制关闭一键登录授权页面
   @override
   Future<String> getCurrentCarrierName() async {
diff --git a/lib/ali_auth_platform_interface.dart b/lib/ali_auth_platform_interface.dart
@@ -60,6 +60,10 @@ abstract class AliAuthPlatform extends PlatformInterface {
     throw UnimplementedError('quitPage() has not been implemented.');
   }
 
+  Future<void> hideLoading() {
+    throw UnimplementedError('quitPage() has not been implemented.');
+  }
+
   Future<String> getCurrentCarrierName() {
     throw UnimplementedError('quitPage() has not been implemented.');
   }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ali_auth
 description: This is a plug-in for one click login in the alicloud number authentication service. Alibaba cloud is also used in the one click login function
-version: 1.3.0
+version: 1.3.1
 homepage: https://github.com/CodeGather/flutter_ali_auth
 repository: https://github.com/CodeGather/flutter_ali_auth/tree/master/example
 issue_tracker: https://github.com/CodeGather/flutter_ali_auth/issues
diff --git a/release.md b/release.md
@@ -1,4 +1,8 @@
 
-## 1.3.0
-* 更新android sdk 为 2.14.3
-* 更新ios sdk 为 2.14.3
+## 1.3.1
+* 更新android sdk 为 2.14.5
+* 更新ios sdk 为 2.14.5
+* iOS字段：privacyAlertContentTextSize
+* iOS字段：privacyAlertBtnWidth
+* iOS字段：privacyAlertBtnHeigth
+* IOS字段：customReturnBtn
