0.1.16修改提示

yinqiaojuan
1 parent 0caff895
Showing 3 changed files with 65 additions and 19 deletions
CNLiveUploadManager.podspec
CNLiveUploadManager/Classes/CNLiveUploadManager.m
Example/CNLiveUploadManager.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveUploadManager'
-  s.version          = '0.1.15'
+  s.version          = '0.1.16'
   s.summary          = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
 # This description is used to generate tags and improve search results.
@@ -41,6 +41,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => 'CNLiveTripartiteManagement/PLShortVideoKit' }
   s.frameworks = 'UIKit'
+  s.dependency 'CNLiveTripartiteManagement/AFNetworking'
   s.dependency 'CNLiveRequestBastKit'
   s.dependency 'CNLiveTripartiteManagement/MJExtension'
   s.dependency 'CNLiveTripartiteManagement/YYKit'
@@ -50,6 +51,7 @@ Pod::Spec.new do |s|
   s.dependency 'CNLiveBusinessTools'
   s.dependency 'CNLiveBaseTools'
+
@@ -1649,9 +1649,16 @@ static CNLiveUploadManager *_uploadManager;
             } else {//请求token失败
-                NSError *error = [NSError errorWithDomain:@"请求token失败" code:100 userInfo:@{NSLocalizedDescriptionKey:@"请求token失败,请重新获取"}];
-                !failure ? : failure(nil,error);
-                return;
+                NSInteger code = error.code;
+                NSString * errorStr = error.localizedDescription;
+                  NSError *error;
+                  if (code == - 1001 || code == -1009) {
+                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                  }else {
+                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                  }
+                  !failure ? : failure(nil,error);
+                  return;
             }
         }];
@@ -1680,9 +1687,16 @@ static CNLiveUploadManager *_uploadManager;
             } else {//请求token失败
-                NSError *error = [NSError errorWithDomain:@"请求token失败" code:100 userInfo:@{NSLocalizedDescriptionKey:@"请求token失败,请重新获取"}];
-                !failure ? : failure(nil,error);
-                return;
+                NSInteger code = error.code;
+                NSString * errorStr = error.localizedDescription;
+                  NSError *error;
+                  if (code == - 1001 || code == -1009) {
+                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                  }else {
+                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                  }
+                  !failure ? : failure(nil,error);
+                  return;
             }
         }];
@@ -1712,8 +1726,16 @@ static CNLiveUploadManager *_uploadManager;
             } else {//请求token失败
-                !failure ? : failure(nil,error);
-                return;
+               NSInteger code = error.code;
+               NSString * errorStr = error.localizedDescription;
+                 NSError *error;
+                 if (code == - 1001 || code == -1009) {
+                     error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                 }else {
+                     error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                 }
+                 !failure ? : failure(nil,error);
+                 return;
             }
         }];
@@ -1741,9 +1763,16 @@ static CNLiveUploadManager *_uploadManager;
             } else {//请求token失败
-                NSError *error = [NSError errorWithDomain:@"请求token失败" code:100 userInfo:@{NSLocalizedDescriptionKey:@"请求token失败,请重新获取"}];
-                !failure ? : failure(nil,error);
-                return;
+                NSInteger code = error.code;
+                NSString * errorStr = error.localizedDescription;
+                  NSError *error;
+                  if (code == - 1001 || code == -1009) {
+                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                  }else {
+                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                  }
+                  !failure ? : failure(nil,error);
+                  return;
             }
         }];
@@ -1771,10 +1800,16 @@ static CNLiveUploadManager *_uploadManager;
                 [[CNLiveUploadManager shareInsance] qnUploadVideoLimitWithToken:token asset:asset limitType:limitType outputPath:outputPath progress:progress success:success failure:failure];
             } else {//请求token失败
-                
-                NSError *error = [NSError errorWithDomain:@"请求token失败" code:100 userInfo:@{NSLocalizedDescriptionKey:@"请求token失败,请重新获取"}];
-                !failure ? : failure(nil,error);
-                return;
+                NSInteger code = error.code;
+                NSString * errorStr = error.localizedDescription;
+                  NSError *error;
+                  if (code == - 1001 || code == -1009) {
+                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                  }else {
+                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                  }
+                  !failure ? : failure(nil,error);
+                  return;
             }
         }];
@@ -1800,9 +1835,16 @@ static CNLiveUploadManager *_uploadManager;
                 [[CNLiveUploadManager shareInsance] uploadRequestPLShortVideoLimitWithToken:token asset:asset outputPath:outputPath limitType:limitType transcode: transcode progress:progress success:success failure:failure];
             } else {//请求token失败
-                NSError *error = [NSError errorWithDomain:@"请求token失败" code:100 userInfo:@{NSLocalizedDescriptionKey:@"请求token失败,请重新获取"}];
-                !failure ? : failure(nil,error);
-                return;
+                NSInteger code = error.code;
+                NSString * errorStr = error.localizedDescription;
+                  NSError *error;
+                  if (code == - 1001 || code == -1009) {
+                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                  }else {
+                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                  }
+                  !failure ? : failure(nil,error);
+                  return;
             }
         }];
@@ -361,6 +361,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
+				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
 				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
@@ -379,6 +380,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",