Commit 16f796a9 by zhangyunjie

1.2.2.1音视频测试

parent 536a0d87
...@@ -367,6 +367,7 @@ ...@@ -367,6 +367,7 @@
"${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/ZYJExpressionKeyboard.bundle", "${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/ZYJExpressionKeyboard.bundle",
"${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/ZYJTZImagePickerController.bundle", "${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/ZYJTZImagePickerController.bundle",
"${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/ZYYJMJRefresh.bundle", "${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/ZYYJMJRefresh.bundle",
"${PODS_ROOT}/OffcnLiveSDKiOS/OffcnLiveSDKiOS/Resources/OffcnLiveSDK.bundle",
); );
name = "[CP] Copy Pods Resources"; name = "[CP] Copy Pods Resources";
outputPaths = ( outputPaths = (
...@@ -374,6 +375,7 @@ ...@@ -374,6 +375,7 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZYJExpressionKeyboard.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZYJExpressionKeyboard.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZYJTZImagePickerController.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZYJTZImagePickerController.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZYYJMJRefresh.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZYYJMJRefresh.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/OffcnLiveSDK.bundle",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
...@@ -390,6 +392,10 @@ ...@@ -390,6 +392,10 @@
"${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework", "${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework",
"${BUILT_PRODUCTS_DIR}/LMJDropdownMenu/LMJDropdownMenu.framework", "${BUILT_PRODUCTS_DIR}/LMJDropdownMenu/LMJDropdownMenu.framework",
"${PODS_ROOT}/../../OffcnIMSDKiOS/Frameworks/oimcore.framework", "${PODS_ROOT}/../../OffcnIMSDKiOS/Frameworks/oimcore.framework",
"${PODS_ROOT}/OffcnLiveSDKiOS/OffcnLiveSDKiOS/Frameworks/ZGIJKMediaFramework.framework",
"${PODS_ROOT}/OffcnLiveSDKiOS/OffcnLiveSDKiOS/Frameworks/OffcnWhiteBoard.framework",
"${PODS_ROOT}/OffcnLiveSDKiOS/OffcnLiveSDKiOS/Frameworks/WebRTC.framework",
"${PODS_ROOT}/OffcnLiveSDKiOS/OffcnLiveSDKiOS/Frameworks/ZYJSDWebImage.framework",
"${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
"${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework", "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
...@@ -402,6 +408,10 @@ ...@@ -402,6 +408,10 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LMJDropdownMenu.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LMJDropdownMenu.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/oimcore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/oimcore.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZGIJKMediaFramework.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OffcnWhiteBoard.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebRTC.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZYJSDWebImage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'OffcnIMSDKiOS' s.name = 'OffcnIMSDKiOS'
s.version = '1.2.1.2' s.version = '1.2.2.1'
s.summary = 'OffcnIMSDKiOS.' s.summary = 'OffcnIMSDKiOS.'
s.description = <<-DESC s.description = <<-DESC
...@@ -51,6 +51,6 @@ TODO: Add long description of the pod here. ...@@ -51,6 +51,6 @@ TODO: Add long description of the pod here.
s.dependency 'YYWebImage', '~> 1.0.5' s.dependency 'YYWebImage', '~> 1.0.5'
s.dependency 'YYText', '~> 1.0.7' s.dependency 'YYText', '~> 1.0.7'
#s.dependency 'OffcnLiveSDKiOS', '2.7.0.7' s.dependency 'OffcnLiveSDKiOS', '2.7.2.2'
end end
...@@ -31,15 +31,16 @@ typedef void(^linkCallBack)(NSURL *URL); ...@@ -31,15 +31,16 @@ typedef void(^linkCallBack)(NSURL *URL);
//是否内部跳转 //是否内部跳转
@property (nonatomic, assign) BOOL isInsideJump; @property (nonatomic, assign) BOOL isInsideJump;
//联系人model //联系人model
@property (nonatomic, strong) OffcnIMUserList_listModel *contactInfoModel; @property (nonatomic, strong) OffcnIMUserList_listModel *contactInfoModel;
//滑动到底部 //滑动到底部
- (void)scrollTableToFoot:(BOOL)animated; - (void)scrollTableToFoot:(BOOL)animated;
//聊天内容点击链接是否跳转浏览器(yes:跳转浏览器;no:不跳转,返回的链接根据产品需求处理) //聊天内容点击链接是否跳转浏览器(yes:跳转浏览器;no:不跳转,返回的链接根据产品需求处理)
-(BOOL)isJumpToBrowserWithLinkUrlStr:(NSString *)linkUrlStr; -(BOOL)isJumpToBrowserWithLinkUrlStr:(NSString *)linkUrlStr;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
...@@ -34,6 +34,7 @@ typedef void(^OffcnIMTotal_unread_number)(NSInteger num); ...@@ -34,6 +34,7 @@ typedef void(^OffcnIMTotal_unread_number)(NSInteger num);
//聊天内容点击链接是否跳转浏览器(yes:跳转浏览器;no:不跳转,返回的链接根据产品需求处理) //聊天内容点击链接是否跳转浏览器(yes:跳转浏览器;no:不跳转,返回的链接根据产品需求处理)
-(BOOL)isJumpToBrowserWithLinkUrlStr:(NSString *)linkUrlStr; -(BOOL)isJumpToBrowserWithLinkUrlStr:(NSString *)linkUrlStr;
//清空数据 //清空数据
-(void)clearData; -(void)clearData;
......
...@@ -21,6 +21,9 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -21,6 +21,9 @@ NS_ASSUME_NONNULL_BEGIN
@class OffcnIMMsgModel,OffcnIMPrivateChatListModel; @class OffcnIMMsgModel,OffcnIMPrivateChatListModel;
@interface OffcnIMBodyModel : NSObject @interface OffcnIMBodyModel : NSObject
@property (nonatomic,assign)BOOL isPassTime; //超时5分钟
@property (nonatomic,assign)BOOL isPlayAudio; //播放语音中
@property (nonatomic,assign)BOOL is_top;//是否置顶 @property (nonatomic,assign)BOOL is_top;//是否置顶
@property (nonatomic,copy)NSString *session_id; //会话ID @property (nonatomic,copy)NSString *session_id; //会话ID
@property (nonatomic,copy)NSString *msg_id;//消息Id @property (nonatomic,copy)NSString *msg_id;//消息Id
...@@ -164,17 +167,18 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -164,17 +167,18 @@ NS_ASSUME_NONNULL_BEGIN
@class OffcnIMUserList_list_classesModel; @class OffcnIMUserList_list_classesModel;
@interface OffcnIMUserList_listModel : NSObject @interface OffcnIMUserList_listModel : NSObject
//内部使用
@property (nonatomic, assign) NSInteger cell_type;//1:群发消息,2:单发消息 @property (nonatomic, assign) NSInteger cell_type;//1:群发消息,2:单发消息
@property (nonatomic, copy) NSString *key;//群ID @property (nonatomic, copy) NSString *key;//群ID
@property (nonatomic, strong) OffcnIMUserList_list_classesModel *classes;//群成员 @property (nonatomic, strong) OffcnIMUserList_list_classesModel *classes;//群成员
//详情页展示需要传入
@property (nonatomic, copy) NSString *room_name;//房间标题 @property (nonatomic, copy) NSString *room_name;//房间标题
@property (nonatomic, copy) NSString *room_time;//直播时间例如:@"12:00-15:00" @property (nonatomic, copy) NSString *room_time;//直播时间例如:@"12:00-15:00"
@property (nonatomic, copy) NSString *room_class;//所属班级 @property (nonatomic, copy) NSString *room_class;//所属班级
@property (nonatomic, copy) NSString *room_num;//房间号 @property (nonatomic, copy) NSString *room_num;//房间号
@property (nonatomic, copy) NSString *avatar;//头像地址 @property (nonatomic, copy) NSString *avatar;//头像地址
@property (nonatomic, copy) NSString *sortChar;//无地址时头像展示一个字(暂无此功能) @property (nonatomic, copy) NSString *sortChar;//无地址时头像展示一个字(暂无此功能)
@property (nonatomic, copy) NSString *avatar_color;//无地址时头像背景色(暂无此功能) @property (nonatomic, copy) NSString *avatar_color;//无地址时头像背景色(暂无此功能)
...@@ -182,9 +186,12 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -182,9 +186,12 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) NSString *remark;//备注名 @property (nonatomic, copy) NSString *remark;//备注名
@property (nonatomic, copy) NSString *phone;//用户手机号 @property (nonatomic, copy) NSString *phone;//用户手机号
@property (nonatomic, copy) NSString *name_original;//原始名字 @property (nonatomic, copy) NSString *name_original;//原始名字
@property (nonatomic, copy) NSString *identity;//身份
@property (nonatomic, copy) NSString *ability;//能力,例如:老师答疑题型范围等
@property (nonatomic, copy) NSString *user_id;//用户ID @property (nonatomic, copy) NSString *user_id;//用户ID
@property (nonatomic, copy) NSString *expand;//拓展字段 @property (nonatomic, copy) NSString *expand;//拓展字段
@property (nonatomic, assign) NSInteger expandH;//拓展字段 @property (nonatomic, assign) NSInteger expandH;//拓展字段
@end @end
...@@ -241,4 +248,28 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -241,4 +248,28 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
//客服
@interface OffcnIMCSAutoreplyModel : NSObject
@property (nonatomic,copy)NSString *auto_reply_default;
@property (nonatomic,strong)NSMutableArray *list;
@property (nonatomic,assign)NSInteger online_status;
@property (nonatomic,assign)BOOL isSure;
@end
@interface OffcnIMCSAutoreply_listModel : NSObject
@property (nonatomic,copy)NSString *accid;
@property (nonatomic,copy)NSString *content;
@property (nonatomic,copy)NSString *ID;
@property (nonatomic,assign)NSInteger is_default;
@property (nonatomic,assign)NSInteger type;//1-无;2-添加自动回复
@property (nonatomic,copy)NSString *auto_reply_id;
@end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
...@@ -39,6 +39,7 @@ typedef void(^linkCallBack)(NSURL *URL); ...@@ -39,6 +39,7 @@ typedef void(^linkCallBack)(NSURL *URL);
//聊天内容点击链接是否跳转浏览器(yes:跳转浏览器;no:不跳转,返回的链接根据产品需求处理) //聊天内容点击链接是否跳转浏览器(yes:跳转浏览器;no:不跳转,返回的链接根据产品需求处理)
-(BOOL)isJumpToBrowserWithLinkUrlStr:(NSString *)linkUrlStr; -(BOOL)isJumpToBrowserWithLinkUrlStr:(NSString *)linkUrlStr;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
...@@ -24,6 +24,7 @@ typedef void(^OffcnIMPrivateChatTotal_unread_number)(NSInteger num); ...@@ -24,6 +24,7 @@ typedef void(^OffcnIMPrivateChatTotal_unread_number)(NSInteger num);
//聊天内容点击链接是否跳转浏览器(yes:跳转浏览器;no:不跳转,返回的链接根据产品需求处理) //聊天内容点击链接是否跳转浏览器(yes:跳转浏览器;no:不跳转,返回的链接根据产品需求处理)
-(BOOL)isJumpToBrowserWithLinkUrlStr:(NSString *)linkUrlStr; -(BOOL)isJumpToBrowserWithLinkUrlStr:(NSString *)linkUrlStr;
//清空数据 //清空数据
-(void)clearData; -(void)clearData;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "OffcnIMModel.h" #import "OffcnIMModel.h"
static const NSString *OffcnIMSDKiOSVersion = @"1.2.1.2"; static const NSString *OffcnIMSDKiOSVersion = @"1.2.2.1";
//聊天详情头像点击事件通知 //聊天详情头像点击事件通知
#define kOffcnIMChatInfoHeadIconClickNotification @"kOffcnIMChatInfoHeadIconClickNotification" #define kOffcnIMChatInfoHeadIconClickNotification @"kOffcnIMChatInfoHeadIconClickNotification"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment