bug修改

HappyJob/HappyJob/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -57,19 +57,19 @@
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "icon-20@2x-ipad.png",
+      "filename" : "icon-20@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon-29-ipad.png",
+      "filename" : "icon-29.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon-29@2x-ipad.png",
+      "filename" : "icon-29@2x-1.png",
       "scale" : "2x"
     },
     {

HappyJob/HappyJob/CClass/Home_首页/HJWebViewController.m

@@ -33,9 +33,14 @@
     [self.view addSubview:self.webView];
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
        
-        make.left.right.top.bottom.equalTo(self.view).offset(0);
+        make.left.equalTo(self.view.mas_left).offset(0);
+        make.right.equalTo(self.view.mas_right).offset(0);
+        make.top.bottom.equalTo(self.view).offset(0);
     }];
      [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
+    self.webView.scalesPageToFit = YES;
+    
+
     
 }
 

HappyJob/HappyJob/CClass/JobList_工作列表信息/FullTime_全职工作/HJFullTimeTableViewCell.m

@@ -79,7 +79,7 @@
         
         make.top.equalTo(self.addressLabel.mas_bottom).offset(15);
         make.right.equalTo(self.mas_right).offset(-15);
-        make.size.mas_offset(CGSizeMake(20, 20));
+        make.size.mas_offset(CGSizeMake(20, 20));//20
     }];
     [self.welfareView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.bgView).offset(15);
@@ -190,7 +190,7 @@
     if (_openBtn == nil)
     {
         _openBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_openBtn setImage:[UIImage imageNamed:@"jobs_list_packup"] forState:UIControlStateNormal];
+//        [_openBtn setImage:[UIImage imageNamed:@"jobs_list_packup"] forState:UIControlStateNormal];
         [_openBtn addTarget:self action:@selector(openBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _openBtn;
@@ -200,6 +200,7 @@
     if (_welfareView == nil)
     {
         _welfareView = [[FBFlowLayoutView alloc] init];
+//        _welfareView.singleBool = YES;
         _welfareView.delegate = self;
         _welfareView.dataSource = self;
     }

HappyJob/HappyJob/CClass/JobList_工作列表信息/HJPositionDataBox.m

@@ -194,25 +194,7 @@ static NSString * const HJJoinTableViewCellIdentifier = @"HJJoinTableViewCell";
         {
             cell = [[HJFullTimeTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:HJFullTimeTableViewCellIdentifier];
         }
-         __weak typeof(cell)  weakCell = cell;
-       
-        cell.openBlock = ^{
-
-            [self dealwithPositionOpenAtIndexPath:indexPath];
-            [weakCell.welfareView reloadData];
-            [tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath,nil] withRowAnimation:UITableViewRowAnimationNone];
-            
-        };
-        if (model.isOpen)
-        {
-            cell.welfareView.numberOfLines = 0;
-            [cell.openBtn setImage:[UIImage imageNamed:@"jobs_list_packup"] forState:UIControlStateNormal];
-        }
-        else
-        {
-            cell.welfareView.numberOfLines = 1;
-            [cell.openBtn setImage:[UIImage imageNamed:@"jobs_list_open"] forState:UIControlStateNormal];
-        }
+        
         cell.titleLabel.text = model.positionName;
         //标记
         if (type == HJPositionTypeFatSalary)
@@ -284,9 +266,44 @@ static NSString * const HJJoinTableViewCellIdentifier = @"HJJoinTableViewCell";
             cell.maxMoneyLabel.text = nil;
             cell.hiddenMaxMoneyLabel = YES;
         }
+        
+        __weak typeof(cell)  weakCell = cell;
+        
+        cell.openBlock = ^{
+            
+            [self dealwithPositionOpenAtIndexPath:indexPath];
+            [weakCell.welfareView reloadData];
+            [tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath,nil] withRowAnimation:UITableViewRowAnimationNone];
+//            weakCell.openBtn.backgroundColor = [UIColor whiteColor];
+//            NSLog(@"::::::::::%d",weakCell.welfareView.singleBool);
+            
+        };
+        if (model.isOpen)
+        {
+            cell.welfareView.numberOfLines = 0;
+            [cell.openBtn setImage:[UIImage imageNamed:@"jobs_list_packup"] forState:UIControlStateNormal];
+        }
+        else
+        {
+            cell.welfareView.numberOfLines = 1;
+            [cell.openBtn setImage:[UIImage imageNamed:@"jobs_list_open"] forState:UIControlStateNormal];
+        }
         // 福利控件
         cell.welfareTagArray = [model getWelfareArray];
         
+        if (cell.welfareView.singleBool && cell.welfareView.numberOfLines == 1)
+        {   //单行不现实尖头
+            cell.openBtn.hidden = YES;
+        }
+        else
+        {
+            cell.openBtn.hidden = NO;
+        }
+        NSArray *welfareArray = [model getWelfareArray];
+        if (welfareArray.count <= 1)
+        {
+            cell.openBtn.hidden = YES;
+        }
         return cell;
     }
     else if (type == HJPositionTypePartTime || type == HJPositionTypeBenefit || type == HJPositionTypeBPartTime)
@@ -461,6 +478,19 @@ static NSString * const HJJoinTableViewCellIdentifier = @"HJJoinTableViewCell";
             cell.clockLabel.attributedText = clockString;
         }
         
+        if (cell.welfareView.singleBool && cell.welfareView.numberOfLines == 1)
+        {   //单行不现实尖头
+            cell.openBtn.hidden = YES;
+        }
+        else
+        {
+            cell.openBtn.hidden = NO;
+        }
+        NSArray *welfareArray = [model getWelfareArray];
+        if (welfareArray.count <= 1)
+        {
+            cell.openBtn.hidden = YES;
+        }
         return cell;
     }
     else

HappyJob/HappyJob/CClass/JobList_工作列表信息/PositionDetail_岗位详情/PositionDetailAPIManager/HJPositionDetailDataBox.m

@@ -160,9 +160,18 @@ NSString * const HJPositionListRefreshNotification = @"HJPositionListRefreshNoti
     {
         self.maleReturnMoneyLabel.hidden = YES;
     }
+    
     if (model.position.femaleReward > 0)
     {
-        self.femaleReturnMoneyLabel.text = [NSString stringWithFormat:@"女返费%@元,", @(model.position.femaleReward)];
+        if (model.position.maleReward > 0 )
+        {
+            self.maleReturnMoneyLabel.text = [NSString stringWithFormat:@"男返费%@元，", @(model.position.maleReward)];
+        }
+        else
+        {
+            self.maleReturnMoneyLabel.hidden = YES;
+        }
+        self.femaleReturnMoneyLabel.text = [NSString stringWithFormat:@"女返费%@元", @(model.position.femaleReward)];
     }
     else
     {

HappyJob/HappyJob/Custom/Components/FBKit/FBLayout/FBFlowLayoutView.h

@@ -52,6 +52,7 @@ typedef NS_ENUM(NSInteger, FBFlowLayoutViewInsertSubviewType) {
 @property (nonatomic, assign, readonly) CGFloat contentHeight;
 @property (nonatomic, weak) id<FBFlowLayoutDelegate> delegate;
 @property (nonatomic, weak) id<FBFlowLayoutDataSource> dataSource;
+@property (nonatomic, assign) BOOL   singleBool;//是否是单行
 
 - (void)reloadData;
 - (UIView *)subviewAtIndex:(NSUInteger)index;

HappyJob/HappyJob/Custom/Components/FBKit/FBLayout/FBFlowLayoutView.m

@@ -34,7 +34,7 @@
         _verticalSpacing = 10;
         _type = FBFlowLayoutViewInsertSubviewTypeDefault;
         _hasLayouted = NO;
-        
+//        _singleBool = NO;
         _numberOfLines = 1;
         _edgeInsets = UIEdgeInsetsZero;
     }
@@ -122,8 +122,12 @@
                 if (spaceWidth < subview.frame.size.width)
                 {
                     [subview removeFromSuperview];
+                    self.singleBool = NO;
+                }
+                else
+                {
+                    self.singleBool = YES;
                 }
-                
             }
             else
             {