Commit 44ed4ee3 by zhangyunjie

“2.8.0.0”

parent 4c5813aa
......@@ -530,12 +530,12 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Prefix.pch";
INFOPLIST_FILE = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MODULE_NAME = ExampleApp;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.eoffcn.classonline;
PRODUCT_BUNDLE_IDENTIFIER = com.eoffcn.OffcnTeacheriOS;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ClassonlineDev;
PROVISIONING_PROFILE_SPECIFIER = OffcnTeacheriOSDev;
SWIFT_VERSION = 4.0;
WRAPPER_EXTENSION = app;
};
......@@ -553,11 +553,11 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Prefix.pch";
INFOPLIST_FILE = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = com.eoffcn.classonline;
PRODUCT_BUNDLE_IDENTIFIER = com.eoffcn.OffcnTeacheriOS;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ClassonlineDev;
PROVISIONING_PROFILE_SPECIFIER = OffcnTeacheriOSDev;
SWIFT_VERSION = 4.0;
WRAPPER_EXTENSION = app;
};
......
......@@ -34,6 +34,36 @@
NSLog(@"OffcnSDKEventWechatApplet:%lu;urlString:%@;goodIDStr:%@",(unsigned long)event,wechatAppletModel.urlString,wechatAppletModel.goodIDStr);
}
}];
[OffcnLiveSDK defaultService].isShowSendGifts = YES;//是否展示送礼物入口
//获取送礼物信息事件
[OffcnLiveSDK defaultService].getGiftInfoCallBack = ^{
[OffcnLiveSDK defaultService].product = @"0";//应用id 0中公教育 1 在线课堂 默认0
[OffcnLiveSDK defaultService].u_head = @"";//登录用户头像链接地址
[OffcnLiveSDK defaultService].surplus = @"100";//账户余额
[OffcnLiveSDK defaultService].rechargeAgreement = @"https://www.eoffcn.com/help/agreements/offcncoin_user_agreement.html";//充值协议
NSMutableArray *modelArr = [NSMutableArray array];
OffcnSDKEventBeansMoneyModel *chooseMoneyModel = [[OffcnSDKEventBeansMoneyModel alloc] init];
chooseMoneyModel.num = @"7";
chooseMoneyModel.price = @"1";
[modelArr addObject:chooseMoneyModel];
OffcnSDKEventBeansMoneyModel *chooseMoneyModel1 = [[OffcnSDKEventBeansMoneyModel alloc] init];
chooseMoneyModel1.num = @"42";
chooseMoneyModel1.price = @"6";
[modelArr addObject:chooseMoneyModel1];
[OffcnLiveSDK defaultService].beansMoneyModelArr = modelArr;//充值豆规格
};
//立即充值事件
[OffcnLiveSDK defaultService].rechargeCallBack = ^(OffcnSDKEventBeansMoneyModel *beanModel) {
};
return YES;
......
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'OffcnLiveSDKiOS'
s.version = '2.7.9.3'
s.version = '2.8.0.0'
s.summary = 'OffcnLiveSDKiOS.'
s.description = <<-DESC
......
......@@ -238,7 +238,7 @@ typedef void(^downloadM3u8CallBack)(BOOL isSuccess, NSError *error);
//下载m3u8文件
- (void)downloadM3u8WithModel:(OffcnDownloadManagerModel *)model;
- (void)downloadM3u8WithModel:(OffcnDownloadManagerModel *)model m3u8Path:(NSString *)m3u8Path;
/**
......
......@@ -10,7 +10,7 @@
#import "OffcnShareWindow.h"
static const NSString *OffcnLiveSDKVersion = @"2.7.9.3";
static const NSString *OffcnLiveSDKVersion = @"2.8.0.0";
//事件通知
......@@ -27,6 +27,7 @@ static const NSString *OffcnLiveSDKVersion = @"2.7.9.3";
@property (nonatomic, assign) NSInteger totalSeconds;
@end
@interface OffcnSDKEventLookCourseModel : NSObject
@property (nonatomic,copy) NSString *spuId;//商品spuId
......@@ -41,6 +42,12 @@ static const NSString *OffcnLiveSDKVersion = @"2.7.9.3";
@end
@interface OffcnSDKEventBeansMoneyModel : NSObject
@property (nonatomic, copy) NSString *skuId;//ID
@property (nonatomic, copy) NSString *num;//豆数量
@property (nonatomic, copy) NSString *price;//价格
@end
......@@ -77,6 +84,15 @@ typedef NS_ENUM(NSUInteger, OffcnSDKEvent) {
OffcnSDKEventWechatApplet = 2, //跳转微信小程序事件
};
//获取送礼物需要的(应用id:product,用户头像:u_head,余额:surplus,充值协议:rechargeAgreement,充值豆规格:beansMoneyModelArr)事件
typedef void(^OffcnSDKGetGiftInfoCallBack)(void);
//立即充值事件
typedef void(^OffcnSDKRechargeCallBack)(OffcnSDKEventBeansMoneyModel *beanModel);
//直播间退出房间后回调
typedef void(^liveQuitCallBack)(NSString *password);
......@@ -144,6 +160,20 @@ typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event,OffcnSDKEventLookCourse
//是否选用测试环境
@property (nonatomic, assign) BOOL isTest;
//送礼物功能
@property (nonatomic, assign) BOOL isShowSendGifts;//是否展示送礼物入口
@property (nonatomic, strong) NSString *product;//应用id 0中公教育 1 在线课堂 默认0
@property (nonatomic, strong) NSString *u_head;//登录用户头像链接地址
@property (nonatomic, strong) NSString *surplus;//账户余额
@property (nonatomic, strong) NSString *rechargeAgreement;//充值协议
@property (nonatomic, strong) NSMutableArray<OffcnSDKEventBeansMoneyModel *> *beansMoneyModelArr;//充值豆规格
@property (nonatomic, copy) OffcnSDKGetGiftInfoCallBack getGiftInfoCallBack;//获取送礼物信息事件
@property (nonatomic, copy) OffcnSDKRechargeCallBack rechargeCallBack;//立即充值事件
//选用图片类型
@property (nonatomic, assign) OffcnImageType imageType;
//选用按钮类型
......
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