diff --git a/ProductApp/ProductApp.xcodeproj/project.pbxproj b/ProductApp/ProductApp.xcodeproj/project.pbxproj index 89e2e56..74e85ab 100644 --- a/ProductApp/ProductApp.xcodeproj/project.pbxproj +++ b/ProductApp/ProductApp.xcodeproj/project.pbxproj @@ -5659,7 +5659,7 @@ "$(PROJECT_DIR)/ProductApp/Other/语音/arm/lib", "$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib", ); - MARKETING_VERSION = 2.3.1; + MARKETING_VERSION = 2.5.0; PRODUCT_BUNDLE_IDENTIFIER = com.batiao.aiwrite; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -5730,7 +5730,7 @@ "$(PROJECT_DIR)/ProductApp/Other/语音/arm/lib", "$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib", ); - MARKETING_VERSION = 2.3.1; + MARKETING_VERSION = 2.5.0; PRODUCT_BUNDLE_IDENTIFIER = com.batiao.aiwrite; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index fcd645c..2cdf669 100644 Binary files a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate and b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index fb0dca5..2149e2f 100644 --- a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -36,5 +36,21 @@ landmarkType = "7"> + + + + diff --git a/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/Contents.json new file mode 100644 index 0000000..1522437 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43272@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43272@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/组 43272@2x.png b/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/组 43272@2x.png new file mode 100644 index 0000000..1973bb2 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/组 43272@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/组 43272@3x.png b/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/组 43272@3x.png new file mode 100644 index 0000000..1468d73 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/我的/zh_普通会员Y.imageset/组 43272@3x.png differ diff --git a/ProductApp/ProductApp/Other/MarkdownParser.m b/ProductApp/ProductApp/Other/MarkdownParser.m index e785427..5fe4529 100644 --- a/ProductApp/ProductApp/Other/MarkdownParser.m +++ b/ProductApp/ProductApp/Other/MarkdownParser.m @@ -50,7 +50,7 @@ DTDefaultTextColor:self.color, DTDefaultFontSize:@(self.font.pointSize), DTDefaultFontFamily:@"Helvetica Neue", - DTDefaultFontName:@"HelveticaNeue-Light" + DTDefaultFontName:@"HelveticaNeue" }; } return _DTCoreText_options; diff --git a/ProductApp/ProductApp/Other/ViewLable.m b/ProductApp/ProductApp/Other/ViewLable.m index 90660c5..a2e1e1f 100644 --- a/ProductApp/ProductApp/Other/ViewLable.m +++ b/ProductApp/ProductApp/Other/ViewLable.m @@ -35,7 +35,7 @@ if(!_style) { NSMutableParagraphStyle *style = [NSMutableParagraphStyle new]; - style.lineSpacing = 5; + style.lineSpacing = 5.2; style.lineBreakMode = NSLineBreakByWordWrapping; style.alignment = NSTextAlignmentLeft; _style = style; diff --git a/ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.h b/ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.h index 62b7c8d..9cc0f01 100644 --- a/ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.h +++ b/ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.h @@ -772,7 +772,14 @@ NS_ASSUME_NONNULL_BEGIN ID:(NSString *)ID Callback:(completeModeBlock)callback; - +/* + 删除保存记录 + /api/batch/correct/save + id + */ ++ (void)requestBatchCorrectDelData:(UIView *)view + ID:(NSString *)ID + Callback:(completeModeBlock)callback; @end diff --git a/ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.m b/ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.m index 8785333..6d92355 100644 --- a/ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.m +++ b/ProductApp/ProductApp/ProductMain/NetWorkManager/NetWorkManager.m @@ -2381,5 +2381,40 @@ }]; } +/* + 删除保存记录 + /api/batch/correct/save + id + */ ++ (void)requestBatchCorrectDelData:(UIView *)view + ID:(NSString *)ID + Callback:(completeModeBlock)callback +{ + NSMutableDictionary *dicQuery = [NSMutableDictionary new]; + [dicQuery setObject:[Tools isStringnil:ID] forKey:@"id"]; + + NSMutableDictionary *dicHeader = [NSMutableDictionary new]; + + NSMutableDictionary *dicpush = [NSMutableDictionary new]; + + [YSAPIClient requestWithRequestBaseUrl:BaseUrl Type:4 url:@"api/batch/correct/save" paraments:dicpush Headers:dicHeader Query:dicQuery completeBlock:^(id _Nullable responseObject, NSError * _Nullable error) { + BOOL state = NO; + NSString *describle = @""; + if (responseObject==nil) { + describle = @"网络错误"; + BaseModel *model = [BaseModel new]; + model.message =describle; + callback(state,model,describle); + }else{ + NSDictionary *dicAll=responseObject; + describle = dicAll[@"message"]; + if ([[NSString stringWithFormat:@"%@",dicAll[@"code"]] intValue] == 0) { + state = YES; + } + callback(state,[BaseModel yy_modelWithJSON:dicAll],describle); + } + }]; +} + @end diff --git a/ProductApp/ProductApp/ProductMain/引导/StartViewController.m b/ProductApp/ProductApp/ProductMain/引导/StartViewController.m index 7ce7f97..cec6d52 100644 --- a/ProductApp/ProductApp/ProductMain/引导/StartViewController.m +++ b/ProductApp/ProductApp/ProductMain/引导/StartViewController.m @@ -59,15 +59,16 @@ [self.navigationController setNavigationBarHidden:YES animated:NO]; ///获取所有字体 -// NSArray* familys = [UIFont familyNames]; -// for (int i = 0; i<[familys count]; i++) { -// NSString* family = [familys objectAtIndex:i]; -// NSLog(@"\r\n\r\nFontfamily:%@\r\n=====",family); -// NSArray* fonts = [UIFont fontNamesForFamilyName:family]; -// for (int j = 0; j<[fonts count]; j++) { -// NSLog(@"%@",[fonts objectAtIndex:j]); -// } -// } + NSArray* familys = [UIFont familyNames]; + for (int i = 0; i<[familys count]; i++) { + NSString* family = [familys objectAtIndex:i]; + NSLog(@"\r\n\r\nFontfamily:%@\r\n=====",family); + NSArray* fonts = [UIFont fontNamesForFamilyName:family]; + for (int j = 0; j<[fonts count]; j++) { + NSLog(@"%@",[fonts objectAtIndex:j]); + } + } + UIImageView *imgvback = [[UIImageView alloc] init]; [imgvback setImage:[UIImage imageNamed:@"yd_back"]]; diff --git a/ProductApp/ProductApp/ProductMain/引导/view/StartGNView.m b/ProductApp/ProductApp/ProductMain/引导/view/StartGNView.m index dbaeca6..65fe45e 100644 --- a/ProductApp/ProductApp/ProductMain/引导/view/StartGNView.m +++ b/ProductApp/ProductApp/ProductMain/引导/view/StartGNView.m @@ -15,6 +15,7 @@ #import "RoleTreeModel.h" #import "BaseViewController.h" +#import "StartPayViewController.h" @interface StartGNView () /// @@ -331,9 +332,18 @@ } else {///职员 - [UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"PPT" extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]]; - StartZNPPTViewController *vc = [StartZNPPTViewController new]; - [self.viewController.navigationController pushViewController:vc animated:YES]; + if(self.pagec.selectNumber==0) + { + [UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"PPT" extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]]; + StartZNPPTViewController *vc = [StartZNPPTViewController new]; + [self.viewController.navigationController pushViewController:vc animated:YES]; + } + else + { + StartPayViewController *vc = [StartPayViewController new]; + vc.source = @"guide_workplace_create_ppt"; + [self.viewController.navigationController pushViewController:vc animated:YES]; + } } } diff --git a/ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m b/ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m index 914e5b9..3a03f03 100644 --- a/ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m +++ b/ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m @@ -12,6 +12,7 @@ #import "StartZNPPTHUDAlter.h" #import "StartZNPPTDaGangViewController.h" #import "NetWorkManager.h" +#import "StartPayViewController.h" @interface StartZNPPTView () @property (nonatomic, strong) JhtBannerScrollView *bannerView; @@ -269,6 +270,7 @@ -(void)nextAction { + [LoadAlterView show]; ExamplePptModelDataItems *model = self.arrdata[self.bannerView.currentIndex]; diff --git a/ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/cell/ZhangHuGuanLiTableViewCell.m b/ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/cell/ZhangHuGuanLiTableViewCell.m index 577557f..069a713 100644 --- a/ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/cell/ZhangHuGuanLiTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/cell/ZhangHuGuanLiTableViewCell.m @@ -68,6 +68,7 @@ [lbname mas_makeConstraints:^(MASConstraintMaker *make) { make.left.equalTo(imgvhead.mas_right).offset(12); make.top.equalTo(imgvhead).offset(2); + make.width.lessThanOrEqualTo(@(100)); }]; _lbname = lbname; diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/PiLiangXiuGaiLiShiViewController.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/PiLiangXiuGaiLiShiViewController.m index 876ff7a..2e55c99 100644 --- a/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/PiLiangXiuGaiLiShiViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/PiLiangXiuGaiLiShiViewController.m @@ -102,7 +102,10 @@ [cell setBackgroundColor:[UIColor clearColor]]; } cell.model = self.arrdata[indexPath.row]; - + [cell setBackValueDel:^(BatchStatusByidModelDataItems * _Nonnull model) { + [self.arrdata removeObject:model]; + [self.tableView reloadData]; + }]; return cell; } -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.h index 23e9626..db64380 100644 --- a/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.h +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.h @@ -9,11 +9,13 @@ #import "BatchStatusByidModel.h" NS_ASSUME_NONNULL_BEGIN - +typedef void(^PiLiangXiuGaiLiShiTableViewCellBackDel)(BatchStatusByidModelDataItems *model); @interface PiLiangXiuGaiLiShiTableViewCell : UITableViewCell /// @property (nonatomic , strong) BatchStatusByidModelDataItems *model; +/// +@property (nonatomic , strong) PiLiangXiuGaiLiShiTableViewCellBackDel backValueDel; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.m index f1fff21..f484811 100644 --- a/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.m @@ -8,6 +8,10 @@ #import "PiLiangXiuGaiLiShiTableViewCell.h" #import "PingYuAlterView.h" +#import "NomoAlterView.h" + +#import "NetWorkManager.h" + @interface PiLiangXiuGaiLiShiTableViewCell () @property (nonatomic , strong) UIImageView *imgvback; @@ -35,6 +39,9 @@ }]; [Tools normalShadow:viewback shadowColor:RGBACOLOR(0, 80, 106, 0.1) shadowOpacity:0 cornerRadius:8 shadowRadius:10]; + UILongPressGestureRecognizer *gesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longCellAction:)]; + [viewback addGestureRecognizer:gesture]; + UIImageView *imgvback = [[UIImageView alloc] init]; [viewback addSubview:imgvback]; [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { @@ -195,4 +202,32 @@ [PingYuAlterView showInfo:self.model.comment]; } +-(void)longCellAction:(UIGestureRecognizer *)gesture +{ + if(gesture.state==UIGestureRecognizerStateBegan) + { + [NomoAlterView showInfo:[NSString stringWithFormat:@"是否删除‘%@’",self.model.title] SelectTag:^(NSInteger tag) { + if(tag==1) + { + [LoadAlterView show]; + [NetWorkManager requestBatchCorrectDelData:self ID:self.model.ID Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) { + [LoadAlterView dismiss]; + if(state) + { + if(self.backValueDel) + { + self.backValueDel(self.model); + } + } + else + { + [HXHud showMessage:responseObject.message afterDelayType:1]; + } + }]; + } + }]; + } + +} + @end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.m index 33aa1aa..8bdcd38 100644 --- a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.m @@ -31,7 +31,7 @@ [imgvback setImage:[UIImage imageNamed:@"plpg_backhd"]]; [self.view addSubview:imgvback]; [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(imgvback); + make.left.right.top.equalTo(self.view); }]; [self.view sendSubviewToBack:imgvback]; diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.m index 3273c3f..98c8c03 100644 --- a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.m +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.m @@ -110,7 +110,7 @@ [field setBackDidTextValue:^(NSString * _Nonnull value) { if(self.strfenBig.intValue>0) { - self.lbtsfen.text = [NSString stringWithFormat:@"%@/%@分",value,self.strfenBig]; + self.lbtsfen.text = [NSString stringWithFormat:@"%d/%@分",value.intValue+self.strfenNow.intValue,self.strfenBig]; [self refShowFen:self.lbtsfen]; } }]; diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m index f5a5666..c3eed3d 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m @@ -140,6 +140,7 @@ make.height.offset(66+(UISCREEN_WIDTH-70)/3.0*140/102); }]; [viewImages setHidden:YES]; + viewImages.ispiliangpigai = self.ispiliangpigai; _viewImages = viewImages; [viewImages setBackValue:^{ if(self.arrData.count==0) @@ -291,7 +292,7 @@ { [btjiaoyan setSelected:YES]; } - [btjiaoyan setHidden:!self.ispiliangpigai]; +// [btjiaoyan setHidden:!self.ispiliangpigai]; [btjiaoyan setEnlargeEdgeWithTop:5 right:5 bottom:5 left:5]; UIButton *btshili = [[UIButton alloc] init]; @@ -310,6 +311,7 @@ }]; [btshili setIconInLeftWithSpacing:4]; [btshili addTarget:self action:@selector(shiliAction) forControlEvents:UIControlEventTouchUpInside]; + [btshili setHidden:self.ispiliangpigai]; } -(void)backAction @@ -448,22 +450,25 @@ ///1作文批改 2拍照写作 3课堂写作 if(self.type==1) { - [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) { - if(self.ispiliangpigai) - {///批量批改详情 - if(self.backImages) - { - self.backImages(arrImgages); - } - [self.navigationController popViewControllerAnimated:YES]; - } - else + [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:YES back:^(BOOL value) { + if(value) { - StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; - view.type = 1; - view.arrXZImages = arrImgages; - view.isquanxian = value; - [self.view addSubview:view]; + if(self.ispiliangpigai) + {///批量批改详情 + if(self.backImages) + { + self.backImages(arrImgages); + } + [self.navigationController popViewControllerAnimated:YES]; + } + else + { + StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + view.type = 1; + view.arrXZImages = arrImgages; + view.isquanxian = value; + [self.view addSubview:view]; + } } }]; } diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/YJMosaiView/MosaiView.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/YJMosaiView/MosaiView.m index 6c72621..fb0f576 100755 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/YJMosaiView/MosaiView.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/YJMosaiView/MosaiView.m @@ -115,7 +115,7 @@ self.shapeLayer.lineJoin = kCALineJoinRound; self.shapeLayer.lineWidth = 15.0f;///画笔大小 self.shapeLayer.strokeColor = [[UIColor blueColor] CGColor]; - self.shapeLayer.fillColor = [UIColor whiteColor].CGColor; + self.shapeLayer.fillColor = [UIColor clearColor].CGColor; [self.layer addSublayer:self.shapeLayer]; self.mosaicImageLayer.mask = self.shapeLayer; @@ -149,6 +149,7 @@ UITouch *touch = [touches anyObject]; CGPoint point = [touch locationInView:self]; CGPathAddLineToPoint(self.path, NULL, point.x, point.y); + CGMutablePathRef path = CGPathCreateMutableCopy(self.path); self.shapeLayer.path = path; CGPathRelease(path); @@ -336,7 +337,7 @@ UIColor *pureColor = [UIColor whiteColor]; // 设置图片的纯色为红色 // 开始图形上下文 - UIGraphicsBeginImageContextWithOptions(sourceImage.size, NO, 0.0); + UIGraphicsBeginImageContextWithOptions(sourceImage.size, YES, 1.0); // 使用纯色填充图形上下文 [pureColor setFill]; diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/cell/CamreImagesCollectionViewCell.h b/ProductApp/ProductApp/ProductMain/首页/自定义相机/cell/CamreImagesCollectionViewCell.h index 84f0467..6358bab 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/cell/CamreImagesCollectionViewCell.h +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/cell/CamreImagesCollectionViewCell.h @@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic , strong) UILabel *lbnumber; /// @property (nonatomic , strong) UIButton *btdel; +@property (nonatomic , strong) UIButton *btselect ; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/cell/CamreImagesCollectionViewCell.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/cell/CamreImagesCollectionViewCell.m index 0cb1f5d..1dda2f6 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/cell/CamreImagesCollectionViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/cell/CamreImagesCollectionViewCell.m @@ -48,6 +48,13 @@ [lbnumber.layer setCornerRadius:10]; _lbnumber = lbnumber; + UIButton *btselect = [[UIButton alloc] init]; + [viewback addSubview:btselect]; + [btselect mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(viewback); + }]; + _btselect = btselect; + UIButton *btdel = [[UIButton alloc] init]; [btdel setImage:[UIImage imageNamed:@"cam_del"] forState:UIControlStateNormal]; [viewback addSubview:btdel]; diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.h b/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.h index eaeb5c4..54dd167 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.h +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.h @@ -14,6 +14,8 @@ typedef void(^CamreImagesViewBack)(void); @property (nonatomic , strong) NSMutableArray *arrdata; /// @property (nonatomic , strong) CamreImagesViewBack backValue; +///是否是批量批改 +@property (nonatomic , assign) BOOL ispiliangpigai; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.m index 1fea5c9..2c0c544 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.m @@ -7,7 +7,7 @@ #import "CamreImagesView.h" #import "CamreImagesCollectionViewCell.h" - +#import "ImageEditDrawViewController.h" @interface CamreImagesView () /// @@ -43,7 +43,7 @@ [collect setDelegate:self]; [collect setDataSource:self]; [collect setBackgroundColor:[UIColor clearColor]]; - collect.userInteractionEnabled = YES; +// collect.userInteractionEnabled = YES; [self addSubview:collect]; [collect mas_makeConstraints:^(MASConstraintMaker *make) { make.left.offset(0); @@ -111,7 +111,28 @@ [self.collect reloadData]; self.backValue(); } - +-(void)selectAction:(UIButton *)sender +{ + if(self.ispiliangpigai==NO)return; + ///做选中操作 + ImageEditDrawViewController *vc = [ImageEditDrawViewController new]; + vc.arrImages = [NSMutableArray arrayWithObject:self.arrdata[sender.tag]]; + [self.viewController.navigationController pushViewController:vc animated:NO]; + [vc setBackValue:^(NSMutableArray * _Nonnull arrimages) { + @try { + self.arrdata[sender.tag] = arrimages.firstObject; + } @catch (NSException *exception) { + + } @finally { + + } + [self.collect reloadData]; + if(self.backValue) + { + self.backValue(); + } + }]; +} #pragma mark - UICollectionView - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { @@ -127,6 +148,9 @@ [cell.btdel setTag:indexPath.row]; [cell.btdel addTarget:self action:@selector(delAction:) forControlEvents:UIControlEventTouchUpInside]; + [cell.btselect setTag:indexPath.row]; + [cell.btselect addTarget:self action:@selector(selectAction:) forControlEvents:UIControlEventTouchUpInside]; + return cell; } //定义每个section的间距 @@ -149,7 +173,6 @@ } -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - ///做选中操作 }