Skip to content

Commit

Permalink
android 3.1.3 iOS 4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Max authored and Max committed Mar 2, 2018
1 parent 899dd9c commit a137a24
Show file tree
Hide file tree
Showing 70 changed files with 206 additions and 23 deletions.
@@ -0,0 +1,51 @@
//
// MOBFTagService.h
// MOBFoundation
//
// Created by liyc on 2017/10/27.
// Copyright © 2017年 MOB. All rights reserved.
//

#import <Foundation/Foundation.h>

/**
* 错误消息类型
*/
typedef NS_ENUM(NSUInteger, MOBFErrorTagMsgType){
/*
* 标签为空
*/
MOBFErrorTagMsgTypeGetTagEmpty = 109996,
/*
* 获取标签失败
*/
MOBFErrorTagMsgTypeGetTagFailed = 109997,
/**
* 上传标签超出字符限制
*/
MOBFErrorTagMsgTypeCharacterLimitError = 109998,
/**
* 上传无效标签参数
*/
MOBFErrorTagMsgTypeInvalidParamError = 109999,
};

@interface MOBFTagService : NSObject

/**
上传标记我的用户
@param tags 用户信息
@param result 回调信息
*/
+(void)tagUserUpload:(NSDictionary *)tags
result:(void (^)(NSError *error))result;

/**
获取标签
@param handler 回调
*/
+(void)userTags:(void (^) (NSDictionary *userTags, NSError *error))handler;

@end
Binary file modified iOSDemo/SDK/Required/MOBFoundation.framework/Info.plist
Binary file not shown.
Binary file modified iOSDemo/SDK/Required/MOBFoundation.framework/MOBFoundation
Binary file not shown.
Expand Up @@ -236,7 +236,7 @@
//3.6.3 为微信小程序分享增加
/**
设置微信小程序分享
@param title 标题
@param description 详细说明
@param webpageUrl 网址(6.5.6以下版本微信会自动转化为分享链接 必填)
Expand Down
Binary file modified iOSDemo/SDK/ShareSDK/ShareSDK.framework/Info.plist
Binary file not shown.
Binary file modified iOSDemo/SDK/ShareSDK/ShareSDK.framework/ShareSDK
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Expand Up @@ -62,12 +62,20 @@
/**
检测是否已安装QQ
\return 如果QQ已安装则返回YES,否则返回NO
\note SDK目前已经支持QQ、TIM授权登录及分享功能, 会按照QQ>TIM的顺序进行调用。
只要用户安装了QQ、TIM中任意一个应用,都可为第三方应用进行授权登录、分享功能。
第三方应用在接入SDK时不需要判断是否安装QQ、TIM。若有判断安装QQ、TIM的逻辑建议移除。
*/
+ (BOOL)isQQInstalled;

/**
检测是否已安装TIM
\return 如果TIM已安装则返回YES,否则返回NO
\note SDK目前已经支持QQ、TIM授权登录及分享功能, 会按照QQ>TIM的顺序进行调用。
只要用户安装了QQ、TIM中任意一个应用,都可为第三方应用进行授权登录、分享功能。
第三方应用在接入SDK时不需要判断是否安装QQ、TIM。若有判断安装QQ、TIM的逻辑建议移除。
*/
+ (BOOL)isTIMInstalled;

Expand All @@ -83,6 +91,18 @@
*/
+ (BOOL)isTIMSupportApi;

/**
检测是否支持分享
\return 如果当前已安装QQ且QQ版本支持API调用 或者 当前已安装TIM且TIM版本支持API调用则返回YES,否则返回NO
*/
+ (BOOL)isSupportShareToQQ;

/**
检测是否支持分享到QQ结合版QZone
\return 如果当前已安装QQ且QQ版本支持API调用则返回YES,否则返回NO
*/
+ (BOOL)isSupportPushToQZone;

/**
启动QQ
\return 成功返回YES,否则返回NO
Expand Down
Expand Up @@ -15,26 +15,26 @@
typedef enum
{
EQQAPISENDSUCESS = 0,
EQQAPIQQNOTINSTALLED = 1,
EQQAPIQQNOTSUPPORTAPI = 2,
EQQAPIQQNOTINSTALLED = 1, //QQ未安装
EQQAPIQQNOTSUPPORTAPI = 2, // QQ api不支持
EQQAPIMESSAGETYPEINVALID = 3,
EQQAPIMESSAGECONTENTNULL = 4,
EQQAPIMESSAGECONTENTINVALID = 5,
EQQAPIAPPNOTREGISTED = 6,
EQQAPIAPPSHAREASYNC = 7,
EQQAPIQQNOTSUPPORTAPI_WITH_ERRORSHOW = 8,
EQQAPISENDFAILD = -1,
EQQAPIQQNOTSUPPORTAPI_WITH_ERRORSHOW = 8, //QQ api不支持 && SDK显示error提示(已废弃)
EQQAPIMESSAGEARKCONTENTNULL = 9, //ark内容为空
EQQAPISENDFAILD = -1, //发送失败
EQQAPISHAREDESTUNKNOWN = -2, //未指定分享到QQ或TIM
EQQAPITIMSENDFAILD = -3, //发送失败

EQQAPITIMNOTINSTALLED = 11, //TIM未安装
EQQAPITIMNOTSUPPORTAPI = 12, // TIM api不支持
//qzone分享不支持text类型分享
EQQAPIQZONENOTSUPPORTTEXT = 10000,
//qzone分享不支持image类型分享
EQQAPIQZONENOTSUPPORTIMAGE = 10001,
//当前QQ版本太低,需要更新至新版本才可以支持
EQQAPIVERSIONNEEDUPDATE = 10002,
ETIMAPIVERSIONNEEDUPDATE = 10004,

EQQAPIQZONENOTSUPPORTTEXT = 10000, //qzone分享不支持text类型分享
EQQAPIQZONENOTSUPPORTIMAGE = 10001, //qzone分享不支持image类型分享
EQQAPIVERSIONNEEDUPDATE = 10002, //当前QQ版本太低,需要更新至新版本才可以支持
ETIMAPIVERSIONNEEDUPDATE = 10004, //当前TIM版本太低,需要更新至新版本才可以支持
} QQApiSendResultCode;

#pragma mark - QQApiObject(分享对象类型)
Expand All @@ -47,13 +47,13 @@ enum
kQQAPICtrlFlagQQShare = 0x04,
kQQAPICtrlFlagQQShareFavorites = 0x08, //收藏
kQQAPICtrlFlagQQShareDataline = 0x10, //数据线
kQQAPICtrlFlagQQShareEnableArk = 0x20, //支持ARK
};

// 分享到QQ或TIM
typedef enum ShareDestType {
ShareDestTypeQQ = 0,
ShareDestTypeTIM,
ShareDestTypeQIM,
}ShareDestType;

// QQApiObject
Expand All @@ -65,13 +65,24 @@ __attribute__((visibility("default"))) @interface QQApiObject : NSObject

@property (nonatomic, assign) uint64_t cflag;
/*
* 分享到QQ/TIM/QIM
* SDK根据是否安装对应客户端进行判断,判断顺序:QQ > TIM > QIM
* 默认分享到QQ,如果QQ未安装检测TIM是否安装,如果TIM未安装检测是否安装QIM
* 分享到QQ/TIM
* SDK根据是否安装对应客户端进行判断,判断顺序:QQ > TIM
* 默认分享到QQ,如果QQ未安装检测TIM是否安装
*/
@property (nonatomic, assign) ShareDestType shareDestType;
@end

// ArkObject
/** \brief 支持Ark的根类。
*/
__attribute__((visibility("default"))) @interface ArkObject : NSObject
@property(nonatomic,retain) NSString* arkData; ///< 显示Ark所需的数据,json串,长度暂不限制
@property(nonatomic,assign) QQApiObject* qqApiObject; ///<原有老版本的QQApiObject

- (id)initWithData:(NSString *)arkData qqApiObject:(QQApiObject*)qqApiObject;
+ (id)objectWithData:(NSString *)arkData qqApiObject:(QQApiObject*)qqApiObject;
@end

// QQApiResultObject
/** \brief 用于请求回应的数据类型。
<h3>可能错误码及描述如下:</h3>
Expand Down Expand Up @@ -402,6 +413,47 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
@property(nonatomic,retain) NSURL* target;///<广告目标链接
@end

#pragma mark - QQApiObject(关系链对象)

// QQApiAddFriendObject
/** \brief 添加好友
*/
@interface QQApiAddFriendObject : QQApiObject
@property (nonatomic,retain)NSString* openID;
@property (nonatomic,retain)NSString* subID;
@property (nonatomic,retain)NSString* remark;

-(id)initWithOpenID:(NSString*)openID; ///<初始化方法
+(id)objecWithOpenID:(NSString*)openID; ///<工厂方法,获取一个QQApiAddFriendObject对象.

@end

// QQApiGameConsortiumBindingGroupObject
/** \brief 游戏公会绑定群
*/
@interface QQApiGameConsortiumBindingGroupObject : QQApiObject
@property (nonatomic,retain)NSString* signature;
@property (nonatomic,retain)NSString* unionid;
@property (nonatomic,retain)NSString* zoneID;
@property (nonatomic,retain)NSString* appDisplayName;

-(id)initWithGameConsortium:(NSString*)signature unionid:(NSString*)unionid zoneID:(NSString*)zoneID appDisplayName:(NSString*)appDisplayName; ///<初始化方法
+(id)objectWithGameConsortium:(NSString*)signature unionid:(NSString*)unionid zoneID:(NSString*)zoneID appDisplayName:(NSString*)appDisplayName; ///<工厂方法,获取一个QQApiAddFriendObject对象.

@end

// QQApiGameConsortiumBindingGroupObject
/** \brief 加入群
*/
@interface QQApiJoinGroupObject : QQApiObject
@property (nonatomic,retain)NSString* groupUin;
@property (nonatomic,retain)NSString* groupKey;

- (id)initWithGroupInfo:(NSString*)groupUin key:(NSString*)groupKey; ///<初始化方法
+ (id)objectWithGroupInfo:(NSString*)groupUin key:(NSString*)groupKey; ///<同时提供群号和群KEY 工厂方法,获取一个QQApiAddFriendObject对象.
+ (id)objectWithGroupKey:(NSString*)groupKey; ///<只需要群的KEY 工厂方法,获取一个QQApiAddFriendObject对象.

@end

#pragma mark - QQApi请求消息类型

Expand All @@ -412,7 +464,8 @@ enum QQApiInterfaceReqType
{
EGETMESSAGEFROMQQREQTYPE = 0, ///< 手Q -> 第三方应用,请求第三方应用向手Q发送消息
ESENDMESSAGETOQQREQTYPE = 1, ///< 第三方应用 -> 手Q,第三方应用向手Q分享消息
ESHOWMESSAGEFROMQQREQTYPE = 2 ///< 手Q -> 第三方应用,请求第三方应用展现消息中的数据
ESHOWMESSAGEFROMQQREQTYPE = 2, ///< 手Q -> 第三方应用,请求第三方应用展现消息中的数据
ESENDMESSAGEARKTOQQREQTYPE = 3 ///< 第三方应用 -> 手Q,第三方应用向手Q分享Ark消息
};

/**
Expand Down Expand Up @@ -466,9 +519,6 @@ enum QQApiInterfaceRespType

@end

/**
SendMessageToQQReq请求帮助类
*/
@interface SendMessageToQQReq : QQBaseReq

/**
Expand All @@ -478,9 +528,19 @@ enum QQApiInterfaceRespType
*/
+ (SendMessageToQQReq *)reqWithContent:(QQApiObject *)message;

/**
创建一个支持Ark的SendMessageToQQReq请求实例
\param message 具体分享消息实例
\return 新创建的SendMessageToQQReq请求实例
*/
+ (SendMessageToQQReq *)reqWithArkContent:(ArkObject *)message;

/** 具体分享消息 */
@property (nonatomic, retain) QQApiObject *message;

/** 支持Ark的具体分享消息 */
@property (nonatomic, retain) ArkObject *arkMessage;

@end

/**
Expand Down
Expand Up @@ -88,6 +88,36 @@ typedef enum
/** 第三方在授权登录/分享 时选择 QQ,还是TIM 。在授权前一定要指定其中一个类型*/
@property(nonatomic, assign) TencentAuthShareType authShareType;

/**
* 获取上次登录得到的token
*
**/
- (NSString *)getCachedToken;

/**
* 获取上次登录得到的openid
*
**/
- (NSString *)getCachedOpenID;

/**
* 获取上次登录的token过期日期
*
**/
- (NSDate *)getCachedExpirationDate;

/**
* 上次登录的token是否过期
*
**/
- (BOOL)isCachedTokenValid;

/**
* 删除上次登录登录的token信息
*
**/
- (BOOL)deleteCachedToken;

/**
* 用来获得当前sdk的版本号
* \return 返回sdk版本号
Expand Down Expand Up @@ -145,12 +175,20 @@ typedef enum
/**
* 判断用户手机上是否安装手机QQ
* \return YES:安装 NO:没安装
*
* \note SDK目前已经支持QQ、TIM授权登录及分享功能, 会按照QQ>TIM的顺序进行调用。
* 只要用户安装了QQ、TIM中任意一个应用,都可为第三方应用进行授权登录、分享功能。
* 第三方应用在接入SDK时不需要判断是否安装QQ、TIM。若有判断安装QQ、TIM的逻辑建议移除。
*/
+ (BOOL)iphoneQQInstalled;

/**
* 判断用户手机上是否安装手机TIM
* \return YES:安装 NO:没安装
*
* \note SDK目前已经支持QQ、TIM授权登录及分享功能, 会按照QQ>TIM的顺序进行调用。
* 只要用户安装了QQ、TIM中任意一个应用,都可为第三方应用进行授权登录、分享功能。
* 第三方应用在接入SDK时不需要判断是否安装QQ、TIM。若有判断安装QQ、TIM的逻辑建议移除。
*/
+ (BOOL)iphoneTIMInstalled;

Expand Down
Empty file.
Binary file not shown.

0 comments on commit a137a24

Please sign in to comment.