update to v1.2.2

ksvc · Nov 1, 2017 · 1bf34a9 · 1bf34a9
1 parent 598a522
commit 1bf34a9
Show file tree

Hide file tree

Showing 48 changed files with 819 additions and 553 deletions.
diff --git a/demo/KSYHTTPCacheDemo.xcodeproj/project.pbxproj b/demo/KSYHTTPCacheDemo.xcodeproj/project.pbxproj
diff --git a/demo/KSYHTTPCacheDemo.xcodeproj/xcshareddata/xcschemes/KSYHTTPCacheDemo.xcscheme b/demo/KSYHTTPCacheDemo.xcodeproj/xcshareddata/xcschemes/KSYHTTPCacheDemo.xcscheme
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0900"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B0E45A631DD59AC600D48A5E"
+               BuildableName = "KSYHTTPCacheDemo.app"
+               BlueprintName = "KSYHTTPCacheDemo"
+               ReferencedContainer = "container:KSYHTTPCacheDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B0E45A631DD59AC600D48A5E"
+            BuildableName = "KSYHTTPCacheDemo.app"
+            BlueprintName = "KSYHTTPCacheDemo"
+            ReferencedContainer = "container:KSYHTTPCacheDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B0E45A631DD59AC600D48A5E"
+            BuildableName = "KSYHTTPCacheDemo.app"
+            BlueprintName = "KSYHTTPCacheDemo"
+            ReferencedContainer = "container:KSYHTTPCacheDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B0E45A631DD59AC600D48A5E"
+            BuildableName = "KSYHTTPCacheDemo.app"
+            BlueprintName = "KSYHTTPCacheDemo"
+            ReferencedContainer = "container:KSYHTTPCacheDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/demo/demo/AppDelegate.h → demo/KSYHTTPCacheDemo/AppDelegate.h b/demo/demo/AppDelegate.h → demo/KSYHTTPCacheDemo/AppDelegate.h
diff --git a/demo/demo/AppDelegate.m → demo/KSYHTTPCacheDemo/AppDelegate.m b/demo/demo/AppDelegate.m → demo/KSYHTTPCacheDemo/AppDelegate.m
@@ -8,6 +8,7 @@
 
 #import "AppDelegate.h"
 #import <KSYHTTPCache/KSYHTTPProxyService.h>
+#import <Bugly/Bugly.h>
 
 @interface AppDelegate ()
 @property (nonatomic, strong) NSTimer *timer;
@@ -16,8 +17,14 @@ @interface AppDelegate ()
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+
+    BuglyConfig * cfg = [[BuglyConfig alloc] init];
+    cfg.channel = @"public";
+    [Bugly startWithAppId:@"2735967241" config:cfg];
+
     // Override point for customization after application launch.
     [[KSYHTTPProxyService sharedInstance] setCacheRoot:[NSTemporaryDirectory() stringByAppendingPathComponent:@"cachetest"]];
+//    [KSYHTTPProxyService sharedInstance].ignoreURLParamter = YES; //不设置时为NO，如果要忽略http url参数，将此属性设置为YES
     [[KSYHTTPProxyService sharedInstance] startServer];
 
 //    //设置请求头

diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/demo/demo/Base.lproj/LaunchScreen.storyboard → ...heDemo/Base.lproj/LaunchScreen.storyboard b/demo/demo/Base.lproj/LaunchScreen.storyboard → ...heDemo/Base.lproj/LaunchScreen.storyboard
diff --git a/demo/demo/Base.lproj/Main.storyboard → ...YHTTPCacheDemo/Base.lproj/Main.storyboard b/demo/demo/Base.lproj/Main.storyboard → ...YHTTPCacheDemo/Base.lproj/Main.storyboard
diff --git a/demo/demo/CacheSettingsViewController.h → ...TPCacheDemo/CacheSettingsViewController.h b/demo/demo/CacheSettingsViewController.h → ...TPCacheDemo/CacheSettingsViewController.h
diff --git a/demo/demo/CacheSettingsViewController.m → ...TPCacheDemo/CacheSettingsViewController.m b/demo/demo/CacheSettingsViewController.m → ...TPCacheDemo/CacheSettingsViewController.m
diff --git a/demo/demo/CachedFileListViewController.h → ...PCacheDemo/CachedFileListViewController.h b/demo/demo/CachedFileListViewController.h → ...PCacheDemo/CachedFileListViewController.h
diff --git a/demo/demo/CachedFileListViewController.m → ...PCacheDemo/CachedFileListViewController.m b/demo/demo/CachedFileListViewController.m → ...PCacheDemo/CachedFileListViewController.m
diff --git a/demo/demo/CachingFileListViewController.h → ...CacheDemo/CachingFileListViewController.h b/demo/demo/CachingFileListViewController.h → ...CacheDemo/CachingFileListViewController.h
diff --git a/demo/demo/CachingFileListViewController.m → ...CacheDemo/CachingFileListViewController.m b/demo/demo/CachingFileListViewController.m → ...CacheDemo/CachingFileListViewController.m
diff --git a/demo/demo/Info.plist → demo/KSYHTTPCacheDemo/Info.plist b/demo/demo/Info.plist → demo/KSYHTTPCacheDemo/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.2.2</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>1.2.2.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/demo/demo/KSYPlayerVC.h → demo/KSYHTTPCacheDemo/KSYPlayerVC.h b/demo/demo/KSYPlayerVC.h → demo/KSYHTTPCacheDemo/KSYPlayerVC.h
diff --git a/demo/demo/KSYPlayerVC.m → demo/KSYHTTPCacheDemo/KSYPlayerVC.m b/demo/demo/KSYPlayerVC.m → demo/KSYHTTPCacheDemo/KSYPlayerVC.m
diff --git a/demo/demo/KSYProgressView.h → demo/KSYHTTPCacheDemo/KSYProgressView.h b/demo/demo/KSYProgressView.h → demo/KSYHTTPCacheDemo/KSYProgressView.h
diff --git a/demo/demo/KSYProgressView.m → demo/KSYHTTPCacheDemo/KSYProgressView.m b/demo/demo/KSYProgressView.m → demo/KSYHTTPCacheDemo/KSYProgressView.m
diff --git a/demo/demo/SamplesViewController.h → .../KSYHTTPCacheDemo/SamplesViewController.h b/demo/demo/SamplesViewController.h → .../KSYHTTPCacheDemo/SamplesViewController.h
diff --git a/demo/demo/SamplesViewController.m → .../KSYHTTPCacheDemo/SamplesViewController.m b/demo/demo/SamplesViewController.m → .../KSYHTTPCacheDemo/SamplesViewController.m
@@ -40,8 +40,7 @@ - (void)viewDidLoad {
 -(NSMutableArray*)getNameAndProxyUrl:(NSString*)url {
     NSMutableArray* array = [[NSMutableArray alloc] init];
     [array addObject:[url lastPathComponent]];
-    //[array addObject: [[KSYHTTPProxyService sharedInstance] getProxyUrl:url]];
-    [array addObject: [[KSYHTTPProxyService sharedInstance] getProxyUrl:url newCache:YES]];
+    [array addObject: [[KSYHTTPProxyService sharedInstance] getProxyUrl:url]];
     return array;
 }
 

diff --git a/demo/demo/ShowFileDownloader.h → demo/KSYHTTPCacheDemo/ShowFileDownloader.h b/demo/demo/ShowFileDownloader.h → demo/KSYHTTPCacheDemo/ShowFileDownloader.h
diff --git a/demo/demo/ShowFileDownloader.m → demo/KSYHTTPCacheDemo/ShowFileDownloader.m b/demo/demo/ShowFileDownloader.m → demo/KSYHTTPCacheDemo/ShowFileDownloader.m
@@ -7,7 +7,7 @@
 //
 
 #import "ShowFileDownloader.h"
-#import <kSYHTTPCache/KSYFileDownloader.h>
+#import <KSYHTTPCache/KSYFileDownloader.h>
 #import <UIKit/UIKit.h>
 
 @interface ShowFileDownloader ()

diff --git a/demo/demo/ViewController.h → demo/KSYHTTPCacheDemo/ViewController.h b/demo/demo/ViewController.h → demo/KSYHTTPCacheDemo/ViewController.h
diff --git a/demo/demo/ViewController.m → demo/KSYHTTPCacheDemo/ViewController.m b/demo/demo/ViewController.m → demo/KSYHTTPCacheDemo/ViewController.m
diff --git a/demo/demo/main.m → demo/KSYHTTPCacheDemo/main.m b/demo/demo/main.m → demo/KSYHTTPCacheDemo/main.m
diff --git a/demo/Podfile b/demo/Podfile
@@ -1,8 +1,9 @@
-# Uncomment this line to define a global platform for your project
-platform :ios, '8.0'
+platform :ios, '7.0'
+inhibit_all_warnings!
 
-target 'demo' do
+target 'KSYHTTPCacheDemo' do
+    pod 'Bugly'
+
+    pod 'ksyhttpcache',         :path => '../'
     pod 'KSYMediaPlayer_iOS'
-    pod 'ksyhttpcache'
 end
-
diff --git a/demo/Podfile.lock b/demo/Podfile.lock