fix

CodeGather · Sep 6, 2024 · b3288b1 · b3288b1
1 parent 16cae4d
commit b3288b1
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 11 deletions.
diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
@@ -1,5 +1,9 @@
 #  
 
+## 1.2.9
+* 更新android sdk 为 2.14.2
+* 更新ios sdk 为 2.14.2
+
 ## 1.2.8
 * 更新android sdk 为 2.13.14
 * 更新ios sdk 为 2.13.14

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 #
 
+## 1.2.9
+* Update Android SDK to 2.14.2
+* Update iOS SDK to 2.14.2
+
 ## 1.2.8
 * Update Android SDK to 2.13.14
 * Update iOS SDK to 2.13.14

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.2.8'
+version '1.2.9'
 
 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.13.14
+authLibVersion=2.14.2
 loggerVersion=2.2.2
 mainVersion=2.2.3
diff --git a/android/libs/auth_number_product-2.13.14-release.aar b/android/libs/auth_number_product-2.13.14-release.aar
diff --git a/android/libs/auth_number_product-2.14.2-release.aar b/android/libs/auth_number_product-2.14.2-release.aar
diff --git a/android/src/main/java/com/sean/rao/ali_auth/utils/StatusAll.java b/android/src/main/java/com/sean/rao/ali_auth/utils/StatusAll.java
@@ -45,7 +45,8 @@ public enum StatusAll {
   Status700001("用户切换其他登录方式", "700001"),
   Status700002("用户点击登录按钮", "700002"),
   Status700003("用户勾选协议选项", "700003"),
-  Status700004("用户点击协议富文本", "700004");
+  Status700004("用户点击协议富文本", "700004"),
+  Status700005("用户点击第三方按钮", "700005");
 
 
   private String name;

diff --git a/ios/Classes/Utils/PNSBuildModelUtils.m b/ios/Classes/Utils/PNSBuildModelUtils.m
@@ -1607,7 +1607,13 @@ + (TXCustomModel *)buildModelOption:(NSDictionary *)dict
                   }
               } else if ([key containsString:@"Color"]) {
                   if ([key isEqual:@"lightColor"]) {
-                    [model setValue: @([dict boolValueForKey: key defaultValue: NO] ? UIStatusBarStyleLightContent : UIStatusBarStyleLightContent) forKey:newKey];
+                    if (@available(iOS 13.0, *)) {
+                      // UIStatusBarStyleLightContent Light content, for use on dark backgrounds
+                      // UIStatusBarStyleDarkContent Dark content, for use on light backgrounds
+                      [model setValue: @([dict boolValueForKey: key defaultValue: NO] ? UIStatusBarStyleDarkContent : UIStatusBarStyleLightContent) forKey:newKey];
+                    } else {
+                      [model setValue: @([dict boolValueForKey: key defaultValue: NO] ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent) forKey:newKey];
+                    }
                   } else {
                     [model setValue: [self getColor: [dict stringValueForKey: key defaultValue: @"#23effe"]] forKey:newKey];
                   }

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.2.8'
+  s.version          = '1.2.9'
   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/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/Headers/YTXVendorService.h b/ios/libs/YTXOperators.framework/Headers/YTXVendorService.h
@@ -20,6 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface YTXVendorConfig : NSObject
 /// 当前供应商标识：中移互联（cm_zyhl），联通小沃（cu_xw），联通在线（cu_zx）,电信世纪龙（ct_sjl）
 @property (nonatomic, copy) NSString *vendorKey;
+/// 供应商二级标识
+@property (nonatomic, copy) NSString *vendorSubKey;
 /// 供应商 access id
 @property (nonatomic, copy) NSString *vendorAccessId;
 /// 供应商 access secret

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/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.2.8
+version: 1.2.9
 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,6 +1,4 @@
 
-## 1.2.8
-* 更新android sdk 为 2.13.14
-* 更新ios sdk 为 2.13.14
-* 修复Ios端二次弹窗的大小
-* 当未勾选隐私协议时点击登录按钮，弹出 Toast 提示 
+## 1.2.9
+* 更新android sdk 为 2.14.2
+* 更新ios sdk 为 2.14.2