update to v1.2.3

ksvc · Jan 11, 2018 · 5b3a016 · 5b3a016
1 parent 5cd639a
commit 5b3a016
Show file tree

Hide file tree

Showing 33 changed files with 40 additions and 78 deletions.
diff --git a/demo/KSYHTTPCacheDemo/Info.plist b/demo/KSYHTTPCacheDemo/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.2.1</string>
+	<string>1.2.3.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/demo/KSYHTTPCacheDemo/KSYPlayerVC.h b/demo/KSYHTTPCacheDemo/KSYPlayerVC.h
@@ -6,11 +6,9 @@
 //  Copyright (c) 2015 qyvideo. All rights reserved.
 //
 #import <UIKit/UIKit.h>
-#if USING_DYNAMIC_FRAMEWORK
-#import <KSYMediaPlayerDy/KSYMediaPlayerDy.h>
-#else
+
 #import <KSYMediaPlayer/KSYMediaPlayer.h>
-#endif
+
 @interface KSYPlayerVC : UIViewController
 - (instancetype)initWithURL:(NSURL *)url;
 @end

diff --git a/demo/KSYHTTPCacheDemo/KSYPlayerVC.m b/demo/KSYHTTPCacheDemo/KSYPlayerVC.m
@@ -495,25 +495,6 @@ - (void)initPlayerWithURL:(NSURL *)aURL {
         NSLog(@"logJson is %@",logJson);
     };
 
-#if 0
-    _player.videoDataBlock = ^(CMSampleBufferRef sampleBuffer){
-        CMItemCount count;
-        CMSampleTimingInfo timing_info;
-        OSErr ret = CMSampleBufferGetOutputSampleTimingInfoArray(sampleBuffer, 1, &timing_info, &count);
-        if ( ret == noErr) {
-            NSLog(@"video Pts %d %lld",  timing_info.presentationTimeStamp.timescale, timing_info.presentationTimeStamp.value );
-        }
-    };
-
-    _player.audioDataBlock = ^(CMSampleBufferRef sampleBuffer){
-        CMItemCount count;
-        CMSampleTimingInfo timing_info;
-        OSErr ret = CMSampleBufferGetOutputSampleTimingInfoArray(sampleBuffer, 1, &timing_info, &count);
-        if ( ret == noErr) {
-            NSLog(@"audio Pts %d %lld",  timing_info.presentationTimeStamp.timescale, timing_info.presentationTimeStamp.value );
-        }
-    };
-#endif
     stat.text = [NSString stringWithFormat:@"url %@", aURL];
     _player.controlStyle = MPMovieControlStyleNone;
     [_player.view setFrame: videoView.bounds];  // player's frame must match parent's

diff --git a/demo/KSYHTTPCacheDemo/SamplesViewController.m b/demo/KSYHTTPCacheDemo/SamplesViewController.m
@@ -37,13 +37,6 @@ - (void)viewDidLoad {
     [self initTableView];
 }
 
--(NSMutableArray*)getNameAndProxyUrl:(NSString*)url {
-    NSMutableArray* array = [[NSMutableArray alloc] init];
-    [array addObject:[url lastPathComponent]];
-    [array addObject: [[KSYHTTPProxyService sharedInstance] getProxyUrl:url]];
-    return array;
-}
-
 -(NSMutableArray*)getNameAndUrl:(NSString*)url {
     NSMutableArray* array = [[NSMutableArray alloc] init];
     [array addObject:[url lastPathComponent]];
@@ -60,15 +53,13 @@ - (ShowFileDownloader *)downloaderManager {
 
 -(void)initTableView {
     NSMutableArray *sampleList = [[NSMutableArray alloc] init];
-    [sampleList addObject:[self getNameAndProxyUrl:@"http://ks3-cn-beijing.ksyun.com/mobile/S09E20.mp4"]];
-
-    [sampleList addObject:[self getNameAndProxyUrl:@"http://lavaweb-10015286.video.myqcloud.com/hong-song-mei-gui-mu-2.mp4"]];
-
-    [sampleList addObject:[self getNameAndProxyUrl:@"https://mvvideo5.meitudata.com/571090934cea5517.mp4"]];
-    [sampleList addObject:[self getNameAndProxyUrl:@"http://lavaweb-10015286.video.myqcloud.com/lava-guitar-creation-2.mp4"]];
-    [sampleList addObject:[self getNameAndProxyUrl:@"http://lavaweb-10015286.video.myqcloud.com/ideal-pick-2.mp4"]];
-    [sampleList addObject:[self getNameAndProxyUrl:@"http://120.25.226.186:32812/resources/videos/minion_01.mp4"]];
-    [sampleList addObject:[self getNameAndProxyUrl:@"http://120.25.226.186:32812/resources/videos/minion_04.mp4"]];
+    [sampleList addObject:[self getNameAndUrl:@"http://ks3-cn-beijing.ksyun.com/mobile/S09E20.mp4"]];
+    [sampleList addObject:[self getNameAndUrl:@"http://lavaweb-10015286.video.myqcloud.com/hong-song-mei-gui-mu-2.mp4"]];
+    [sampleList addObject:[self getNameAndUrl:@"https://mvvideo5.meitudata.com/571090934cea5517.mp4"]];
+    [sampleList addObject:[self getNameAndUrl:@"http://lavaweb-10015286.video.myqcloud.com/lava-guitar-creation-2.mp4"]];
+    [sampleList addObject:[self getNameAndUrl:@"http://lavaweb-10015286.video.myqcloud.com/ideal-pick-2.mp4"]];
+    [sampleList addObject:[self getNameAndUrl:@"http://120.25.226.186:32812/resources/videos/minion_01.mp4"]];
+    [sampleList addObject:[self getNameAndUrl:@"http://120.25.226.186:32812/resources/videos/minion_04.mp4"]];
     self.sampleList_withhttpcache = sampleList;
 
     NSMutableArray *sampleList2 = [[NSMutableArray alloc] init];
@@ -187,18 +178,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     }
 
     if (section == 0) {
-        NSString *local = @"http://127.0.0.1:8123/";
-        NSString *originalUrlStr = nil;
         NSString *httpServerUrlStr = [item[1] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-        if (httpServerUrlStr.length > [local length]) {
-            originalUrlStr = [httpServerUrlStr substringFromIndex:local.length];
-        }
-        if (![originalUrlStr hasPrefix:@"http://"] && ![originalUrlStr hasPrefix:@"https://"]) {
-            return;
-        }
-
         __weak typeof(self) weakSelf = self;
-        [self.downloaderManager showDownloaderHandlerForUrl:originalUrlStr onViewController:self progressBlock:^(float progress) {
+        [self.downloaderManager showDownloaderHandlerForUrl:httpServerUrlStr onViewController:self progressBlock:^(float progress) {
             UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
             UILabel *progressLab = [cell.contentView viewWithTag:100021];
             if ((NSInteger)(progress * 10000) > 10000) {
@@ -207,7 +189,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             progressLab.text = [NSString stringWithFormat:@"%f", progress];
         } playerBlock:^{
             __strong typeof(weakSelf) strongSelf = weakSelf;
-            [strongSelf presentViewController:[[KSYPlayerVC alloc] initWithURL:[NSURL URLWithString:httpServerUrlStr]] animated:YES completion:nil];
+            NSString* proxyUrlString = [[KSYHTTPProxyService sharedInstance]getProxyUrl:httpServerUrlStr];
+            [strongSelf presentViewController:[[KSYPlayerVC alloc] initWithURL:[NSURL URLWithString:proxyUrlString]] animated:YES completion:nil];
         }];
     } else {
         NSURL   *url  = [NSURL URLWithString:[item[1] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];

diff --git a/doc/docset-installed.txt b/doc/docset-installed.txt
@@ -1,4 +1,4 @@
 Documentation set was installed to Xcode!
 
-Path: /Users/ksyci/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYHTTPCacheDemo_iOS.docset
-Time: 2017-11-01 07:25:27 +0000
+Path: /Users/ksvc/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYHTTPCacheDemo_iOS.docset
+Time: 2018-01-11 08:42:56 +0000
diff --git a/doc/docset/Contents/Info.plist b/doc/docset/Contents/Info.plist
@@ -29,6 +29,6 @@
 	<key>DocSetPublisherName</key>
 	<string>Kingsoft</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017 Kingsoft. All rights reserved.</string>
+	<string>Copyright © 2018 Kingsoft. All rights reserved.</string>
 </dict>
 </plist>
diff --git a/doc/docset/Contents/Resources/Documents/Classes/KSYFileDownloader.html b/doc/docset/Contents/Resources/Documents/Classes/KSYFileDownloader.html
@@ -346,7 +346,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Classes/KSYHTTPProxyService.html b/doc/docset/Contents/Resources/Documents/Classes/KSYHTTPProxyService.html
@@ -675,7 +675,7 @@ <h3 class="method-title"><code><a href="#//api/name/startServer">&ndash;&nbsp;st
 
 
 
-			<div class="method-subsection method-declaration"><code>- (void)startServer</code></div>
+			<div class="method-subsection method-declaration"><code>- (BOOL)startServer</code></div>
 
 
 
@@ -1262,7 +1262,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/KSYCacheStrategy.html b/doc/docset/Contents/Resources/Documents/Constants/KSYCacheStrategy.html
@@ -128,7 +128,7 @@ <h4 class="method-subtitle">Constants</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/KSYCacheTaskType.html b/doc/docset/Contents/Resources/Documents/Constants/KSYCacheTaskType.html
@@ -159,7 +159,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/KSYFileDownloaderState.html b/doc/docset/Contents/Resources/Documents/Constants/KSYFileDownloaderState.html
@@ -216,7 +216,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/KSYHTTPCacheErrorCode.html b/doc/docset/Contents/Resources/Documents/Constants/KSYHTTPCacheErrorCode.html
@@ -368,7 +368,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/hierarchy.html b/doc/docset/Contents/Resources/Documents/hierarchy.html
@@ -85,7 +85,7 @@ <h2 class="index-title">Constant References</h2>
 					<footer>
 						<div class="footer-copyright">
 
-							<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+							<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 							<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/index.html b/doc/docset/Contents/Resources/Documents/index.html
@@ -85,7 +85,7 @@ <h2 class="index-title">Constant References</h2>
 					<footer>
 						<div class="footer-copyright">
 
-							<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+							<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 							<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Tokens2.xml b/doc/docset/Contents/Resources/Tokens2.xml
@@ -187,7 +187,7 @@
 			<Abstract type="html">启动server</Abstract>
 			<DeclaredIn>KSYHTTPProxyService.h</DeclaredIn>
 
-			<Declaration>- (void)startServer</Declaration>
+			<Declaration>- (BOOL)startServer</Declaration>
 
 
 			<Anchor>//api/name/startServer</Anchor>

diff --git a/doc/docset/Contents/Resources/docSet.dsidx b/doc/docset/Contents/Resources/docSet.dsidx
diff --git a/doc/docset/Contents/Resources/docSet.dsidx-shm b/doc/docset/Contents/Resources/docSet.dsidx-shm
diff --git a/doc/docset/Contents/Resources/docSet.dsidx-wal b/doc/docset/Contents/Resources/docSet.dsidx-wal
diff --git a/doc/docset/Contents/Resources/docSet.skidx b/doc/docset/Contents/Resources/docSet.skidx
diff --git a/doc/docset/Contents/Resources/docSet.toc b/doc/docset/Contents/Resources/docSet.toc
diff --git a/doc/docset/Contents/Resources/docSet.tokencache b/doc/docset/Contents/Resources/docSet.tokencache
diff --git a/doc/html/Classes/KSYFileDownloader.html b/doc/html/Classes/KSYFileDownloader.html
@@ -346,7 +346,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/html/Classes/KSYHTTPProxyService.html b/doc/html/Classes/KSYHTTPProxyService.html
@@ -675,7 +675,7 @@ <h3 class="method-title"><code><a href="#//api/name/startServer">&ndash;&nbsp;st
 
 
 
-			<div class="method-subsection method-declaration"><code>- (void)startServer</code></div>
+			<div class="method-subsection method-declaration"><code>- (BOOL)startServer</code></div>
 
 
 
@@ -1262,7 +1262,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/html/Constants/KSYCacheStrategy.html b/doc/html/Constants/KSYCacheStrategy.html
@@ -128,7 +128,7 @@ <h4 class="method-subtitle">Constants</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/html/Constants/KSYCacheTaskType.html b/doc/html/Constants/KSYCacheTaskType.html
@@ -159,7 +159,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/html/Constants/KSYFileDownloaderState.html b/doc/html/Constants/KSYFileDownloaderState.html
@@ -216,7 +216,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/html/Constants/KSYHTTPCacheErrorCode.html b/doc/html/Constants/KSYHTTPCacheErrorCode.html
@@ -368,7 +368,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+						<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html
@@ -85,7 +85,7 @@ <h2 class="index-title">Constant References</h2>
 					<footer>
 						<div class="footer-copyright">
 
-							<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+							<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 							<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/html/index.html b/doc/html/index.html
@@ -85,7 +85,7 @@ <h2 class="index-title">Constant References</h2>
 					<footer>
 						<div class="footer-copyright">
 
-							<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
+							<p class="copyright">Copyright &copy; 2018 Kingsoft. All rights reserved. </p>
 
 
 							<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/framework/KSYHTTPCache.framework/Headers/KSYHTTPProxyService.h b/framework/KSYHTTPCache.framework/Headers/KSYHTTPProxyService.h
@@ -78,7 +78,7 @@
 /**
  * 启动server
  */
-- (void)startServer;
+- (BOOL)startServer;
 
 /**
  * 关闭server
@@ -154,5 +154,5 @@
 
 @end
 
-#define KSYHTTPCACHE_VER 1.2.2
-#define KSYHTTPCACHE_ID  39840a2b3d9af193aa4f6c591f4896f5362aa15b
+#define KSYHTTPCACHE_VER 1.2.3
+#define KSYHTTPCACHE_ID  5cf9e18d38ee70a735c8804329dec42b01d02396
diff --git a/framework/KSYHTTPCache.framework/Info.plist b/framework/KSYHTTPCache.framework/Info.plist
diff --git a/framework/KSYHTTPCache.framework/KSYHTTPCache b/framework/KSYHTTPCache.framework/KSYHTTPCache
diff --git a/ksyhttpcache.podspec b/ksyhttpcache.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'ksyhttpcache'
-  s.version      = '1.2.2'
+  s.version      = '1.2.3'
   s.license      = {
 :type => 'Proprietary',
 :text => <<-LICENSE