fix ios 11.3 crash

onezens · Apr 6, 2018 · e370715 · e370715
1 parent b46e809
commit e370715
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/YCDownloadSession.xcodeproj/project.pbxproj b/YCDownloadSession.xcodeproj/project.pbxproj
@@ -498,7 +498,7 @@
 					};
 					D72C84CF1E77D42500EDCEEF = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = N62UU42592;
+						DevelopmentTeam = 6QXR4W42GG;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
@@ -787,7 +787,7 @@
 		D72C84E81E77D42500EDCEEF /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				DEVELOPMENT_TEAM = N62UU42592;
+				DEVELOPMENT_TEAM = 6QXR4W42GG;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/YCDownloadSession/ThirdLib/Bugly",
@@ -803,7 +803,7 @@
 		D72C84E91E77D42500EDCEEF /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				DEVELOPMENT_TEAM = N62UU42592;
+				DEVELOPMENT_TEAM = 6QXR4W42GG;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/YCDownloadSession/ThirdLib/Bugly",

diff --git a/YCDownloadSession/YCDownloadSession/YCDownloadSession.m b/YCDownloadSession/YCDownloadSession/YCDownloadSession.m
@@ -741,8 +741,8 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
         NSData *resumeData = [error.userInfo objectForKey:NSURLSessionDownloadTaskResumeData];
         if (resumeData) {
 
-            float deviceVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
-            if (deviceVersion >= 11.0f && deviceVersion < 11.2f) {
+
+            if (YC_DEVICE_VERSION >= 11.0f && YC_DEVICE_VERSION < 11.2f) {
                 //修正iOS11 多次暂停继续 文件大小不对的问题
                 resumeData = [YCResumeData cleanResumeData:resumeData];
             }

diff --git a/YCDownloadSession/YCDownloadSession/YCDownloadTask.h b/YCDownloadSession/YCDownloadSession/YCDownloadTask.h
@@ -17,7 +17,7 @@ typedef NS_ENUM(NSUInteger, YCDownloadStatus) {
     YCDownloadStatusFinished,
     YCDownloadStatusFailed
 };
-#define IS_IOS10ORLATER ([[[UIDevice currentDevice] systemVersion] floatValue] >= 10)
+#define YC_DEVICE_VERSION [[[UIDevice currentDevice] systemVersion] floatValue]
 /**某一任务下载的状态发生变化的通知*/
 static NSString * const kDownloadStatusChangedNoti = @"kDownloadStatusChangedNoti";
 

diff --git a/YCDownloadSession/YCDownloadSession/YCDownloadTask.m b/YCDownloadSession/YCDownloadSession/YCDownloadTask.m
@@ -404,7 +404,7 @@ + (NSData *)correctRequestData:(NSData *)data
 + (NSMutableDictionary *)getResumeDictionary:(NSData *)data
 {
     NSMutableDictionary *iresumeDictionary = nil;
-    if (IS_IOS10ORLATER) {
+    if (YC_DEVICE_VERSION >= 10) {
         id root = nil;
         id  keyedUnarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];
         @try {
@@ -435,6 +435,9 @@ + (NSMutableDictionary *)getResumeDictionary:(NSData *)data
 
 + (NSData *)correctResumeData:(NSData *)data
 {
+    if (YC_DEVICE_VERSION >= 11.2) {
+        return data;
+    }
     NSString *kResumeCurrentRequest = kNSURLSessionResumeCurrentRequest;
     NSString *kResumeOriginalRequest = kNSURLSessionResumeOriginalRequest;
     if (data == nil) {