检查项 上传图片

Macalline.xcodeproj/project.pbxproj

@@ -936,7 +936,7 @@
 				ORGANIZATIONNAME = JianjiYuan;
 				TargetAttributes = {
 					09CD6F931A2C46B300A581BA = {
-						DevelopmentTeam = W54V2VB863;
+						DevelopmentTeam = 4WRSWKXL27;
 					};
 					09CD6FAE1A2C46B300A581BA = {
 						DevelopmentTeam = C237GFQJK4;
@@ -1273,8 +1273,8 @@
 			baseConfigurationReference = 9DF2AE748F48D7C21F3300FE /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: jie zhang (9V9955H2BK)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Macalline/Macalline-Prefix.pch";
@@ -1284,7 +1284,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.macalline;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "1167b943-9098-47a9-b05a-c0dd6682858f";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "1167b943-9098-47a9-b05a-c0dd6682858f";
 				SDKROOT = iphoneos;
 				VALID_ARCHS = "arm64 armv7";
 				WRAPPER_EXTENSION = app;
@@ -1296,7 +1296,7 @@
 			baseConfigurationReference = 416BF2437F5E4BB7D7F8A2AF /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1307,7 +1307,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.macalline;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "1167b943-9098-47a9-b05a-c0dd6682858f";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "1167b943-9098-47a9-b05a-c0dd6682858f";
 				SDKROOT = iphoneos;
 				VALID_ARCHS = "arm64 armv7";
 				WRAPPER_EXTENSION = app;

Macalline/Classes/Utilities/BRNetworkMgr.m

@@ -140,6 +140,7 @@
         default:
             manager.responseSerializer = [AFJSONResponseSerializer serializer];
     }
+    manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/html"];
     
     NSString *legalStrURL = [strURL stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     DLog(@"legalStrURL  %@\n params %@", legalStrURL, params);
@@ -169,7 +170,7 @@
                                     } error:nil];
     
     
-    AFHTTPRequestOperation *operation = [[AFHTTPRequestOperationManager manager] HTTPRequestOperationWithRequest:request success:^(AFHTTPRequestOperation *operation, id responseObject){
+    AFHTTPRequestOperation *operation = [manager HTTPRequestOperationWithRequest:request success:^(AFHTTPRequestOperation *operation, id responseObject){
         [self operationDidSucceed:operation result:responseObject];
     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
         [self operationDidFailed:operation result:error];
@@ -179,6 +180,7 @@
     [self.operationQueue addOperation:operation];
     [self.operationQueue setSuspended:YES];
     [operation pause];
+    
     return operation;
 }
 

Macalline/Classes/ViewControllers/BigArea/BATask/BATaskCheckViewController.m

@@ -744,7 +744,7 @@
         _scrollVContainer.showsHorizontalScrollIndicator = NO;
         _scrollVContainer.showsVerticalScrollIndicator = YES;
         
-        _scrollVContainer.backgroundColor = [UIColor clearColor];
+        _scrollVContainer.backgroundColor = [UIColor whiteColor];
         [self.view addSubview:_scrollVContainer];
     }
     return _scrollVContainer;

Macalline/Classes/ViewControllers/ImageBrowser/ImageBrowserViewController.m

@@ -65,13 +65,14 @@ UICollectionViewDataSource, UICollectionViewDelegate, MWPhotoBrowserDelegate, Im
     [self.navigationController navbarLeftItemCustomized:@[btnBack] onwer:self.navigationItem];
     
     [self.collectionView autoPinEdgesToSuperviewEdgesWithInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
-    
+    [self.collectionView registerClass:[ImageBrowserCell class] forCellWithReuseIdentifier:@"ImageBrowserCell"];
     [self reloadImageDatas];
     
     if (self.photoSource == ImageBrowserPhotoSourceAsset)
     {
         [self loadAssets];
     }
+//    self.view.backgroundColor = [UIColor blueColor];
     
 }
 
@@ -114,9 +115,9 @@ UICollectionViewDataSource, UICollectionViewDelegate, MWPhotoBrowserDelegate, Im
                  cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     ImageBrowserCell *myCell = [collectionView
-                                    dequeueReusableCellWithReuseIdentifier:@"ImageBrowserCell"
-                                      forIndexPath:indexPath];
-
+                                dequeueReusableCellWithReuseIdentifier:@"ImageBrowserCell"
+                                forIndexPath:indexPath];
+    NSLog(@"%p", myCell);
     ImageBrowserObj *obj = _arrContents[indexPath.row];
     UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapProfileImage:)];
     singleTap.numberOfTapsRequired = 1;
@@ -142,8 +143,8 @@ UICollectionViewDataSource, UICollectionViewDelegate, MWPhotoBrowserDelegate, Im
         }
         obj.isDeletable=YES;
     }
-   //if ((self.editing && obj.isDeletable) || (obj.isDeletable && obj.isShaking))
-      if ((self.editing && obj.isDeletable) )
+    //if ((self.editing && obj.isDeletable) || (obj.isDeletable && obj.isShaking))
+    if ((self.editing && obj.isDeletable) )
     {
         [myCell beginShake];
         obj.isShaking = YES;
@@ -160,7 +161,7 @@ UICollectionViewDataSource, UICollectionViewDelegate, MWPhotoBrowserDelegate, Im
     myCell.imageVPhoto.tag = [indexPath row];
     myCell.btnDelete.tag = indexPath.row;
     myCell.btnDelete.hidden = !(obj.isDeletable && obj.isShaking);
-
+    
     
     
     
@@ -170,7 +171,7 @@ UICollectionViewDataSource, UICollectionViewDelegate, MWPhotoBrowserDelegate, Im
     
     if (obj.imageSavedData) {
         myCell.imageVPhoto.image = [UIImage imageWithData:obj.imageSavedData scale:0.3];
-     
+        
     }else {
         switch (obj.sourceType) {
             case ImageSourceTypeBundle:
@@ -193,10 +194,10 @@ UICollectionViewDataSource, UICollectionViewDelegate, MWPhotoBrowserDelegate, Im
             default:
                 break;
         }
-
+        
     }
     
-
+    
     
     return myCell;
     

Macalline/Classes/ViewControllers/Task/TaskCheckViewController.m

@@ -55,7 +55,7 @@
 @property (nonatomic,strong) UILabel *lblpicNum;
 
 @end
-@interface TaskCheckViewController () < ImageBrowserDelegate ,UIGestureRecognizerDelegate>
+@interface TaskCheckViewController () < ImageBrowserDelegate ,UIGestureRecognizerDelegate, BRNetworkMgrDelegate>
 {
     UIView *viewExample;
     NSLayoutConstraint *layoutCtScrollBottm;
@@ -126,6 +126,7 @@
     viewExample.backgroundColor = [UIColor whiteColor];
 
     [viewExample addSubview:self.vcImageBExample.view];
+//    self.vcImageBExample.collectionView.backgroundColor = [UIColor redColor];
     [self addChildViewController:_vcImageBExample];
     [self.scrollVContainer addSubview:viewExample];
     

Macalline/Classes/ViewControllers/Task/TaskUploadViewController.m

@@ -214,13 +214,13 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
 }
 - (void)setViewLayoutConstraint
 {
-    [self.viewDesc autoPinEdgesToSuperviewEdgesWithInsets:UIEdgeInsetsMake(0, 0, 0, 0) excludingEdge:ALEdgeBottom];
-    [self.viewDesc autoSetDimension:ALDimensionHeight toSize:0];
+//    [self.viewDesc autoPinEdgesToSuperviewEdgesWithInsets:UIEdgeInsetsMake(0, 0, 0, 0) excludingEdge:ALEdgeBottom];
+//    [self.viewDesc autoSetDimension:ALDimensionHeight toSize:0];
 
     
     [self.viewCheck autoPinEdgeToSuperviewEdge:ALEdgeLeft];
     [self.viewCheck autoPinEdgeToSuperviewEdge:ALEdgeRight];
-    [self.viewCheck autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.viewDesc];
+    [self.viewCheck autoPinEdgeToSuperviewEdge:ALEdgeTop];
     [self.viewCheck autoSetDimension:ALDimensionHeight toSize:150];
 
     
@@ -417,7 +417,13 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
             continue;
         }
         if (imageObj.imageSavedData) {
-            [imageObj.imageSavedData writeToFile:imageObj.imagePath atomically:YES];
+            //增加对路径是否存在的判断，不存在则创建
+            NSFileManager *fileManager = [NSFileManager defaultManager];
+            if (![fileManager fileExistsAtPath:kImageCachePath]) {
+                [fileManager createDirectoryAtPath:kImageCachePath withIntermediateDirectories:YES attributes:nil error:nil];
+            }
+           BOOL isWriteSuccess = [imageObj.imageSavedData writeToFile:imageObj.imagePath atomically:YES];
+            NSLog(@"%d", isWriteSuccess);
         }
         NSString *imagePath = [NSString stringWithFormat:@"%@/%@", kImageCachePath, imageObj.imageName];
         [arrImages addObject:@{@"id":imageObj.imageId, @"type":type, @"checkPointId":self.checkPointRecordId?:@"",