iOS Team / CNLivePlayerStreamerSDKDemo · Commits

Commit 2db7eab9f8ed3829ad7974ae22311518e8184657

Authored by 雷浩杰
1 parent c03450ce

2.0.4 

1、推流结束状态传入后台
2、点播播放302跳转
Inline Side-by-side
Showing 9 changed files with 15 additions and 17 deletions
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
View file @2db7eab
No preview for this file type
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveMoviePlayerController.h
  View file @2db7eab
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 * 调用此方法会获取视频的不同视角或码率，并重新加载视频（获取视频的不同视角或码率需要一定的时间，在这段时间内，播放器不会停止播放，建议将播放器设为暂停状态(pause)，并展示加载视频时的UI） 55 * 调用此方法会获取视频的不同视角或码率，并重新加载视频（获取视频的不同视角或码率需要一定的时间，在这段时间内，播放器不会停止播放，建议将播放器设为暂停状态(pause)，并展示加载视频时的UI）
56 * 56 *
57 * channelId 直播视频Id（同一视角可不传） 57 * channelId 直播视频Id（同一视角可不传）
58 - * rate 清晰度(1 流畅、2 标清(默认)、3 高清、4 超清) 58 + * rate 清晰度(1:流畅、2:标清(默认)、3:高清、4:超清)
59 * 59 *
60 */ 60 */
61 - (void)changeViewWithChannelId:(NSString *)channelId rate:(NSString *)rate; 61 - (void)changeViewWithChannelId:(NSString *)channelId rate:(NSString *)rate;
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Info.plist
View file @2db7eab
No preview for this file type
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
  View file @2db7eab
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
  10 + 32ADA40C1DF91D5800B4585A /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32ADA40A1DF91D5400B4585A /* CNLivePlayerSDK.framework */; };
  11 + 32ADA40D1DF91D5800B4585A /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 32ADA40A1DF91D5400B4585A /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
10 32B4C85A1D9B66A400925AF0 /* CNLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */; }; 12 32B4C85A1D9B66A400925AF0 /* CNLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */; };
11 32B4C85D1D9B66E500925AF0 /* StreamerDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C85C1D9B66E500925AF0 /* StreamerDetailViewController.m */; }; 13 32B4C85D1D9B66E500925AF0 /* StreamerDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C85C1D9B66E500925AF0 /* StreamerDetailViewController.m */; };
12 32E6CA2B1D5B0AF400B58EBC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA2A1D5B0AF400B58EBC /* main.m */; }; 14 32E6CA2B1D5B0AF400B58EBC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA2A1D5B0AF400B58EBC /* main.m */; };
@@ -19,19 +21,16 @@ @@ -19,19 +21,16 @@
19 32E6CA921D5B2AF700B58EBC /* NormalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA881D5B2AF700B58EBC /* NormalViewController.m */; }; 21 32E6CA921D5B2AF700B58EBC /* NormalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA881D5B2AF700B58EBC /* NormalViewController.m */; };
20 32E6CA931D5B2AF700B58EBC /* PlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */; }; 22 32E6CA931D5B2AF700B58EBC /* PlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */; };
21 32E6CA951D5B2AF700B58EBC /* StreamerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */; }; 23 32E6CA951D5B2AF700B58EBC /* StreamerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */; };
22 - 8185C9EC1DF028E000AA83C7 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */; };  
23 - 8185C9ED1DF028E400AA83C7 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */; };  
24 - 8185C9EE1DF028E400AA83C7 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };  
25 /* End PBXBuildFile section */ 24 /* End PBXBuildFile section */
26 25
27 /* Begin PBXCopyFilesBuildPhase section */ 26 /* Begin PBXCopyFilesBuildPhase section */
28 - 32F437E21DC9E04900A074BE /* Embed Frameworks */ = { 27 + 32ADA40E1DF91D5800B4585A /* Embed Frameworks */ = {
29 isa = PBXCopyFilesBuildPhase; 28 isa = PBXCopyFilesBuildPhase;
30 buildActionMask = 2147483647; 29 buildActionMask = 2147483647;
31 dstPath = ""; 30 dstPath = "";
32 dstSubfolderSpec = 10; 31 dstSubfolderSpec = 10;
33 files = ( 32 files = (
34 - 8185C9EE1DF028E400AA83C7 /* CNLivePlayerSDK.framework in Embed Frameworks */, 33 + 32ADA40D1DF91D5800B4585A /* CNLivePlayerSDK.framework in Embed Frameworks */,
35 ); 34 );
36 name = "Embed Frameworks"; 35 name = "Embed Frameworks";
37 runOnlyForDeploymentPostprocessing = 0; 36 runOnlyForDeploymentPostprocessing = 0;
@@ -39,6 +38,7 @@ @@ -39,6 +38,7 @@
39 /* End PBXCopyFilesBuildPhase section */ 38 /* End PBXCopyFilesBuildPhase section */
40 39
41 /* Begin PBXFileReference section */ 40 /* Begin PBXFileReference section */
  41 + 32ADA40A1DF91D5400B4585A /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
42 32B4C8581D9B66A400925AF0 /* CNLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveViewController.h; sourceTree = "<group>"; }; 42 32B4C8581D9B66A400925AF0 /* CNLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveViewController.h; sourceTree = "<group>"; };
43 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveViewController.m; sourceTree = "<group>"; }; 43 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveViewController.m; sourceTree = "<group>"; };
44 32B4C85B1D9B66E500925AF0 /* StreamerDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerDetailViewController.h; sourceTree = "<group>"; }; 44 32B4C85B1D9B66E500925AF0 /* StreamerDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerDetailViewController.h; sourceTree = "<group>"; };
@@ -61,7 +61,6 @@ @@ -61,7 +61,6 @@
61 32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerViewController.m; sourceTree = "<group>"; }; 61 32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerViewController.m; sourceTree = "<group>"; };
62 32E6CA8E1D5B2AF700B58EBC /* StreamerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerViewController.h; sourceTree = "<group>"; }; 62 32E6CA8E1D5B2AF700B58EBC /* StreamerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerViewController.h; sourceTree = "<group>"; };
63 32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StreamerViewController.m; sourceTree = "<group>"; }; 63 32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StreamerViewController.m; sourceTree = "<group>"; };
64 - 8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };  
65 /* End PBXFileReference section */ 64 /* End PBXFileReference section */
66 65
67 /* Begin PBXFrameworksBuildPhase section */ 66 /* Begin PBXFrameworksBuildPhase section */
@@ -69,8 +68,7 @@ @@ -69,8 +68,7 @@
69 isa = PBXFrameworksBuildPhase; 68 isa = PBXFrameworksBuildPhase;
70 buildActionMask = 2147483647; 69 buildActionMask = 2147483647;
71 files = ( 70 files = (
72 - 8185C9EC1DF028E000AA83C7 /* CNLivePlayerSDK.framework in Frameworks */,  
73 - 8185C9ED1DF028E400AA83C7 /* CNLivePlayerSDK.framework in Frameworks */, 71 + 32ADA40C1DF91D5800B4585A /* CNLivePlayerSDK.framework in Frameworks */,
74 ); 72 );
75 runOnlyForDeploymentPostprocessing = 0; 73 runOnlyForDeploymentPostprocessing = 0;
76 }; 74 };
@@ -80,7 +78,7 @@ @@ -80,7 +78,7 @@
80 32E6CA1D1D5B0AF400B58EBC = { 78 32E6CA1D1D5B0AF400B58EBC = {
81 isa = PBXGroup; 79 isa = PBXGroup;
82 children = ( 80 children = (
83 - 8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */, 81 + 32ADA40A1DF91D5400B4585A /* CNLivePlayerSDK.framework */,
84 32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */, 82 32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
85 32E6CA271D5B0AF400B58EBC /* Products */, 83 32E6CA271D5B0AF400B58EBC /* Products */,
86 ); 84 );
@@ -164,7 +162,7 @@ @@ -164,7 +162,7 @@
164 32E6CA221D5B0AF400B58EBC /* Sources */, 162 32E6CA221D5B0AF400B58EBC /* Sources */,
165 32E6CA231D5B0AF400B58EBC /* Frameworks */, 163 32E6CA231D5B0AF400B58EBC /* Frameworks */,
166 32E6CA241D5B0AF400B58EBC /* Resources */, 164 32E6CA241D5B0AF400B58EBC /* Resources */,
167 - 32F437E21DC9E04900A074BE /* Embed Frameworks */, 165 + 32ADA40E1DF91D5800B4585A /* Embed Frameworks */,
168 ); 166 );
169 buildRules = ( 167 buildRules = (
170 ); 168 );
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Info.plist
  View file @2db7eab
@@ -2,10 +2,6 @@ @@ -2,10 +2,6 @@
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
5 - <key>NSMicrophoneUsageDescription</key>  
6 - <string></string>  
7 - <key>NSCameraUsageDescription</key>  
8 - <string></string>  
9 <key>CFBundleDevelopmentRegion</key> 5 <key>CFBundleDevelopmentRegion</key>
10 <string>en</string> 6 <string>en</string>
11 <key>CFBundleExecutable</key> 7 <key>CFBundleExecutable</key>
@@ -31,6 +27,10 @@ @@ -31,6 +27,10 @@
31 <key>NSAllowsArbitraryLoads</key> 27 <key>NSAllowsArbitraryLoads</key>
32 <true/> 28 <true/>
33 </dict> 29 </dict>
  30 + <key>NSCameraUsageDescription</key>
  31 + <string></string>
  32 + <key>NSMicrophoneUsageDescription</key>
  33 + <string></string>
34 <key>UILaunchStoryboardName</key> 34 <key>UILaunchStoryboardName</key>
35 <string>LaunchScreen</string> 35 <string>LaunchScreen</string>
36 <key>UIMainStoryboardFile</key> 36 <key>UIMainStoryboardFile</key>
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Player/CNLiveViewController.m
  View file @2db7eab
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 //点播播放 44 //点播播放
45 _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithAppId:@"60_irg1rhs308" 45 _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithAppId:@"60_irg1rhs308"
46 appKey:@"4e7a37b27a717a9e9b0a7aea4620ee55ea61fbf923bf46" 46 appKey:@"4e7a37b27a717a9e9b0a7aea4620ee55ea61fbf923bf46"
47 - vId:@"0e12b70817c440509d88f67d4e975fe0" 47 + vId:@"20161126"
48 authSuccess:^{ 48 authSuccess:^{
49 49
50 _player.shouldUseHWCodec = YES; 50 _player.shouldUseHWCodec = YES;
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Player/PlayerViewController.m
  View file @2db7eab
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 if (array.count > 0) { 63 if (array.count > 0) {
64 _textField.text = array[0]; 64 _textField.text = array[0];
65 } else { 65 } else {
66 - _textField.text = @"http://wideo00.cnlive.com/video/data1/2016/0808/140935/800/e3554e4c5de34a8d9a03c534849cd2e4_140935_800.m3u8"; 66 + _textField.text = @"http://video00.cnlive.com/video/data1/2015/0518/cnlive_200.mp4";
67 } 67 }
68 68
69 _historyTableView = [[UITableView alloc] initWithFrame:CGRectMake(10, 240, self.view.frame.size.width, [UIScreen mainScreen].bounds.size.height-80-240) style:UITableViewStylePlain]; 69 _historyTableView = [[UITableView alloc] initWithFrame:CGRectMake(10, 240, self.view.frame.size.width, [UIScreen mainScreen].bounds.size.height-80-240) style:UITableViewStylePlain];
推流SDK文档.pdf
View file @2db7eab
No preview for this file type
播放SDK文档.pdf
View file @2db7eab
No preview for this file type