Skip to content

Commit c62c6b2

Browse files
author
ksvcci
committed
update to v3.0.1
1 parent b8325d2 commit c62c6b2

File tree

21 files changed

+231
-5
lines changed

21 files changed

+231
-5
lines changed

‎KSYMediaPlayer_iOS.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'KSYMediaPlayer_iOS'
3-
spec.version = '3.0.0'
3+
spec.version = '3.0.1'
44
spec.license = {
55
:type => 'Proprietary',
66
:text => <<-LICENSE

‎demo/KSYPlayerDemo/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.0.0</string>
20+
<string>3.0.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>3.0.0.1</string>
24+
<string>3.0.1.0</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>NSAppTransportSecurity</key>

‎demo/KSYPlayerDemo/KSYPlayerDemo/KSYPlayerVC.m

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ @interface KSYPlayerVC()
2424
@property (nonatomic, readwrite) KSYPlayerCfgVC *config;
2525
@property(nonatomic,strong) KSYAVWriter *AVWriter;
2626
@property (nonatomic, readwrite) BOOL bRecording;
27+
@property (nonatomic,strong) KSYUIView *subView; //二级视图
2728
@end
2829

2930
@implementation KSYPlayerVC{
@@ -111,6 +112,10 @@ - (void)viewDidAppear:(BOOL)animated {
111112
[videoView addSubview: _player.view];
112113
}
113114
}
115+
- (void)viewDidLayoutSubviews {
116+
self.subView.frame = CGRectMake(0, ctrlView.gap + CGRectGetMaxY(btnVideo.frame), ctrlView.width, CGRectGetMinY(progressView.frame) - ctrlView.gap - CGRectGetMaxY(btnVideo.frame));
117+
[self.subView layoutUI];
118+
}
114119

115120
- (UILabel *)addLabelWithText:(NSString *)text textColor:(UIColor*)textColor {
116121
UILabel *label = [[UILabel alloc] init];
@@ -750,6 +755,7 @@ - (void)onBtn:(UIButton *)btn{
750755
else if(btn == btnQuit)
751756
[self onQuit:btn];
752757
else if(btn == btnVideo || btn == btnAudio || btn == btnSubtitle || btn == btnOthers) {
758+
753759
KSYUIView *subView = nil;
754760
if(btn == btnVideo)
755761
subView = picView;
@@ -759,7 +765,9 @@ - (void)onBtn:(UIButton *)btn{
759765
subView = subtitleView;
760766
else
761767
subView = otherView;
762-
[self hideElements:btn view:subView];
768+
769+
self.subView = subView;
770+
[self hideElements:btn view:self.subView];
763771
}
764772
}
765773

‎doc/docset-installed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Documentation set was installed to Xcode!
22

33
Path: /Users/ksvc/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYLive_iOS.docset
4-
Time: 2018-01-05 09:03:05 +0000
4+
Time: 2018-01-26 12:00:40 +0000

‎doc/docset/Contents/Resources/Documents/Classes/KSYMoviePlayerController.html

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ <h1 id="library-title">
156156

157157
<option value="//api/name/initWithContentURL:">- initWithContentURL:</option>
158158

159+
<option value="//api/name/initWithContentURL:backupURL:">- initWithContentURL:backupURL:</option>
160+
159161
<option value="//api/name/initWithContentURL:fileList:sharegroup:">- initWithContentURL:fileList:sharegroup:</option>
160162

161163
<option value="//api/name/initWithContentURL:sharegroup:">- initWithContentURL:sharegroup:</option>
@@ -308,6 +310,79 @@ <h4 class="method-subtitle">Discussion</h4>
308310

309311

310312

313+
<div class="method-subsection declared-in-section">
314+
<h4 class="method-subtitle">Declared In</h4>
315+
<p><code class="declared-in-ref">KSYMoviePlayerController.h</code></p>
316+
</div>
317+
318+
319+
</div>
320+
</div>
321+
</div><div class="section-method">
322+
<a name="//api/name/initWithContentURL:backupURL:" title="initWithContentURL:backupURL:"></a>
323+
<h3 class="method-title"><code><a href="#//api/name/initWithContentURL:backupURL:">&ndash;&nbsp;initWithContentURL:backupURL:</a></code>
324+
</h3>
325+
326+
<div class="method-info">
327+
<div class="pointy-thing"></div>
328+
329+
<div class="method-info-container">
330+
331+
332+
<div class="method-subsection brief-description">
333+
<p>初始化播放器并设置主播放地址和备用播放地址</p>
334+
</div>
335+
336+
337+
338+
<div class="method-subsection method-declaration"><code>- (instancetype)initWithContentURL:(NSURL *)<em>url</em> backupURL:(NSURL *)<em>backupURL</em></code></div>
339+
340+
341+
342+
<div class="method-subsection arguments-section parameters">
343+
<h4 class="method-subtitle parameter-title">Parameters</h4>
344+
<table class="argument-def parameter-def">
345+
346+
<tr>
347+
<th scope="row" class="argument-name"><code>url</code></th>
348+
<td><p>视频主播放地址，使用HEVC流地址.</p></td>
349+
</tr>
350+
351+
<tr>
352+
<th scope="row" class="argument-name"><code>backURL</code></th>
353+
<td><p>视频备用播放地址，使用H264流地址</p></td>
354+
</tr>
355+
356+
</table>
357+
</div>
358+
359+
360+
361+
<div class="method-subsection return">
362+
<h4 class="method-subtitle parameter-title">Return Value</h4>
363+
<p>返回KSYMoviePlayerController对象，该对象的视频播放地址ContentURL已经初始化。此时播放器状态为MPMoviePlaybackStateStopped.</p>
364+
</div>
365+
366+
367+
368+
<div class="method-subsection availability">
369+
<h4 class="method-subtitle parameter-title">Availability</h4>
370+
<p>Available in KSYMoviePlayerController 3.0.1 and later.</p>
371+
</div>
372+
373+
374+
375+
<div class="method-subsection discussion-section">
376+
<h4 class="method-subtitle">Discussion</h4>
377+
<p>如果设置了备用播放地址，则会在设备不支持硬解播放HEVC流时切换到备用播放地址进行播放</p><div class="warning"><p><strong>Warning:</strong> 该方法由金山云引入，不是原生系统接口</p></div>
378+
</div>
379+
380+
381+
382+
383+
384+
385+
311386
<div class="method-subsection declared-in-section">
312387
<h4 class="method-subtitle">Declared In</h4>
313388
<p><code class="declared-in-ref">KSYMoviePlayerController.h</code></p>

‎doc/docset/Contents/Resources/Tokens4.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,26 @@
2929
<NodeRef refid="4"/>
3030
</Token>
3131

32+
<Token>
33+
<TokenIdentifier>//apple_ref/occ/instm/KSYMoviePlayerController/initWithContentURL:backupURL:</TokenIdentifier>
34+
<Abstract type="html">初始化播放器并设置主播放地址和备用播放地址</Abstract>
35+
<DeclaredIn>KSYMoviePlayerController.h</DeclaredIn>
36+
37+
<Declaration>- (instancetype)initWithContentURL:(NSURL *)url backupURL:(NSURL *)backupURL</Declaration>
38+
<Parameters>
39+
<Parameter>
40+
<Name>url</Name>
41+
<Abstract type="html">视频主播放地址，使用HEVC流地址.</Abstract>
42+
</Parameter><Parameter>
43+
<Name>backURL</Name>
44+
<Abstract type="html">视频备用播放地址，使用H264流地址</Abstract>
45+
</Parameter>
46+
</Parameters>
47+
<ReturnValue><Abstract type="html">返回KSYMoviePlayerController对象，该对象的视频播放地址ContentURL已经初始化。此时播放器状态为MPMoviePlaybackStateStopped.</Abstract></ReturnValue>
48+
<Anchor>//api/name/initWithContentURL:backupURL:</Anchor>
49+
<NodeRef refid="4"/>
50+
</Token>
51+
3252
<Token>
3353
<TokenIdentifier>//apple_ref/occ/instm/KSYMoviePlayerController/initWithContentURL:sharegroup:</TokenIdentifier>
3454
<Abstract type="html">初始化播放器并设置播放地址</Abstract>

0 commit comments

Comments
 (0)