feat: udpate 2.1.6 binary , env switch to rnd

xiaoyi 2021-06-30 14:54:23 +08:00
parent ebbc5e9c99
commit fd9d218733
25 changed files with 230 additions and 12 deletions

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,49 @@
//
// LoginModel.h
// TapCommonSDK
//
// Created by Bottle K on 2021/6/21.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
//登录流程中触发的事件
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_AUTHORIZE_START;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TAPTAP_AUTHORIZE_OPEN;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TAPTAP_AUTHORIZE_BACK;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TAPTAP_AUTHORIZE_TOKEN;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TAPTAP_AUTHORIZE_PROFILE;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TAPTAP_AUTHORIZE_SUCCESS;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TAPTAP_AUTHORIZE_FAIL;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TAPTAP_AUTHORIZE_CANCEL;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TDS_LOGIN_START;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TDS_LOGIN_SUCCESS;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TDS_LOGIN_FAIL;
FOUNDATION_EXPORT NSString *const LOGIN_ACTION_TDS_LOGIN_CANCEL;
//登录类型
FOUNDATION_EXPORT NSString *const LOGIN_TYPE_TAPTAP;
FOUNDATION_EXPORT NSString *const LOGIN_TYPE_WEBVIEW;
FOUNDATION_EXPORT NSString *const LOGIN_TYPE_AUTO;
@interface LoginModel : NSObject
//每次登录流程唯一ID
@property (nonatomic, copy) NSString *login_session_id;
//登录流程中触发的事件
@property (nonatomic, copy) NSString *login_action;
//登录类型
@property (nonatomic, copy, nullable) NSString *login_type;
//错误code
@property (nonatomic, copy, nullable) NSString *login_error_code;
//错误message
@property (nonatomic, copy, nullable) NSString *login_error_msg;
@end
NS_ASSUME_NONNULL_END

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5f386589c90264b5eb99eac6931aceeb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -9,8 +9,29 @@
NS_ASSUME_NONNULL_BEGIN
//页面唯一id
FOUNDATION_EXPORT NSString *const PAGE_ID_TAPTAP_AUTHORIZE_WEB;
FOUNDATION_EXPORT NSString *const PAGE_ID_TAPTAP_AUTHORIZE_TAPTAPCLIENT;
FOUNDATION_EXPORT NSString *const PAGE_ID_GAME;
//页面别名
FOUNDATION_EXPORT NSString *const PAGE_NAME_TAPTAP_AUTHORIZE_WEB;
FOUNDATION_EXPORT NSString *const PAGE_NAME_TAPTAP_AUTHORIZE_TAPTAPCLIENT;
FOUNDATION_EXPORT NSString *const PAGE_NAME_GAME;
//页面事件名
FOUNDATION_EXPORT NSString *const PAGE_ACTION_APPEAR;
FOUNDATION_EXPORT NSString *const PAGE_ACTION_DISAPPEAR;
@interface PageModel : NSObject
@property (nonatomic, copy) NSString *page;
//页面唯一id
@property (nonatomic, copy, nullable) NSString *page_id;
//页面别名
@property (nonatomic, copy, nullable) NSString *page_name;
//页面事件名
@property (nonatomic, copy, nullable) NSString *page_action;
@end
NS_ASSUME_NONNULL_END

View File

@ -0,0 +1,17 @@
//
// PlatformXUA.h
// TapCommonSDK
//
// Created by Bottle K on 2021/6/21.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface PlatformXUA : NSObject
@property (nonatomic, copy) NSDictionary *xuaMap;
+ (instancetype)shareInstance;
@end
NS_ASSUME_NONNULL_END

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 203b93403eb204a0dbdbd9201f56b08b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN
/// @param constant 距离
+ (NSLayoutConstraint *)layoutViewGreater:(UIView *)view1
attribute:(NSLayoutAttribute)attr1
toView:(UIView *)view2
toView:(nullable UIView *)view2
attribute:(NSLayoutAttribute)attr2
constant:(CGFloat)constant;
@ -70,7 +70,7 @@ NS_ASSUME_NONNULL_BEGIN
/// @param constant 距离
+ (NSLayoutConstraint *)layoutViewLesser:(UIView *)view1
attribute:(NSLayoutAttribute)attr1
toView:(UIView *)view2
toView:(nullable UIView *)view2
attribute:(NSLayoutAttribute)attr2
constant:(CGFloat)constant;
@end

View File

@ -9,8 +9,8 @@
#import <TapCommonSDK/TDSAccount.h>
#define TapCommonSDK @"TapCommon"
#define TapCommonSDK_VERSION_NUMBER @"20105001"
#define TapCommonSDK_VERSION @"2.1.5"
#define TapCommonSDK_VERSION_NUMBER @"20104003"
#define TapCommonSDK_VERSION @"2.1.4"
NS_ASSUME_NONNULL_BEGIN
typedef NSString *TDSLanguage NS_STRING_ENUM;

View File

@ -10,6 +10,9 @@
NS_ASSUME_NONNULL_BEGIN
@interface TDSCommonService : NSObject
+ (void)setXUA:(NSString*)json;
+ (void)language:(NSString *)language;
+ (void)getRegionCode:(void (^)(NSString *result))callback;

View File

@ -0,0 +1,38 @@
//
// TDSTrackerEvent.h
// TapCommonSDK
//
// Created by Bottle K on 2021/6/21.
//
#import <Foundation/Foundation.h>
#import <TapCommonSDK/TDSTrackerConfig.h>
#import <TapCommonSDK/UserModel.h>
#import <TapCommonSDK/PageModel.h>
#import <TapCommonSDK/ActionModel.h>
#import <TapCommonSDK/NetworkStateModel.h>
#import <TapCommonSDK/LoginModel.h>
NS_ASSUME_NONNULL_BEGIN
@interface TDSTrackerEvent : NSObject
//事件类型
@property (nonatomic, assign) TDSTrackerType trackerType;
//用户模型
@property (nonatomic, strong, nullable) UserModel *userModel;
//页面模型
@property (nonatomic, strong, nullable) PageModel *pageModel;
//行为模型
@property (nonatomic, strong, nullable) ActionModel *actionModel;
//网络模型
@property (nonatomic, strong, nullable) NetworkStateModel *networkModel;
//登录模型
@property (nonatomic, strong, nullable) LoginModel *loginModel;
@end
NS_ASSUME_NONNULL_END

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 90f5a35b3c6844686b60f9d4c8e3e5b6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -11,6 +11,7 @@
#import <TapCommonSDK/PageModel.h>
#import <TapCommonSDK/ActionModel.h>
#import <TapCommonSDK/NetworkStateModel.h>
#import <TapCommonSDK/TDSTrackerEvent.h>
NS_ASSUME_NONNULL_BEGIN
@ -20,11 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
+ (void)registerTracker:(TDSTrackerConfig *)trackerConfig;
- (void)trackerWithType:(TDSTrackerType)trackerType
userModel:(nullable UserModel *)userModel
pageModel:(nullable PageModel *)pageModel
actionModel:(nullable ActionModel *)actionModel
networkModel:(nullable NetworkStateModel *)networkModel;
- (void)trackWithEvent:(TDSTrackerEvent *)event;
@end

View File

@ -63,7 +63,7 @@
@param socket is the current socket object.
@param data is the binary based data that has been returned.
*/
-(void)websocket:(nonnull TDSWSWebSocket*)socket didReceivePong:(nullable NSDate*)data;
-(void)websocket:(nonnull TDSWSWebSocket*)socket didReceivePong:(nullable NSData*)data;
@end

View File

@ -49,6 +49,7 @@ FOUNDATION_EXPORT const unsigned char TapCommonSDKVersionString[];
#import <TapCommonSDK/NSDictionary+TDSSafe.h>
#import <TapCommonSDK/NSMutableArray+Safe.h>
#import <TapCommonSDK/NSString+Tools.h>
#import <TapCommonSDK/UIButton+TDSThrottle.h>
#import <TapCommonSDK/TDSLog.h>
#import <TapCommonSDK/TDSLoggerService.h>
#import <TapCommonSDK/TDSNetClient.h>
@ -58,6 +59,7 @@ FOUNDATION_EXPORT const unsigned char TapCommonSDKVersionString[];
#import <TapCommonSDK/NSError+Ext.h>
#import <TapCommonSDK/TDSAsyncHttp.h>
#import <TapCommonSDK/TDSCommonHeader.h>
#import <TapCommonSDK/PlatformXUA.h>
#import <TapCommonSDK/TDSHttpRequest.h>
#import <TapCommonSDK/TDSHttpResult.h>
#import <TapCommonSDK/TDSHttpUtil.h>
@ -94,7 +96,16 @@ FOUNDATION_EXPORT const unsigned char TapCommonSDKVersionString[];
#import <TapCommonSDK/TDSThrottle.h>
#import <TapCommonSDK/TDSDebounce.h>
#import <TapCommonSDK/TDSLocalizeManager.h>
#import <TapCommonSDK/TDSWSSecurity.h>
#import <TapCommonSDK/TDSWSWebSocket.h>
#import <TapCommonSDK/TDSTrackerManager.h>
#import <TapCommonSDK/TDSTrackerConfig.h>
#import <TapCommonSDK/TDSTrackerEvent.h>
#import <TapCommonSDK/UserModel.h>
#import <TapCommonSDK/PageModel.h>
#import <TapCommonSDK/ActionModel.h>
#import <TapCommonSDK/NetworkStateModel.h>
#import <TapCommonSDK/TDSTrackerEvent.h>
#import <TapCommonSDK/TapLoginLogManager.h>

View File

@ -0,0 +1,48 @@
//
// TapLoginLogManager.h
// TapLoginSDK
//
// Created by Bottle K on 2021/6/22.
//
#import <Foundation/Foundation.h>
#import <TapCommonSDK/TdsAccountProvider.h>
#import <TapCommonSDK/TDSTrackerEvent.h>
NS_ASSUME_NONNULL_BEGIN
@interface TapLoginLogManager : NSObject
+ (instancetype)sharedInstance;
- (TDSTrackerEvent *)generateNewEvent;
- (TDSTrackerEvent *)event;
+ (void)logStart;
+ (void)logTapOpenWithType:(NSString *)type;
+ (void)logTapBack;
+ (void)logTapToken;
+ (void)logTapProfileWithOpenId:(NSString *_Nullable)openId;
+ (void)logTapSuccess;
+ (void)logTapFailWithError:(NSError *)error;
+ (void)logTapCancel;
+ (void)logTdsStart;
+ (void)logTdsSuccessWithOpenID:(NSString *)openId accountProvider:(id<TDSAccountProvider>)provider isRefresh:(BOOL)isRefresh ;
+ (void)logTdsFailWithError:(NSError *)error;
+ (void)logTdsCancel;
@end
NS_ASSUME_NONNULL_END

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 376038bec53644f73b48fe5273e027e3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

View File

@ -10,7 +10,13 @@
NS_ASSUME_NONNULL_BEGIN
@interface UserModel : NSObject
@property (nonatomic, copy) NSString *VID;
//用户id
@property (nonatomic, copy) NSString *user_id;
//用户名
@property (nonatomic, copy) NSString *user_name;
//taptap 授权的open_id
@property (nonatomic, copy) NSString *taptap_open_id;
@end
NS_ASSUME_NONNULL_END

Binary file not shown.

Binary file not shown.