diff --git a/CHANGELOG.md b/CHANGELOG.md index b722094..3a3b976 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ that can be found in the LICENSE file. --> # Changelog +## 0.7.1 +### 🚀 Update sdk to v2.13.3 +### China Unicomm requires the new SDK to be updated by Mar 31, 2024 + ## 0.7.0 ### 🚀 Update sdk to v2.12-1.15 diff --git a/android/build.gradle b/android/build.gradle index 7a0eef7..0023413 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -67,9 +67,8 @@ 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.15-log-online-standard-release', ext:'aar') - implementation(name:'crashshield-2.1.4-release', ext:'aar') - implementation(name:'main-2.1.8-release', ext:'aar') - implementation(name:'logger-2.1.8-release', ext:'aar') + implementation(name:'auth_number_product-2.13.3-log-online-standard-cuum-release', ext:'aar') + implementation(name:'main-2.2.2-release', ext:'aar') + implementation(name:'logger-2.2.2-release', ext:'aar') } 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 deleted file mode 100644 index 7bbbcc7..0000000 Binary files a/android/libs/auth_number_product-2.12.15-log-online-standard-release.aar and /dev/null differ diff --git a/android/libs/auth_number_product-2.13.3-log-online-standard-cuum-release.aar b/android/libs/auth_number_product-2.13.3-log-online-standard-cuum-release.aar new file mode 100644 index 0000000..4f46f7f Binary files /dev/null and b/android/libs/auth_number_product-2.13.3-log-online-standard-cuum-release.aar differ diff --git a/android/libs/crashshield-2.1.4-release.aar b/android/libs/crashshield-2.1.4-release.aar deleted file mode 100755 index e9b88cd..0000000 Binary files a/android/libs/crashshield-2.1.4-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 deleted file mode 100644 index a48771b..0000000 Binary files a/android/libs/logger-2.1.8-release.aar and /dev/null differ diff --git a/android/libs/logger-2.2.2-release.aar b/android/libs/logger-2.2.2-release.aar new file mode 100644 index 0000000..cd9d4aa Binary files /dev/null and b/android/libs/logger-2.2.2-release.aar differ diff --git a/android/libs/main-2.1.8-release.aar b/android/libs/main-2.1.8-release.aar deleted file mode 100644 index d3b1c12..0000000 Binary files a/android/libs/main-2.1.8-release.aar and /dev/null differ diff --git a/android/libs/main-2.2.2-release.aar b/android/libs/main-2.2.2-release.aar new file mode 100644 index 0000000..37c1cda Binary files /dev/null and b/android/libs/main-2.2.2-release.aar differ diff --git a/ios/frameworks/ATAuthSDK.framework/ATAuthSDK b/ios/frameworks/ATAuthSDK.framework/ATAuthSDK index e71fa21..3bba22c 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/PNSReturnCode.h b/ios/frameworks/ATAuthSDK.framework/Headers/PNSReturnCode.h index 0ff56f4..fbf6302 100644 --- a/ios/frameworks/ATAuthSDK.framework/Headers/PNSReturnCode.h +++ b/ios/frameworks/ATAuthSDK.framework/Headers/PNSReturnCode.h @@ -82,5 +82,4 @@ static NSString * const PNSCodeLoginPrivacyAlertViewPrivacyContentClick = @"7000 /*************** 二次授权页返回code码 FINISH ***************/ - #endif /* PNSReturnCode_h */ diff --git a/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonHandler.h b/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonHandler.h index 23a0d53..926c125 100644 --- a/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonHandler.h +++ b/ios/frameworks/ATAuthSDK.framework/Headers/TXCommonHandler.h @@ -28,7 +28,7 @@ typedef NS_ENUM(NSInteger, PNSAuthType) { - (NSString *_Nonnull)getVersion; /** - * 初始化SDK调用参数,app生命周期内调用一次 + * SDK鉴权,app生命周期内调用一次 * @param info app对应的秘钥 * @param complete 结果异步回调到主线程,成功时resultDic=@{resultCode:600000, msg:...},其他情况时"resultCode"值请参考PNSReturnCode */ @@ -90,6 +90,21 @@ typedef NS_ENUM(NSInteger, PNSAuthType) { */ - (void)setCheckboxIsChecked:(BOOL)isChecked; +/** + * 查询授权页checkbox是否勾选,YES:勾选,NO:未勾选 + */ +- (BOOL)queryCheckBoxIsChecked; + +/** + * 授权页协议内容动画执行,注意:必须设置privacyAnimation属性,才会执行动画 + */ +- (void)privacyAnimationStart; + +/** + * 授权页checkbox动画执行,注意:必须设置checkboxAnimation属性,才会执行动画 + */ +- (void)checkboxAnimationStart; + /** * 手动隐藏一键登录获取登录Token之后的等待动画,默认为自动隐藏,当设置 TXCustomModel 实例 autoHideLoginLoading = NO 时, 可调用该方法手动隐藏 */ @@ -108,12 +123,10 @@ typedef NS_ENUM(NSInteger, PNSAuthType) { - (PNSReporter * _Nonnull)getReporter; /** - 关闭二次授权弹窗页 + * 关闭二次授权弹窗页 */ - (void)closePrivactAlertView; - - /** * 检查及准备调用环境,resultDic返回PNSCodeSuccess才能调用下面的功能接口 * @param complete 结果异步回调到主线程,成功时resultDic=@{resultCode:600000, msg:...},其他情况时"resultCode"值请参考PNSReturnCode,只有成功回调才能保障后续接口调用 diff --git a/ios/frameworks/ATAuthSDK.framework/Headers/TXCustomModel.h b/ios/frameworks/ATAuthSDK.framework/Headers/TXCustomModel.h index 4fc42d9..ee0f730 100644 --- a/ios/frameworks/ATAuthSDK.framework/Headers/TXCustomModel.h +++ b/ios/frameworks/ATAuthSDK.framework/Headers/TXCustomModel.h @@ -162,7 +162,7 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR #pragma mark- 号码 /** 号码颜色设置 */ @property (nonatomic, strong) UIColor *numberColor; -/** 号码字体大小设置,大小小于16则不生效 */ +/** 号码字体设置,大小小于16则不生效 */ @property (nonatomic, strong) UIFont *numberFont; /** @@ -250,8 +250,14 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, copy) NSString *privacyOperatorSufText; /** 运营商协议指定显示顺序,默认0,即第1个协议显示,最大值可为3,即第4个协议显示*/ @property (nonatomic, assign) NSInteger privacyOperatorIndex; -/** 协议整体文案字体大小,小于12.0不生效 */ +/** 协议整体文案字体,小于12.0不生效 */ @property (nonatomic, strong) UIFont *privacyFont; +/** 协议整体文案行间距,默认0 */ +@property (nonatomic, assign) CGFloat privacyLineSpaceDp; +/** 运营商协议文案字体,仅对运营商协议本体文案和前后缀生效,小于12.0不生效 */ +@property (nonatomic, strong) UIFont *privacyOperatorFont; +/** 运营商协议文案下划线,仅对运营商协议本体文案和前后缀生效,YES:展示下划线;NO:不展示下划线,默认不展示 */ +@property (nonatomic, assign) BOOL privacyOperatorUnderline; /** checkBox是否扩大按钮可交互范围至"协议前缀部分文案(默认:我已阅读并同意)"区域,默认NO */ @property (nonatomic, assign) BOOL expandAuthPageCheckedScope; @@ -265,6 +271,10 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR * 未同意协议时点击登录按钮,协议整体文案的动画效果,不设置或设置为nil默认没有动画,SDK内部会主动更改动画的一些属性(包括:removedOnCompletion = NO、fillMode = kCAFillModeRemoved 及 delegate) */ @property (nonatomic, strong, nullable) CAAnimation *privacyAnimation; +/** + * 未同意协议时点击登录按钮,checkbox的动画效果,不设置或设置为nil默认没有动画,SDK内部会主动更改动画的一些属性(包括:removedOnCompletion = NO、fillMode = kCAFillModeRemoved 及 delegate) + */ +@property (nonatomic, strong, nullable) CAAnimation *checkboxAnimation; /** 协议整体相对屏幕底部的Y轴距离,与其他有区别!!不能小于0 */ @property (nonatomic, assign) CGFloat privacyBottomOffetY DEPRECATED_MSG_ATTRIBUTE("Please use privacyFrameBlock instead"); /** 协议整体(包括checkBox)相对content view的左右边距,当协议整体宽度小于(content view宽度-2*左右边距)且居中模式,则左右边距设置无效,不能小于0 */ @@ -333,7 +343,7 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, assign) CGFloat privacyAlertAlpha; /** 二次隐私协议弹窗标题文字内容,默认"请阅读并同意以下条款" */ @property (nonatomic, copy) NSString *privacyAlertTitleContent; -/** 二次隐私协议弹窗标题文字大小,最小12,默认12 */ +/** 二次隐私协议弹窗标题文字字体,最小12,默认12 */ @property (nonatomic, strong) UIFont *privacyAlertTitleFont; /** 二次隐私协议弹窗标题文字颜色,默认黑色 */ @property (nonatomic, strong) UIColor *privacyAlertTitleColor; @@ -341,12 +351,18 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, strong) UIColor *privacyAlertTitleBackgroundColor; /** 二次隐私协议弹窗标题位置,默认居中*/ @property (nonatomic, assign) NSTextAlignment privacyAlertTitleAlignment; -/** 二次隐私协议弹窗协议内容文字大小,最小12,默认12 */ +/** 二次隐私协议弹窗协议内容文字字体,最小12,默认12 */ @property (nonatomic, strong) UIFont *privacyAlertContentFont; +/** 二次隐私协议弹窗协议内容行间距,默认0 */ +@property (nonatomic, assign) CGFloat privacyAlertLineSpaceDp; /** 二次隐私协议弹窗协议内容背景颜色,默认白色 */ @property (nonatomic, strong) UIColor *privacyAlertContentBackgroundColor; /** 二次隐私协议弹窗协议内容颜色数组,[非点击文案颜色,点击文案颜色],默认[0x999999,0x1890FF] */ @property (nonatomic, copy) NSArray *privacyAlertContentColors; +/** 二次隐私协议弹窗运营商协议内容文字字体,仅对运营商协议部分的文本生效,最小12,默认12 */ +@property (nonatomic, strong) UIFont *privacyAlertContentOperatorFont; +/** 二次隐私协议弹窗运营商协议内容文字下划线,仅对运营商协议部分的文本生效,YES:展示下划线,NO:不展示下划线,默认不展示 */ +@property (nonatomic, assign) BOOL privacyAlertContentUnderline; /** 二次隐私协议弹窗协议运营商协议内容颜色,优先级最高,如果privacyAlertOperatorColors不设置,则取privacyAlertContentColors中的点击文案颜色,privacyAlertContentColors不设置,则是默认色*/ @property (nonatomic, strong) UIColor *privacyAlertOperatorColor; /** 二次隐私协议弹窗协议协议1内容颜色 ,优先级最高,如果privacyAlertOneColors不设置,则取privacyAlertContentColors中的点击文案颜色,privacyAlertContentColors不设置,则是默认色*/ @@ -369,7 +385,7 @@ typedef CGRect(^PNSBuildFrameBlock)(CGSize screenSize, CGSize superViewSize, CGR @property (nonatomic, copy) NSArray *privacyAlertBtnBackgroundImages; /** 二次隐私协议弹窗按钮文字颜色,默认黑色, @[激活状态的颜色,高亮状态的颜色] */ @property (nonatomic, copy) NSArray *privacyAlertButtonTextColors; -/** 二次隐私协议弹窗按钮文字大小,最小10,默认18*/ +/** 二次隐私协议弹窗按钮文字字体,最小10,默认18*/ @property (nonatomic, strong) UIFont *privacyAlertButtonFont; /** 二次隐私协议弹窗关闭按钮是否显示,默认显示 */ @property (nonatomic, assign) BOOL privacyAlertCloseButtonIsNeedShow; diff --git a/ios/frameworks/ATAuthSDK.framework/Info.plist b/ios/frameworks/ATAuthSDK.framework/Info.plist index 14cff9f..3448c59 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/Headers/ACMManager.h b/ios/frameworks/YTXMonitor.framework/Headers/ACMManager.h index 02dfcb7..e0a36ce 100644 --- a/ios/frameworks/YTXMonitor.framework/Headers/ACMManager.h +++ b/ios/frameworks/YTXMonitor.framework/Headers/ACMManager.h @@ -28,6 +28,24 @@ NS_ASSUME_NONNULL_BEGIN loggerTableName:(NSString *)loggerTablename limitKeyPrefix:(NSString *)limitKeyPrefix; +/** + * 初始化 + * @param databaseName 数据库名,不指定则默认为 “ACMDatabase” + * @param monitorTableName 埋点表名,必须要指定,用来区分不同产品数据 + * @param loggerTablename 日志表名,必须要指定,用来区分不同产品数据 + * @param limitKeyPrefix 限流信息存储到本地key的前缀,用来区分不同产品的限流缓存 + * @param uploadCount 每次上传条数 + * @param retryRightNow 上传失败是否立马重试,默认立马重试 + * @param uploadOnce 是否只执行一轮上传,默认NO + */ +- (instancetype)initWithDatabaseName:(NSString * _Nullable)databaseName + monitorTableName:(NSString *)monitorTableName + loggerTableName:(NSString *)loggerTablename + limitKeyPrefix:(NSString *)limitKeyPrefix + uploadCount:(NSInteger)uploadCount + retryRightNow:(BOOL)retryRightNow + uploadOnce:(BOOL)uploadOnce; + /** * 获取组件当前版本号 */ diff --git a/ios/frameworks/YTXMonitor.framework/Headers/ACMMonitor.h b/ios/frameworks/YTXMonitor.framework/Headers/ACMMonitor.h index 03d83f7..f74e3fe 100644 --- a/ios/frameworks/YTXMonitor.framework/Headers/ACMMonitor.h +++ b/ios/frameworks/YTXMonitor.framework/Headers/ACMMonitor.h @@ -3,6 +3,14 @@ NS_ASSUME_NONNULL_BEGIN +typedef NS_ENUM(NSInteger, ACM_DELETE_TYPE) { + ACM_DELETE_TYPE_ALL, + ACM_DELETE_TYPE_FAILED, + ACM_DELETE_TYPE_UNUPLOAD +}; + + + @interface ACMMonitor : NSObject - (instancetype)init NS_UNAVAILABLE; @@ -35,6 +43,13 @@ NS_ASSUME_NONNULL_BEGIN */ - (void)uploadFailedRecords; +/** + * 删除埋点 + * @param type 删除类型 + * @param block 结果的异步回调 + */ +- (void)deleteRecordsByType:(ACM_DELETE_TYPE)type block:(void (^)(BOOL))block; + @end NS_ASSUME_NONNULL_END diff --git a/ios/frameworks/YTXMonitor.framework/Info.plist b/ios/frameworks/YTXMonitor.framework/Info.plist index 197c5f4..6e962ec 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 daeb110..6034879 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/YTXVendorService.h b/ios/frameworks/YTXOperators.framework/Headers/YTXVendorService.h index 059e4f9..02fbc77 100644 --- a/ios/frameworks/YTXOperators.framework/Headers/YTXVendorService.h +++ b/ios/frameworks/YTXOperators.framework/Headers/YTXVendorService.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN @end @interface YTXVendorConfig : NSObject -/// 当前供应商标识:中移互联(cm_zyhl),小沃联通(cu_xw),电信世纪龙(ct_sjl) +/// 当前供应商标识:中移互联(cm_zyhl),联通小沃(cu_xw),联通在线(cu_zx),电信世纪龙(ct_sjl) @property (nonatomic, copy) NSString *vendorKey; /// 供应商 access id @property (nonatomic, copy) NSString *vendorAccessId; diff --git a/ios/frameworks/YTXOperators.framework/Info.plist b/ios/frameworks/YTXOperators.framework/Info.plist index 9a91245..bc2b2cb 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 9d04d35..8dcea19 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 3f8aae2..8c2e790 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.7.0 +version: 0.7.1 homepage: https://github.com/fluttercandies/flutter_ali_auth environment: