0.1.6

liushiyu
1 parent da606275
Showing 6 changed files with 43 additions and 2 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.1.5'
+  s.version          = '0.1.6'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -117,6 +117,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *totalFee;
 @property (nonatomic, copy) NSString *intentBeginTime;
 @property (nonatomic, copy) NSString *remark;
+@property (nonatomic, copy) NSString *img;
+@property (nonatomic, strong) NSMutableArray *imgs;
 @property (nonatomic, strong) NSNumber *createTime;
 @property (nonatomic, copy) NSString *createTimeString;
 @property (nonatomic, copy) NSString *repairName;
@@ -162,6 +162,11 @@ MJCodingImplementation
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.createTimeString = [dateFormatter stringFromDate:detaildate];
     }
+    if ([property.name isEqualToString:@"img"] && ![oldValue isKindOfClass:NSNull.class] && [oldValue isNotBlank]) {
+        NSString * img_str = (NSString *)oldValue;
+        self.imgs = [img_str componentsSeparatedByString:@","].mutableCopy;
+        [self.imgs removeObject:@""];
+    }
     return oldValue;
 }
@@ -56,6 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) QMUIButton * statueButton;
 @property (nonatomic, strong) UILabel * lineLabel;
 @property (nonatomic, strong) UILabel * priceLabel;
+@property (nonatomic, strong) NSMutableArray * tempArray;
 @property (nonatomic, strong) CNLiveCommuntyActivityRepairListModel * repairModel;
@@ -450,6 +450,25 @@
         [self.mainView addSubview:self.statueButton];
         [self.mainView addSubview:self.lineLabel];
         [self.mainView addSubview:self.priceLabel];
+        
+        self.tempArray = [[NSMutableArray alloc] init];
+        for (int i = 0; i < 3; i++) {
+            UIImageView * imageView = [[UIImageView alloc] initWithFrame:CGRectZero];
+            imageView.backgroundColor = UIColorHex(#f9f9f9);
+            imageView.tag = 1000 + i;
+            imageView.hidden = YES;
+            imageView.layer.cornerRadius = 7;
+            imageView.layer.masksToBounds = YES;
+            imageView.contentMode = UIViewContentModeScaleAspectFill;
+            [imageView setUserInteractionEnabled:YES];
+            __weak typeof(self) weakSelf = self;
+            [imageView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithActionBlock:^(UITapGestureRecognizer *  _Nonnull sender) {
+                UIImageView * imageView = (UIImageView *)sender.view;
+                [CNLivePhotoBrowser photoBrowserForDefultWithSourceViews:weakSelf.tempArray MediaURLArray:weakSelf.repairModel.imgs CurrentIndex:imageView.tag - 1000 ShowType:CNLivePhotoBrowserShowTypeImage Sheet:nil CompleterBlock:NULL];
+            }]];
+            [self.mainView addSubview:imageView];
+            [self.tempArray addObject:imageView];
+        }
     }
     return self;
 }
@@ -488,6 +507,12 @@
         make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(10);
         make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-10);
     }];
+    
+    [self.tempArray mas_distributeViewsAlongAxis:MASAxisTypeHorizontal withFixedSpacing:10 leadSpacing:10 tailSpacing:10];
+    [self.tempArray mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(weakSelf.mainView.mas_bottom).offset(-10);
+        make.height.mas_equalTo((kScreenWidth - 60)/3);
+    }];
 }
 -(void)setRepairModel:(CNLiveCommuntyActivityRepairListModel *)repairModel
 {
@@ -499,6 +524,13 @@
     self.dateLabel.text = [NSString stringWithFormat:@"下单时间:%@",repairModel.createTimeString];
     [_statueButton setTitle:repairModel.statusString forState:UIControlStateNormal];
     [_statueButton setTitleColor:![repairModel.status isEqualToString:@"3"]?UIColorHex(#FD862E):UIColorHex(#797979) forState:UIControlStateNormal];
+    
+    for (int i = 0; i < self.repairModel.imgs.count; i++) {
+        NSString * imageUrl = self.repairModel.imgs[i];
+        UIImageView * imageView = self.tempArray[i];
+        imageView.hidden = NO;
+        [imageView sd_setImageWithURL:[NSURL URLWithString:imageUrl] placeholderImage:[UIImage imageWithColor:UIColorHex(#f9f9f9)]];
+    }
 }
 #pragma mark -
@@ -211,7 +211,8 @@
     }
     if (self.showType == CNLiveCommuntListShowTypeRepair) {
         CNLiveCommuntyActivityRepairListModel * repairModel = self.dataArray[indexPath.row];
-        return [repairModel.status isEqualToString:@"3"] && [repairModel.totalFee integerValue] > 0?110.0:70.0;
+        CGFloat itemW = repairModel.imgs.count > 0 ?  (kScreenWidth - 60)/3 + 20 : 0;
+        return ([repairModel.status isEqualToString:@"3"] && [repairModel.totalFee integerValue] > 0?110.0:70.0) + itemW;
     }
     return 0.001;
 }