no message

zhangxiaowen
1 parent c51bb0ab
Showing 3 changed files with 77 additions and 4 deletions
CNLiveUserAgreementManager.podspec
CNLiveUserAgreementManager/Classes/CNLiveAgreementWebController.m
Example/CNLiveUserAgreementManager.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@ TODO: Add long description of the pod here.
   s.public_header_files = 'CNLiveUserAgreementManager/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
   s.dependency 'QMUIKit'
+  s.dependency 'Qiniu'
   s.dependency 'WebViewJavascriptBridge'
   s.dependency 'CNLiveRequestBastKit'
   s.dependency 'CNLiveEnvironment'
@@ -9,6 +9,8 @@
 #import "CNLiveAgreementWebController.h"
 // 交接库
 #import "WKWebViewJavascriptBridge.h"
+// 七牛
+#import "QiniuSDK.h"
 #import <WebKit/WebKit.h>
 // 环境库
 #import "CNLiveEnvironment.h"
@@ -82,8 +84,6 @@
     [self interaction];
     [self loadUrl];
  
-    [self getImageToken];
-    
 }
  
 - (void)dealloc {
@@ -465,17 +465,85 @@
         if ([responseObject isKindOfClass:[NSDictionary class]]) {
             NSDictionary *dic = (NSDictionary *)responseObject;
             if (!error && dic[@"token"] && ![dic[@"token"] isEqualToString:@""]) {
-//                [self QNStartUploadWithtoken:dic[@"token"]];
+                [self cn_QNStartUploadImageWithToken:dic[@"token"]];
                 return;
             }
  
         }
         [QMUITips hideAllToastInView:strongSelf.view animated:YES];
-        [QMUITips showError:error.localizedDescription inView:strongSelf.view hideAfterDelay:1.5];
+        [QMUITips showError:@"提交失败" inView:strongSelf.view hideAfterDelay:1.5];
  
+    }];
+    
+}
+
+// 图片开始上传
+- (void)cn_QNStartUploadImageWithToken:(NSString *)token {
+    __weak typeof(self) weakSelf = self;
+    // 图片视频压缩(LXG)
+    [_photos enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        if (!weakSelf.photos[idx]) {
+            [QMUITips hideAllToastInView:weakSelf.view animated:YES];
+            [QMUITips showError:@"提交失败" inView:weakSelf.view hideAfterDelay:1.5];
+            return;
+        }
+//        NSData *zipData = [UIImage zipNSDataWithImage:weakSelf.photos[idx]];//非原图压缩
+//        if (zipData.length > kFriendsCircle_limit_photo) {//压缩后大于20M
+//            [QMUITips hideAllToastInView:weakSelf.view animated:YES];
+//            [QMUITips showError:@"图片过大" inView:weakSelf.view hideAfterDelay:1.5];
+//            return;
+//        }
+//        else{
+//            weakSelf.photos[idx] = [UIImage imageWithData:zipData];
+//        }
  
     }];
  
+    NSMutableDictionary *picDict = [NSMutableDictionary dictionaryWithCapacity:_photos.count];
+    NSMutableArray *keyArr = [NSMutableArray arrayWithCapacity:_photos.count];
+//    self.picArr = [NSMutableArray arrayWithCapacity:_photos.count];
+    for (int i = 0; i < _photos.count; i++) {
+        @autoreleasepool {
+            UIImage *image = _photos[i];
+            __block NSData *imageData1 = UIImageJPEGRepresentation(image, 1);
+//            NSString *timeTampStr = [CNLiveTimeTools get13tsRandTimeStr];
+//            NSString *qiniuFileName = [NSString stringWithFormat:@"%@/%@.jpg",[self getImageBuketkeyFromServerWithExt], timeTampStr];
+            QNUploadManager *uploadManager = [QNUploadManager sharedInstanceWithConfiguration:nil];
+            [uploadManager putData:imageData1 key:@"qiniuFileName" token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                if(!strongSelf) return ;
+                if (info.ok) {
+                    NSString *imageUrl = [NSString stringWithFormat:@"%@%@",API_PhotoUrl,key];
+                    [picDict setObject:imageUrl ? imageUrl: @"" forKey:@"imageUrl"];
+                    [picDict setObject:[NSString stringWithFormat:@"%.0f",image.size.width] forKey:@"imageWidth"];
+                    [picDict setObject:[NSString stringWithFormat:@"%.0f",image.size.height] forKey:@"imageHeight"];
+                    [keyArr addObject:key];
+                    NSMutableDictionary *dict = [[NSMutableDictionary alloc]initWithDictionary:picDict];
+//                    [self.picArr addObject:dict];
+
+                    if (keyArr.count == strongSelf.photos.count) {
+//                        id data = @{ @"images": strongSelf.picArr.copy };
+//                        [strongSelf.photos removeAllObjects];
+//                        // 帮助与反馈->产品建议App->h5图片urls
+//                        [strongSelf.bridge callHandler:@"wjjSubmitSuccess" data:data responseCallback:^(id responseData) {
+//                            NSLog(@"ObjC received response: %@", responseData);
+//                        }];
+                    }
+                    
+                } else if (info.broken) {
+                    [QMUITips hideAllToastInView:strongSelf.view animated:YES];
+                    [QMUITips showError:@"网络连接失败" inView:strongSelf.view hideAfterDelay:1.5];
+                    return ;
+                } else {
+                    [QMUITips hideAllToastInView:strongSelf.view animated:YES];
+                    [QMUITips showError:info.error.localizedDescription inView:strongSelf.view hideAfterDelay:1.5];
+                    return ;
+                }
+                
+            } option:nil];
+        }
+    }
+    
 }
  
 //获取当前时间戳
@@ -310,7 +310,9 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
+				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
 				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -321,7 +323,9 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;