Commit c1399c82 by zhangyunjie

2.5.7.3

parent 775385d2
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'OffcnLiveSDKiOS' s.name = 'OffcnLiveSDKiOS'
s.version = '2.5.7.2' s.version = '2.5.7.3'
s.summary = 'OffcnLiveSDKiOS.' s.summary = 'OffcnLiveSDKiOS.'
s.description = <<-DESC s.description = <<-DESC
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
//#import "OffcnShareWindow.h" //#import "OffcnShareWindow.h"
static const NSString *OffcnLiveSDKVersion = @"2.5.7.2"; static const NSString *OffcnLiveSDKVersion = @"2.5.7.3";
@interface OffcnPlaybackModel : NSObject @interface OffcnPlaybackModel : NSObject
//口令 //口令
......
...@@ -232,11 +232,11 @@ typedef NS_ENUM(NSInteger, IJKMediaEvent) { ...@@ -232,11 +232,11 @@ typedef NS_ENUM(NSInteger, IJKMediaEvent) {
IJKMediaEvent_WillHttpSeek = 3, // attr: url, offset IJKMediaEvent_WillHttpSeek = 3, // attr: url, offset
IJKMediaEvent_DidHttpSeek = 4, // attr: url, offset, error, http_code IJKMediaEvent_DidHttpSeek = 4, // attr: url, offset, error, http_code
// Control Message // Control Message
IJKMediaCtrl_WillTcpOpen = 0x20001, // IJKMediaUrlOpenData: no args IJKMediaCtrl_WillTcpOpen = 0x20001, // ZGIJKMediaUrlOpenData: no args
IJKMediaCtrl_DidTcpOpen = 0x20002, // IJKMediaUrlOpenData: error, family, ip, port, fd IJKMediaCtrl_DidTcpOpen = 0x20002, // ZGIJKMediaUrlOpenData: error, family, ip, port, fd
IJKMediaCtrl_WillHttpOpen = 0x20003, // IJKMediaUrlOpenData: url, segmentIndex, retryCounter IJKMediaCtrl_WillHttpOpen = 0x20003, // ZGIJKMediaUrlOpenData: url, segmentIndex, retryCounter
IJKMediaCtrl_WillLiveOpen = 0x20005, // IJKMediaUrlOpenData: url, retryCounter IJKMediaCtrl_WillLiveOpen = 0x20005, // ZGIJKMediaUrlOpenData: url, retryCounter
IJKMediaCtrl_WillConcatSegmentOpen = 0x20007, // IJKMediaUrlOpenData: url, segmentIndex, retryCounter IJKMediaCtrl_WillConcatSegmentOpen = 0x20007, // ZGIJKMediaUrlOpenData: url, segmentIndex, retryCounter
}; };
#define IJKMediaEventAttrKey_url @"url" #define IJKMediaEventAttrKey_url @"url"
...@@ -247,7 +247,7 @@ typedef NS_ENUM(NSInteger, IJKMediaEvent) { ...@@ -247,7 +247,7 @@ typedef NS_ENUM(NSInteger, IJKMediaEvent) {
#define IJKMediaEventAttrKey_offset @"offset" #define IJKMediaEventAttrKey_offset @"offset"
// event of IJKMediaUrlOpenEvent_xxx // event of IJKMediaUrlOpenEvent_xxx
@interface IJKMediaUrlOpenData: NSObject @interface ZGIJKMediaUrlOpenData: NSObject
- (id)initWithUrl:(NSString *)url - (id)initWithUrl:(NSString *)url
event:(IJKMediaEvent)event event:(IJKMediaEvent)event
...@@ -269,7 +269,7 @@ typedef NS_ENUM(NSInteger, IJKMediaEvent) { ...@@ -269,7 +269,7 @@ typedef NS_ENUM(NSInteger, IJKMediaEvent) {
@protocol IJKMediaUrlOpenDelegate <NSObject> @protocol IJKMediaUrlOpenDelegate <NSObject>
- (void)willOpenUrl:(IJKMediaUrlOpenData*) urlOpenData; - (void)willOpenUrl:(ZGIJKMediaUrlOpenData*) urlOpenData;
@end @end
......
This folder contains some sample formatters that may be helpful.
Feel free to change them, extend them, or use them as the basis for your own custom formatter(s).
More information about creating your own custom formatters can be found on the wiki:
https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomFormatters
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