Merge branch 'master' of ssh://193.112.35.168:29418/fanliquan

重庆迈尖科技有限公司

2018-08-20 bde0ee9f2ac37bcd4cd4fb6554615d73e217e1e2

Merge branch 'master' of ssh://193.112.35.168:29418/fanliquan

# Conflicts:
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ

 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -77,5 +77,15 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            scope = "0"
            stopOnStyle = "0">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
</Bucket>

 MIduo/界面/邀请/InviteViewCell/InviteThreeCell.m

@@ -29,6 +29,10 @@
/// 濂栭噾
@property (nonatomic, strong, nullable) UILabel *bonusPricelabel;

@property (nonatomic, assign) NSInteger indexCount;

@property (nonatomic, assign) NSInteger count;

@end

@implementation InviteThreeCell
@@ -90,18 +94,35 @@
    
    if (model) {
        
        self.indexCount = model.inviteGetMoneyList.count;
        
        if (self.indexCount > 5) {
            
            self.indexCount = 5;
        }
        
//        self.count = [self.bgView subviews].count;
//
//        if (self.count != 0) {
//
//            for (int i = 0; i < self.indexCount; i++) {
//
//                ((UIImageView *)[[self.bgView subviews][i] subviews][0]).image = [UIImage imageNamed:self.gradArr[i]];
//
//                [((UIImageView *)[[self.bgView subviews][i] subviews][1]) setYthImageWithURL:((InviteGetMoneyListModel *)(model.inviteGetMoneyList[i])).portrait placeholderImage:[UIImage imageNamed:@"榛樿澶村儚"]];
//
//                ((UILabel *)[[self.bgView subviews][i] subviews][2]).text = ((InviteGetMoneyListModel *)(model.inviteGetMoneyList[i])).name;
//
//                ((UILabel *)[[self.bgView subviews][i] subviews][2]).text = [NSString stringWithFormat:@"楼%@",((InviteGetMoneyListModel *)(model.inviteGetMoneyList[i])).money];
//            }
//
//        } else {
        
        for (UIView *view in [self.bgView subviews]) {
            [view removeFromSuperview];
        }
        
        NSInteger indexCount = model.inviteGetMoneyList.count;
        
        if (indexCount > 5) {
            
            indexCount = 5;
        }
        
        for (int i = 0; i < indexCount; i++) {
            for (int i = 0; i < self.indexCount; i++) {
            
            self.articleView = [[UIView alloc] init];
            self.articleView.layer.masksToBounds = YES;
@@ -167,6 +188,7 @@
            
            [self.bonusPricelabel setSingleLineAutoResizeWithMaxWidth:120];
        }
        //}
    }
}


 MIduo/界面/邀请/InviteViewCell/InviteTwoCell.m

@@ -12,6 +12,8 @@

@property (nonatomic, strong, nullable) UIImageView *bgImgView;

@property (nonatomic, assign) CGFloat setHeight;

@end

@implementation InviteTwoCell
@@ -44,19 +46,19 @@

- (void)cellConfig {
    
    CGFloat setHeight = 0;
     self.setHeight = 0;
    
    if (SCREEN_WIDTH > 375) {
        
        setHeight = (SCREEN_WIDTH - currentWidth) + currentHeight;
        self.setHeight = (SCREEN_WIDTH - currentWidth) + currentHeight;
        
    } else if (SCREEN_WIDTH < 375) {
        
         setHeight = currentHeight - (currentWidth - SCREEN_WIDTH);
         self.setHeight = currentHeight - (currentWidth - SCREEN_WIDTH);
        
    } else {
        
        setHeight = currentHeight;
        self.setHeight = currentHeight;
    }
    
    [self.contentView addSubview:self.bgImgView];
@@ -64,7 +66,7 @@
    .rightSpaceToView(self.contentView, 0)
    .topSpaceToView(self.contentView, 0)
    .leftSpaceToView(self.contentView, 0)
    .heightIs(setHeight);
    .heightIs(self.setHeight);
}

#pragma mark --- getter ---

 MIduo/界面/邀请/MainInviteViewController.m

@@ -35,8 +35,6 @@

@property (nonatomic, strong) MainInviteModel *model;

@property (nonatomic, strong) NSAttributedString *attributedString;

@property (nonatomic, copy) NSString *series;

@property (nonatomic, strong) UIView *primtView;
@@ -221,7 +219,11 @@
                                        reuseIdentifier:cellIden];
        }
        cell.uid = [[NSUserDefaults standardUserDefaults] objectForKey:@"userId"];
        
        if (self.model) {
            
        cell.model = self.model;
        }
        
        // 鎴戠殑闃熷憳
        @weakify(self)
@@ -276,13 +278,17 @@
            cell = [[InviteThreeCell alloc] initWithStyle:UITableViewCellStyleDefault
                                          reuseIdentifier:cellIden];
        }
        
        if (self.model) {
            
        cell.model = self.model;
        }
        
        return cell;
        
    } else {
        
        NSString *cellIden = @"iuITableViewCell";
        NSString *cellIden = @"invitewFourCell";
        InvitewFourCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIden];
        
        if (!cell) {
@@ -290,9 +296,11 @@
            cell = [[InvitewFourCell alloc] initWithStyle:UITableViewCellStyleDefault
                                          reuseIdentifier:cellIden];
        }
        cell.model = self.model;
        
        cell.remainNumStr = self.attributedString;
        if (self.model) {
            
            cell.model = self.model;
        }
        
        return cell;
    }