diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd5b0a..b722094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ that can be found in the LICENSE file. --> # Changelog +## 0.7.0 +### 🚀 Update sdk to v2.12-1.15 + ## 0.6.2 ### 😅 Fixed Android unexpected error diff --git a/android/build.gradle b/android/build.gradle index bc2c841..7a0eef7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -67,10 +67,9 @@ dependencies{ // implementation 'com.alibaba.fastjson2:fastjson2:2.0.14.android' // https://mvnrepository.com/artifact/com.google.code.gson/gson implementation 'com.google.code.gson:gson:2.9.0' - - implementation(name:'auth_number_product-2.12.11.2-log-online-standard-release', ext:'aar') + implementation(name:'auth_number_product-2.12.15-log-online-standard-release', ext:'aar') implementation(name:'crashshield-2.1.4-release', ext:'aar') - implementation(name:'main-2.1.4-release', ext:'aar') - implementation(name:'logger-2.1.5.2-release', ext:'aar') + implementation(name:'main-2.1.8-release', ext:'aar') + implementation(name:'logger-2.1.8-release', ext:'aar') } diff --git a/android/libs/auth_number_product-2.12.11.2-log-online-standard-release.aar b/android/libs/auth_number_product-2.12.11.2-log-online-standard-release.aar deleted file mode 100644 index ec3e011..0000000 Binary files a/android/libs/auth_number_product-2.12.11.2-log-online-standard-release.aar and /dev/null differ diff --git a/android/libs/auth_number_product-2.12.15-log-online-standard-release.aar b/android/libs/auth_number_product-2.12.15-log-online-standard-release.aar new file mode 100644 index 0000000..7bbbcc7 Binary files /dev/null and b/android/libs/auth_number_product-2.12.15-log-online-standard-release.aar differ diff --git a/android/libs/logger-2.1.5.2-release.aar b/android/libs/logger-2.1.5.2-release.aar deleted file mode 100644 index 8c47e2c..0000000 Binary files a/android/libs/logger-2.1.5.2-release.aar and /dev/null differ diff --git a/android/libs/logger-2.1.8-release.aar b/android/libs/logger-2.1.8-release.aar new file mode 100644 index 0000000..a48771b Binary files /dev/null and b/android/libs/logger-2.1.8-release.aar differ diff --git a/android/libs/main-2.1.4-release.aar b/android/libs/main-2.1.4-release.aar deleted file mode 100644 index d05e070..0000000 Binary files a/android/libs/main-2.1.4-release.aar and /dev/null differ diff --git a/android/libs/main-2.1.8-release.aar b/android/libs/main-2.1.8-release.aar new file mode 100644 index 0000000..d3b1c12 Binary files /dev/null and b/android/libs/main-2.1.8-release.aar differ diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 6dfbb2c..70cc983 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -39,7 +39,7 @@ android { applicationId "com.fluttercandies.flutter_ali_auth_example" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion flutter.minSdkVersion + minSdkVersion 21 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/example/android/build.gradle b/example/android/build.gradle index 83ae220..3cdaac9 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 6a64ff6..8e92eeb 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -7,9 +7,9 @@ PODS: - SDWebImage - MBProgressHUD (1.2.0) - MJExtension (3.4.1) - - SDWebImage (5.13.4): - - SDWebImage/Core (= 5.13.4) - - SDWebImage/Core (5.13.4) + - SDWebImage (5.17.0): + - SDWebImage/Core (= 5.17.0) + - SDWebImage/Core (5.17.0) DEPENDENCIES: - Flutter (from `Flutter`) @@ -29,11 +29,11 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_ali_auth: e56ff2cf266380791c1be5e231f23acb86d49ffd + flutter_ali_auth: 7e96ab274f6144e20788046795d739a6007de55b MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MJExtension: 21c5f6f8c4d5d8844b7ae8fbae08fed0b501f961 - SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 + SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 5154170..b5fb9a9 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 9D1B27B18D7C4FE03F190B03 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DDAD9C17AEE4EE834544BEB /* Pods_Runner.framework */; }; + E3805DD7CCCB2B842291F16C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2B0CA2173FD7596E4369BF0 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -32,9 +32,9 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 2DDAD9C17AEE4EE834544BEB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 30B8E1EA6A03B9EC7F2AB033 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 1B7B3C31E8BFEE41A1747C45 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 745C2E0CDB858B685A864E79 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -45,8 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A38791DB4B080771839FBEF2 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - CB18B368819FD7705866D0AB /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + A096BC0D183C217B4A986276 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + F2B0CA2173FD7596E4369BF0 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,21 +54,31 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9D1B27B18D7C4FE03F190B03 /* Pods_Runner.framework in Frameworks */, + E3805DD7CCCB2B842291F16C /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 4B4E390D864609B51F6B2D18 /* Frameworks */ = { + 2F43DC8F5E03B3666EC8CF22 /* Frameworks */ = { isa = PBXGroup; children = ( - 2DDAD9C17AEE4EE834544BEB /* Pods_Runner.framework */, + F2B0CA2173FD7596E4369BF0 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; }; + 8E4A382DB6A9FEF27ACA7B26 /* Pods */ = { + isa = PBXGroup; + children = ( + 745C2E0CDB858B685A864E79 /* Pods-Runner.debug.xcconfig */, + A096BC0D183C217B4A986276 /* Pods-Runner.release.xcconfig */, + 1B7B3C31E8BFEE41A1747C45 /* Pods-Runner.profile.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -86,8 +96,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - EBB96F2640A3558E3233D983 /* Pods */, - 4B4E390D864609B51F6B2D18 /* Frameworks */, + 8E4A382DB6A9FEF27ACA7B26 /* Pods */, + 2F43DC8F5E03B3666EC8CF22 /* Frameworks */, ); sourceTree = ""; }; @@ -114,17 +124,6 @@ path = Runner; sourceTree = ""; }; - EBB96F2640A3558E3233D983 /* Pods */ = { - isa = PBXGroup; - children = ( - CB18B368819FD7705866D0AB /* Pods-Runner.debug.xcconfig */, - A38791DB4B080771839FBEF2 /* Pods-Runner.release.xcconfig */, - 30B8E1EA6A03B9EC7F2AB033 /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -132,14 +131,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - CC416C32920030426AE775B7 /* [CP] Check Pods Manifest.lock */, + 1163E4DA4B8518406B320E36 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 69C9F2AFB5FCF98C312AA4FE /* [CP] Embed Pods Frameworks */, + B8E13C6E9A541F6B17F57F7E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -198,37 +197,43 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 1163E4DA4B8518406B320E36 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Thin Binary"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; }; - 69C9F2AFB5FCF98C312AA4FE /* [CP] Embed Pods Frameworks */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + name = "Thin Binary"; + outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -245,26 +250,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - CC416C32920030426AE775B7 /* [CP] Check Pods Manifest.lock */ = { + B8E13C6E9A541F6B17F57F7E /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -342,7 +342,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -420,7 +420,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -469,7 +469,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/lib/main.dart b/example/lib/main.dart index 4419fe2..ae47e03 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -34,8 +35,10 @@ class _MyAppState extends State { alignment: Alignment.center, animationType: SmartAnimationType.fade, ); - brightness = MediaQueryData.fromWindow(WidgetsBinding.instance.window) - .platformBrightness; + + brightness = + MediaQueryData.fromView(PlatformDispatcher.instance.views.first) + .platformBrightness; } Future initPlatformState() async { diff --git a/example/pubspec.lock b/example/pubspec.lock index ce828e8..43fb877 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.1" + version: "1.3.0" collection: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.flutter-io.cn" source: hosted - version: "1.17.0" + version: "1.17.1" flutter: dependency: "direct main" description: flutter @@ -28,7 +28,7 @@ packages: path: ".." relative: true source: path - version: "0.6.2" + version: "0.7.0" flutter_lints: dependency: "direct dev" description: @@ -49,10 +49,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.flutter-io.cn" source: hosted - version: "0.6.5" + version: "0.6.7" lints: dependency: transitive description: @@ -73,10 +73,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.9.1" plugin_platform_interface: dependency: transitive description: @@ -99,5 +99,5 @@ packages: source: hosted version: "2.1.4" sdks: - dart: ">=2.18.0 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.0.0" diff --git a/ios/flutter_ali_auth.podspec b/ios/flutter_ali_auth.podspec index d431adb..137a33b 100644 --- a/ios/flutter_ali_auth.podspec +++ b/ios/flutter_ali_auth.podspec @@ -22,7 +22,7 @@ Flutter Ali Auth Plugin 阿里云一键登录Flutter插件 s.dependency 'MJExtension' s.dependency 'MBProgressHUD' - s.platform = :ios, '9.0' + s.platform = :ios, '12.0' s.vendored_frameworks = 'frameworks/*.framework' s.framework = 'Network' @@ -37,6 +37,5 @@ Flutter Ali Auth Plugin 阿里云一键登录Flutter插件 # s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } s.pod_target_xcconfig = {'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } - s.swift_version = '5.0' end diff --git a/ios/frameworks/ATAuthSDK.framework/ATAuthSDK b/ios/frameworks/ATAuthSDK.framework/ATAuthSDK index c59b604..e71fa21 100644 Binary files a/ios/frameworks/ATAuthSDK.framework/ATAuthSDK and b/ios/frameworks/ATAuthSDK.framework/ATAuthSDK differ diff --git a/ios/frameworks/ATAuthSDK.framework/Headers/PNSReporter.h b/ios/frameworks/ATAuthSDK.framework/Headers/PNSReporter.h index acb094c..31e4cbc 100644 --- a/ios/frameworks/ATAuthSDK.framework/Headers/PNSReporter.h +++ b/ios/frameworks/ATAuthSDK.framework/Headers/PNSReporter.h @@ -27,10 +27,10 @@ typedef NS_ENUM(NSInteger, PNSLoggerLevel) { - (void)setConsolePrintLoggerEnable:(BOOL)enable; /** - * 设置日志及埋点上传开关，但不会对通过 setupUploader: 接口实现的自定义上传方法起作用 + * 设置埋点上传开关，但不会对通过 setupUploader: 接口实现的自定义上传方法起作用 * @param enable 开关设置BOOL值，默认为YES */ -- (void)setUploadEnable:(BOOL)enable; +- (void)setUploadEnable:(BOOL)enable DEPRECATED_MSG_ATTRIBUTE("日志不再上传");; @end diff --git a/ios/frameworks/ATAuthSDK.framework/Headers/PNSReturnCode.h b/ios/frameworks/ATAuthSDK.framework/Headers/PNSReturnCode.h index 6bb55a0..0ff56f4 100644 --- a/ios/frameworks/ATAuthSDK.framework/Headers/PNSReturnCode.h +++ b/ios/frameworks/ATAuthSDK.framework/Headers/PNSReturnCode.h @@ -38,6 +38,8 @@ static NSString * const PNSCodeInterfaceLimited = @"600014"; static NSString * const PNSCodeInterfaceTimeout = @"600015"; /// AppID、Appkey解析失败 static NSString * const PNSCodeDecodeAppInfoFailed = @"600017"; +/// 该号码已被运营商管控,目前只有联通号码有该功能 +static NSString * const PNSCodePhoneBlack = @"600018"; /// 运营商已切换 static NSString * const PNSCodeCarrierChanged = @"600021"; /// 终端环境检测失败（终端不支持认证 / 终端检测参数错误） diff --git a/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonHandler.h b/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonHandler.h index d9d1417..23a0d53 100644 --- a/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonHandler.h +++ b/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonHandler.h @@ -72,7 +72,7 @@ typedef NS_ENUM(NSInteger, PNSAuthType) { * * 授权页控件点击事件：700000（点击授权页返回按钮）、700001（点击切换其他登录方式）、 * 700002（点击登录按钮事件，根据返回字典里面的 "isChecked"字段来区分check box是否被选中，只有被选中的时候内部才会去获取Token）、700003（点击check box事件）、700004（点击协议富文本文字） - 接口回调其他事件：600001（授权页唤起成功）、600002（授权页唤起失败）、600000（成功获取Token）、600011（获取Token失败）、 + 接口回调其他事件：600001（授权页唤起成功）、600002（授权页唤起失败）、600000（成功获取Token）、600011（获取Token失败）、 * 600015（获取Token超时）、600013（运营商维护升级，该功能不可用）、600014（运营商维护升级，该功能已达最大调用次数）..... */ - (void)getLoginTokenWithTimeout:(NSTimeInterval)timeout controller:(UIViewController *_Nonnull)controller model:(TXCustomModel *_Nullable)model complete:(void (^_Nullable)(NSDictionary * _Nonnull resultDic))complete; @@ -107,6 +107,11 @@ typedef NS_ENUM(NSInteger, PNSAuthType) { */ - (PNSReporter * _Nonnull)getReporter; +/** + 关闭二次授权弹窗页 + */ +- (void)closePrivactAlertView; + /** diff --git a/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonUtils.h b/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonUtils.h index aec603d..a56b6db 100644 --- a/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonUtils.h +++ b/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonUtils.h @@ -15,39 +15,39 @@ + (BOOL)checkDeviceCellularDataEnable; /** -判断当前上网卡运营商是否是中国联通 -@return 结果 -*/ + 判断当前上网卡运营商是否是中国联通 + @return 结果 + */ + (BOOL)isChinaUnicom; /** -判断当前上网卡运营商是否是中国移动 -@return 结果 -*/ + 判断当前上网卡运营商是否是中国移动 + @return 结果 + */ + (BOOL)isChinaMobile; /** -判断当前上网卡运营商是否是中国电信 -@return 结果 -*/ + 判断当前上网卡运营商是否是中国电信 + @return 结果 + */ + (BOOL)isChinaTelecom; /** -获取当前上网卡运营商名称，比如中国移动、中国电信、中国联通 -@return 结果 -*/ + 获取当前上网卡运营商名称，比如中国移动、中国电信、中国联通 + @return 结果 + */ + (NSString *)getCurrentCarrierName; /** -获取当前上网卡网络类型，比如WiFi，4G -@return 结果 -*/ + 获取当前上网卡网络类型，比如WiFi，4G + @return 结果 + */ + (NSString *)getNetworktype; /** -判断当前设备是否有SIM卡 -@return 结果 -*/ + 判断当前设备是否有SIM卡 + @return 结果 + */ + (BOOL)simSupportedIsOK; /** @@ -64,7 +64,7 @@ /** 获取设备当前网络私网IP地址 - @return 结果 + @return 结果 */ + (NSString *)getMobilePrivateIPAddress:(BOOL)preferIPv4; @@ -74,8 +74,8 @@ + (NSString *)getUniqueID; /** -通过颜色设置生成图片，支持弧度设置，比如一键登录按钮背景图片 -*/ + 通过颜色设置生成图片，支持弧度设置，比如一键登录按钮背景图片 + */ + (UIImage *)imageWithColor:(UIColor *)color size:(CGSize)size isRoundedCorner:(BOOL )isRounded radius:(CGFloat)radius; @end diff --git a/ios/frameworks/ATAuthSDK.framework/Headers/TXCustomModel.h b/ios/frameworks/ATAuthSDK.framework/Headers/TXCustomModel.h index f8692ed..4fc42d9 100644 --- a/ios/frameworks/ATAuthSDK.framework/Headers/TXCustomModel.h +++ b/ios/frameworks/ATAuthSDK.framework/Headers/TXCustomModel.h @@ -130,6 +130,8 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, strong) UIImage *backgroundImage; /** 授权页背景图片view的 content mode，默认为 UIViewContentModeScaleAspectFill */ @property (nonatomic, assign) UIViewContentMode backgroundImageContentMode; +/** 点击授权页背景是否关闭授权页，只有在弹窗模式下生效，默认NO*/ +@property (nonatomic, assign) BOOL tapAuthPageMaskClosePage; #pragma mark- logo图片 /** logo图片设置 */ @@ -215,6 +217,8 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, assign) BOOL checkBoxIsHidden; /** checkBox大小，高宽一样，必须大于0 */ @property (nonatomic, assign) CGFloat checkBoxWH; +/** checkBox是否和协议内容垂直居中，默认NO，即顶部对齐 */ +@property (nonatomic, assign) BOOL checkBoxVerticalCenter; /** 协议1，[协议名称,协议Url]，注：三个协议名称不能相同 */ @property (nonatomic, copy) NSArray *privacyOne; @@ -226,6 +230,14 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, copy) NSArray *privacyConectTexts; /** 协议内容颜色数组，[非点击文案颜色，点击文案颜色] */ @property (nonatomic, copy) NSArray *privacyColors; +/** 运营商协议内容颜色 ，优先级最高，如果privacyOperatorColors不设置，则取privacyColors中的点击文案颜色，privacyColors不设置，则是默认色*/ +@property (nonatomic, strong) UIColor *privacyOperatorColor; +/** 协议1内容颜色，优先级最高，如果privacyOneColors不设置，则取privacyColors中的点击文案颜色，privacyColors不设置，则是默认色*/ +@property (nonatomic, strong) UIColor *privacyOneColor; +/** 协议2内容颜色，优先级最高，如果privacyTwoColors不设置，则取privacyColors中的点击文案颜色，privacyColors不设置，则是默认色*/ +@property (nonatomic, strong) UIColor *privacyTwoColor; +/** 协议3内容颜色，优先级最高，如果privacyThreeColors不设置，则取privacyColors中的点击文案颜色，privacyColors不设置，则是默认色*/ +@property (nonatomic, strong) UIColor *privacyThreeColor; /** 协议文案支持居中、居左、居右设置，默认居左 */ @property (nonatomic, assign) NSTextAlignment privacyAlignment; /** 协议整体文案，前缀部分文案 */ @@ -286,7 +298,7 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR /** * 自定义控件添加，注意：自定义视图的创建初始化和添加到父视图，都需要在主线程！！ * @param superCustomView 父视图 -*/ + */ @property (nonatomic, copy) void(^customViewBlock)(UIView *superCustomView); /** @@ -301,7 +313,7 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR * @param loginFrame 登录按钮的frame * @param changeBtnFrame 切换到其他方式按钮的frame * @param privacyFrame 协议整体（包括checkBox）的frame -*/ + */ @property (nonatomic, copy) void(^customViewLayoutBlock)(CGSize screenSize, CGRect contentViewFrame, CGRect navFrame, CGRect titleBarFrame, CGRect logoFrame, CGRect sloganFrame, CGRect numberFrame, CGRect loginFrame, CGRect changeBtnFrame, CGRect privacyFrame); #pragma mark - 二次隐私协议弹窗设置 @@ -319,6 +331,8 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, strong) UIColor *privacyAlertBackgroundColor; /** 二次隐私协议弹窗透明度，默认不透明1.0 ，设置范围0.3~1.0之间 */ @property (nonatomic, assign) CGFloat privacyAlertAlpha; +/** 二次隐私协议弹窗标题文字内容，默认"请阅读并同意以下条款" */ +@property (nonatomic, copy) NSString *privacyAlertTitleContent; /** 二次隐私协议弹窗标题文字大小，最小12，默认12 */ @property (nonatomic, strong) UIFont *privacyAlertTitleFont; /** 二次隐私协议弹窗标题文字颜色，默认黑色 */ @@ -333,8 +347,24 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, strong) UIColor *privacyAlertContentBackgroundColor; /** 二次隐私协议弹窗协议内容颜色数组，[非点击文案颜色，点击文案颜色],默认[0x999999,0x1890FF] */ @property (nonatomic, copy) NSArray *privacyAlertContentColors; +/** 二次隐私协议弹窗协议运营商协议内容颜色，优先级最高，如果privacyAlertOperatorColors不设置，则取privacyAlertContentColors中的点击文案颜色，privacyAlertContentColors不设置，则是默认色*/ +@property (nonatomic, strong) UIColor *privacyAlertOperatorColor; +/** 二次隐私协议弹窗协议协议1内容颜色 ，优先级最高，如果privacyAlertOneColors不设置，则取privacyAlertContentColors中的点击文案颜色，privacyAlertContentColors不设置，则是默认色*/ +@property (nonatomic, strong) UIColor *privacyAlertOneColor; +/** 二次隐私协议弹窗协议协议2内容颜色 ，优先级最高，如果privacyAlertTwoColors不设置，则取privacyAlertContentColors中的点击文案颜色，privacyAlertContentColors不设置，则是默认色*/ +@property (nonatomic, strong) UIColor *privacyAlertTwoColor; +/** 二次隐私协议弹窗协议协议3内容颜色 ，优先级最高，如果privacyAlertThreeColors不设置，则取privacyAlertContentColors中的点击文案颜色，privacyAlertContentColors不设置，则是默认色*/ +@property (nonatomic, strong) UIColor *privacyAlertThreeColor; /** 二次隐私协议弹窗协议文案支持居中、居左、居右设置，默认居左 */ @property (nonatomic, assign) NSTextAlignment privacyAlertContentAlignment; + +/** 二次隐私协议弹窗协议整体文案，前缀部分文案 ,如果不赋值，默认使用privacyPreText*/ +@property (nonatomic, copy) NSString *privacyAlertPreText; +/** 二次隐私协议弹窗协议整体文案，后缀部分文案 如果不赋值，默认使用privacySufText*/ +@property (nonatomic, copy) NSString *privacyAlertSufText; + +/** 二次隐私协议弹窗按钮文字内容 默认“同意”*/ +@property (nonatomic, copy) NSString *privacyAlertBtnContent; /** 二次隐私协议弹窗按钮按钮背景图片 ,默认高度50.0pt，@[激活状态的图片,高亮状态的图片] */ @property (nonatomic, copy) NSArray *privacyAlertBtnBackgroundImages; /** 二次隐私协议弹窗按钮文字颜色，默认黑色, @[激活状态的颜色,高亮状态的颜色] */ @@ -363,10 +393,27 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, copy) PNSBuildFrameBlock privacyAlertTitleFrameBlock; /** 二次隐私协议弹窗内容尺寸，默认为从标题顶部位置开始，最终会根据设置进来的width对协议文本进行自适应，得到的size是协议控件的最终大小。不能超出父视图 */ @property (nonatomic, copy) PNSBuildFrameBlock privacyAlertPrivacyContentFrameBlock; -/** 二次隐私协议弹窗尺寸,默认为父视图的宽度一半,居中显示。高度默认50, */ +/** 二次隐私协议弹窗确认按钮尺寸,默认为父视图的宽度一半,居中显示。高度默认50, */ @property (nonatomic, copy) PNSBuildFrameBlock privacyAlertButtonFrameBlock; /** 二次隐私协议弹窗右侧关闭按钮尺寸，默认宽高44，居弹窗右侧15，居弹窗顶部0*/ @property (nonatomic, copy) PNSBuildFrameBlock privacyAlertCloseFrameBlock; + +/** + * 二次授权页弹窗自定义控件添加，注意：自定义视图的创建初始化和添加到父视图，都需要在主线程！！ + * @param superPrivacyAlertCustomView 父视图 + */ +@property (nonatomic, copy) void(^privacyAlertCustomViewBlock)(UIView *superPrivacyAlertCustomView); + +/** + * 二次授权页弹窗布局完成时会调用该block，可以在该block实现里面可设置自定义添加控件的frame + * @param privacyAlertFrame 二次授权页弹窗frame + * @param privacyAlertTitleFrame 二次授权页弹窗标题frame + * @param privacyAlertPrivacyContentFrame 二次授权页弹窗协议内容frame + * @param privacyAlertButtonFrame 二次授权页弹窗确认按钮frame + * @param privacyAlertCloseFrame 二次授权页弹窗右上角关闭按钮frame + */ +@property (nonatomic, copy) void(^privacyAlertCustomViewLayoutBlock)(CGRect privacyAlertFrame, CGRect privacyAlertTitleFrame, CGRect privacyAlertPrivacyContentFrame, CGRect privacyAlertButtonFrame, CGRect privacyAlertCloseFrame); + @end NS_ASSUME_NONNULL_END diff --git a/ios/frameworks/ATAuthSDK.framework/Info.plist b/ios/frameworks/ATAuthSDK.framework/Info.plist index cee3c36..14cff9f 100644 Binary files a/ios/frameworks/ATAuthSDK.framework/Info.plist and b/ios/frameworks/ATAuthSDK.framework/Info.plist differ diff --git a/ios/frameworks/YTXMonitor.framework/Info.plist b/ios/frameworks/YTXMonitor.framework/Info.plist index 6e669cf..197c5f4 100644 Binary files a/ios/frameworks/YTXMonitor.framework/Info.plist and b/ios/frameworks/YTXMonitor.framework/Info.plist differ diff --git a/ios/frameworks/YTXMonitor.framework/YTXMonitor b/ios/frameworks/YTXMonitor.framework/YTXMonitor index bb47748..daeb110 100644 Binary files a/ios/frameworks/YTXMonitor.framework/YTXMonitor and b/ios/frameworks/YTXMonitor.framework/YTXMonitor differ diff --git a/ios/frameworks/YTXOperators.framework/Headers/YTXNetUtils.h b/ios/frameworks/YTXOperators.framework/Headers/YTXNetUtils.h index 256610b..54e4c9d 100644 --- a/ios/frameworks/YTXOperators.framework/Headers/YTXNetUtils.h +++ b/ios/frameworks/YTXOperators.framework/Headers/YTXNetUtils.h @@ -46,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN 获取当前上网卡运营商编码，比如46000、46001、46003 @return 结果 */ -- (NSString *)getCurrentCarrierCode; +- (NSString *)getCurrentCarrierCode API_DEPRECATED("废弃，完成不可用，返回空字符串", ios(4.0, 16.0)); /** 获取当前上网卡网络类型，比如WiFi，4G @@ -88,7 +88,7 @@ NS_ASSUME_NONNULL_BEGIN 获取双卡设备下，非上网卡信息 @return 结果 */ -- (NSString *)getOptionalCarrierInfo; +- (NSString *)getOptionalCarrierInfo API_DEPRECATED("废弃，完成不可用，返回空字符串", ios(4.0, 16.0));; /** 获取当前蜂网络Ip地址 diff --git a/ios/frameworks/YTXOperators.framework/Info.plist b/ios/frameworks/YTXOperators.framework/Info.plist index dac75b6..9a91245 100644 Binary files a/ios/frameworks/YTXOperators.framework/Info.plist and b/ios/frameworks/YTXOperators.framework/Info.plist differ diff --git a/ios/frameworks/YTXOperators.framework/YTXOperators b/ios/frameworks/YTXOperators.framework/YTXOperators index c4fb878..9d04d35 100644 Binary files a/ios/frameworks/YTXOperators.framework/YTXOperators and b/ios/frameworks/YTXOperators.framework/YTXOperators differ diff --git a/pubspec.yaml b/pubspec.yaml index 90d853b..3f8aae2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_ali_auth description: Flutter Ali Auth Plugin 阿里云一键登录Flutter插件 repository: https://github.com/fluttercandies/flutter_ali_auth -version: 0.6.2 +version: 0.7.0 homepage: https://github.com/fluttercandies/flutter_ali_auth environment: