update to v3.0.1

.travis.yml

@@ -1,5 +1,9 @@
 language: objective-c
+<<<<<<< HEAD
 osx_image: xcode9
+=======
+osx_image: xcode8
+>>>>>>> 453ca092e88a247ed27e927ae695d4fb5dd169e8
 xcode_workspace: demo/KSYLiveDemo.xcworkspace
 xcode_scheme: KSYLiveDemo
 script:

demo/KSYLiveDemo/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0</string>
+	<string>3.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.0.0.1</string>
+	<string>3.0.1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

demo/KSYLiveDemo/KSYDemoUI/KSYFloatStreamerVC.m

@@ -39,14 +39,14 @@ - (void)rotateUI{
     }
 }
 
-// 重写父类layoutUI方法
-- (void)layoutUI {
-    if(self.ctrlView){
-        CGFloat minWidth = MIN(self.view.frame.size.width, self.view.frame.size.height);
-        CGFloat maxWidth = MAX(self.view.frame.size.width, self.view.frame.size.height);
-        self.ctrlView.frame = (!UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation)) ?  CGRectMake(0, 0, maxWidth , minWidth) : CGRectMake(0, 0, minWidth , maxWidth);
-        [self.ctrlView layoutUI];
-    }
-}
+//// 重写父类layoutUI方法
+//- (void)layoutUI {
+//    if(self.ctrlView){
+//        CGFloat minWidth = MIN(self.view.frame.size.width, self.view.frame.size.height);
+//        CGFloat maxWidth = MAX(self.view.frame.size.width, self.view.frame.size.height);
+//        self.ctrlView.frame = (!UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation)) ?  CGRectMake(0, 0, maxWidth , minWidth) : CGRectMake(0, 0, minWidth , maxWidth);
+//        [self.ctrlView layoutUI];
+//    }
+//}
 
 @end

demo/KSYLiveDemo/KSYPlayerDemo/KSYPlayerVC.m

@@ -24,6 +24,7 @@ @interface KSYPlayerVC()
 @property (nonatomic, readwrite) KSYPlayerCfgVC *config;
 @property(nonatomic,strong) KSYAVWriter *AVWriter;
 @property (nonatomic, readwrite)  BOOL bRecording;
+@property (nonatomic,strong) KSYUIView *subView; //二级视图
 @end
 
 @implementation KSYPlayerVC{
@@ -111,6 +112,10 @@ - (void)viewDidAppear:(BOOL)animated {
         [videoView addSubview: _player.view];
     }
 }
+- (void)viewDidLayoutSubviews {
+    self.subView.frame = CGRectMake(0,  ctrlView.gap + CGRectGetMaxY(btnVideo.frame), ctrlView.width, CGRectGetMinY(progressView.frame) - ctrlView.gap - CGRectGetMaxY(btnVideo.frame));
+    [self.subView layoutUI];
+}
 
 - (UILabel *)addLabelWithText:(NSString *)text textColor:(UIColor*)textColor {
     UILabel *label = [[UILabel alloc] init];
@@ -750,6 +755,7 @@ - (void)onBtn:(UIButton *)btn{
     else if(btn == btnQuit)
         [self onQuit:btn];
     else if(btn == btnVideo || btn == btnAudio || btn == btnSubtitle || btn == btnOthers) {
+
         KSYUIView *subView = nil;
         if(btn == btnVideo)
             subView = picView;
@@ -759,7 +765,9 @@ - (void)onBtn:(UIButton *)btn{
             subView = subtitleView;
         else
             subView = otherView;
-        [self hideElements:btn view:subView];
+
+        self.subView = subView;
+        [self hideElements:btn view:self.subView];
     }
 }
 

doc/docset-installed.txt

@@ -1,4 +1,4 @@
 Documentation set was installed to Xcode!
 
 Path: /Users/ksvc/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYLive_iOS.docset
-Time: 2018-01-05 08:51:13 +0000
+Time: 2018-01-26 11:23:43 +0000

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

@@ -156,6 +156,8 @@ <h1 id="library-title">
 
 		<option value="//api/name/initWithContentURL:">- initWithContentURL:</option>
 
+		<option value="//api/name/initWithContentURL:backupURL:">- initWithContentURL:backupURL:</option>
+
 		<option value="//api/name/initWithContentURL:fileList:sharegroup:">- initWithContentURL:fileList:sharegroup:</option>
 
 		<option value="//api/name/initWithContentURL:sharegroup:">- initWithContentURL:sharegroup:</option>
@@ -308,6 +310,79 @@ <h4 class="method-subtitle">Discussion</h4>
 
 
 
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">KSYMoviePlayerController.h</code></p>
+			</div>
+
+
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/initWithContentURL:backupURL:" title="initWithContentURL:backupURL:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/initWithContentURL:backupURL:">&ndash;&nbsp;initWithContentURL:backupURL:</a></code>
+</h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+
+
+			<div class="method-subsection brief-description">
+				<p>初始化播放器并设置主播放地址和备用播放地址</p>
+			</div>
+
+
+
+			<div class="method-subsection method-declaration"><code>- (instancetype)initWithContentURL:(NSURL *)<em>url</em> backupURL:(NSURL *)<em>backupURL</em></code></div>
+
+
+
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+
+					<tr>
+						<th scope="row" class="argument-name"><code>url</code></th>
+						<td><p>视频主播放地址，使用HEVC流地址.</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>backURL</code></th>
+						<td><p>视频备用播放地址，使用H264流地址</p></td>
+					</tr>
+
+				</table>
+			</div>
+
+
+
+			<div class="method-subsection return">
+				<h4 class="method-subtitle parameter-title">Return Value</h4>
+				<p>返回KSYMoviePlayerController对象，该对象的视频播放地址ContentURL已经初始化。此时播放器状态为MPMoviePlaybackStateStopped.</p>
+			</div>
+
+
+
+			<div class="method-subsection availability">
+				<h4 class="method-subtitle parameter-title">Availability</h4>
+				<p>Available in KSYMoviePlayerController 3.0.1 and later.</p>
+			</div>
+
+
+
+			<div class="method-subsection discussion-section">
+				<h4 class="method-subtitle">Discussion</h4>
+				<p>如果设置了备用播放地址，则会在设备不支持硬解播放HEVC流时切换到备用播放地址进行播放</p><div class="warning"><p><strong>Warning:</strong> 该方法由金山云引入，不是原生系统接口</p></div>
+			</div>
+
+
+
+
+
+
+
 			<div class="method-subsection declared-in-section">
 				<h4 class="method-subtitle">Declared In</h4>
 				<p><code class="declared-in-ref">KSYMoviePlayerController.h</code></p>

doc/docset/Contents/Resources/Documents/Constants/KSYShakeType.html

@@ -101,6 +101,12 @@ <h4 class="method-subtitle">Definition</h4>
 
                             &nbsp;&nbsp; <a href="">KSYShakeType_Ktv</a> = 5,<br>
 
+                            &nbsp;&nbsp; <a href="">KSYShakeType_Illusion</a> = 6,<br>
+
+                            &nbsp;&nbsp; <a href="">KSYShakeType_Xsignal</a> = 7,<br>
+
+                            &nbsp;&nbsp; <a href="">KSYShakeType_70s</a> = 8,<br>
+
                             };</code>
 
                     </div>
@@ -205,6 +211,57 @@ <h4 class="method-subtitle">Constants</h4>
 
 
 
+	<p>
+		Declared In <code class="declared-in-ref">KSYShakeFilter.h</code>.
+	</p>
+
+</dd>
+
+                            <dt><a name="" title="KSYShakeType_Illusion"></a><code>KSYShakeType_Illusion</code></dt>
+<dd>
+
+
+<p>幻觉</p>
+
+
+
+
+
+
+	<p>
+		Declared In <code class="declared-in-ref">KSYShakeFilter.h</code>.
+	</p>
+
+</dd>
+
+                            <dt><a name="" title="KSYShakeType_Xsignal"></a><code>KSYShakeType_Xsignal</code></dt>
+<dd>
+
+
+<p>X-Signal</p>
+
+
+
+
+
+
+	<p>
+		Declared In <code class="declared-in-ref">KSYShakeFilter.h</code>.
+	</p>
+
+</dd>
+
+                            <dt><a name="" title="KSYShakeType_70s"></a><code>KSYShakeType_70s</code></dt>
+<dd>
+
+
+<p>70s</p>
+
+
+
+
+
+
 	<p>
 		Declared In <code class="declared-in-ref">KSYShakeFilter.h</code>.
 	</p>

doc/docset/Contents/Resources/Tokens37.xml

@@ -29,6 +29,26 @@
             <NodeRef refid="37"/>
 		</Token>
 
+		<Token>
+			<TokenIdentifier>//apple_ref/occ/instm/KSYMoviePlayerController/initWithContentURL:backupURL:</TokenIdentifier>
+			<Abstract type="html">初始化播放器并设置主播放地址和备用播放地址</Abstract>
+			<DeclaredIn>KSYMoviePlayerController.h</DeclaredIn>
+
+			<Declaration>- (instancetype)initWithContentURL:(NSURL *)url backupURL:(NSURL *)backupURL</Declaration>
+			<Parameters>
+				<Parameter>
+					<Name>url</Name>
+					<Abstract type="html">视频主播放地址，使用HEVC流地址.</Abstract>
+				</Parameter><Parameter>
+					<Name>backURL</Name>
+					<Abstract type="html">视频备用播放地址，使用H264流地址</Abstract>
+				</Parameter>
+			</Parameters>
+			<ReturnValue><Abstract type="html">返回KSYMoviePlayerController对象，该对象的视频播放地址ContentURL已经初始化。此时播放器状态为MPMoviePlaybackStateStopped.</Abstract></ReturnValue>
+			<Anchor>//api/name/initWithContentURL:backupURL:</Anchor>
+            <NodeRef refid="37"/>
+		</Token>
+
 		<Token>
 			<TokenIdentifier>//apple_ref/occ/instm/KSYMoviePlayerController/initWithContentURL:sharegroup:</TokenIdentifier>
 			<Abstract type="html">初始化播放器并设置播放地址</Abstract>

doc/docset/Contents/Resources/Tokens80.xml

@@ -73,6 +73,36 @@
             <NodeRef refid="80"/>
         </Token>
 
+        <Token>
+            <TokenIdentifier>//apple_ref/c/econst/KSYShakeType_Illusion</TokenIdentifier>
+            <Abstract type="html">幻觉</Abstract>
+            <Declaration>KSYShakeType_Illusion</Declaration>
+
+            <DeclaredIn>KSYShakeFilter.h</DeclaredIn>
+
+            <NodeRef refid="80"/>
+        </Token>
+
+        <Token>
+            <TokenIdentifier>//apple_ref/c/econst/KSYShakeType_Xsignal</TokenIdentifier>
+            <Abstract type="html">X-Signal</Abstract>
+            <Declaration>KSYShakeType_Xsignal</Declaration>
+
+            <DeclaredIn>KSYShakeFilter.h</DeclaredIn>
+
+            <NodeRef refid="80"/>
+        </Token>
+
+        <Token>
+            <TokenIdentifier>//apple_ref/c/econst/KSYShakeType_70s</TokenIdentifier>
+            <Abstract type="html">70s</Abstract>
+            <Declaration>KSYShakeType_70s</Declaration>
+
+            <DeclaredIn>KSYShakeFilter.h</DeclaredIn>
+
+            <NodeRef refid="80"/>
+        </Token>
+
 
 	</File>
 </Tokens>