no message

zhangxiaowen
1 parent a284f37b
Showing 1 changed file with 52 additions and 24 deletions
CNLiveUserAgreementManager/Classes/CNLiveAgreementWebController.m
@@ -261,6 +261,7 @@
     _webView.navigationDelegate = self;
     _webView.contentMode = UIViewContentModeScaleAspectFit;
     _webView.scrollView.showsHorizontalScrollIndicator = NO;
+    _webView.scrollView.showsVerticalScrollIndicator = NO;
     _webView.allowsBackForwardNavigationGestures = YES;
     _webView.allowsLinkPreview = NO;
     [self.view addSubview:self.webView];
@@ -499,35 +500,39 @@
     }];
-    NSMutableDictionary *picDict = [NSMutableDictionary dictionaryWithCapacity:_photos.count];
-    NSMutableArray *keyArr = [NSMutableArray arrayWithCapacity:_photos.count];
-//    self.picArr = [NSMutableArray arrayWithCapacity:_photos.count];
+    __block
+    __block NSMutableArray *keyArr = [NSMutableArray array];
+    __block NSMutableArray *picArr = [NSMutableArray array];
+    
     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];
+            __block NSData *imageData = UIImageJPEGRepresentation(image, 1);
+            NSString *timeTampStr = [self 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) {
+            [uploadManager putData:imageData 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];
+
+                    NSString *imageUrl = [NSString stringWithFormat:@"%@%@",API_PhotoUrl,key];
+                    NSMutableDictionary *picDic = [NSMutableDictionary dictionary];
+                    [picDic setObject:imageUrl ? imageUrl : @"" forKey:@"imageUrl"];
+                    [picDic setObject:[NSString stringWithFormat:@"%.0f",image.size.width] forKey:@"imageWidth"];
+                    [picDic setObject:[NSString stringWithFormat:@"%.0f",image.size.height] forKey:@"imageHeight"];
+                    [picArr addObject:picDic];
                     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);
-//                        }];
+                        id data = @{ @"images": picArr.copy };
+                        [strongSelf.photos removeAllObjects];
+                        // 帮助与反馈->产品建议App->h5图片urls
+                        [strongSelf.bridge callHandler:@"wjjSubmitSuccess" data:data responseCallback:^(id responseData) {
+                            if(TestEnvironment){
+                                NSLog(@"ObjC received response: %@", responseData);
+                            }
+                        }];
                     }
                 } else if (info.broken) {
@@ -543,15 +548,38 @@
             } option:nil];
         }
     }
-    
 }
 //获取当前时间戳
 - (NSString *)currentTimestamp{
-    NSDate * date = [NSDate dateWithTimeIntervalSinceNow:0];//获取当前时间0秒后的时间
-    NSTimeInterval time = [date timeIntervalSince1970];// *1000 是精确到毫秒，不乘就是精确到秒
-    NSString *timeString = [NSString stringWithFormat:@"%.0f", time];
-    return timeString;
+    NSDate *datenow = [NSDate date];
+    NSString *timeSp = [NSString stringWithFormat:@"%ld", (long)[datenow timeIntervalSince1970]];
+    return timeSp;
+
+}
+
+- (NSString *)get13tsRandTimeStr {
+    NSString *str1 = [NSString stringWithFormat:@"%d",arc4random() % 10];
+    NSString *str2 = [NSString stringWithFormat:@"%d",arc4random() % 10];
+    NSString *str3 = [NSString stringWithFormat:@"%d",arc4random() % 10];
+    NSString *str4 = [NSString stringWithFormat:@"%d",arc4random() % 10];
+    NSString *str5 = [NSString stringWithFormat:@"%d",arc4random() % 10];
+    NSString *str6 = [NSString stringWithFormat:@"%d",arc4random() % 10];
+    NSString *str7 = [NSString stringWithFormat:@"%d",arc4random() % 10];
+    NSString *str8 = [NSString stringWithFormat:@"%d",arc4random() % 10];
+    
+    NSString *randTimeStr = [NSString stringWithFormat:@"%@%@%@%@%@%@%@%@%@",[self currentTimestamp],str1,str2,str3,str4,str5,str6,str7,str8];
+    return randTimeStr;
+    
+}
+
+- (NSString *)getImageBuketkeyFromServerWithExt{
+//    NSString *spid = [CNLiveBusinessTools getSpid];
+//    NSString *imgBucketKey = [NSString stringWithFormat:@"%@/img", spid];
+//    NSString *yearTime = [CNLiveTimeTools getyyMMdd];
+//    NSString *bucketKey = [NSString stringWithFormat:@"%@/%@",imgBucketKey,yearTime];
+//    return bucketKey;
+    return @"";
 }