bug修改

HappyJob/HappyJob/BClass/BHome_首页/APIManager/BHomeDataBox.m

@@ -79,7 +79,7 @@
     BHomeListModel *model = [self positionModelAtIndexPath:indexPath];
     
     //名字
-    cell.nameLabel.text = model.realName;
+//    cell.nameLabel.text = model.realName;
     
     //头像
     [cell.headerImageV sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.headImg]] placeholderImage:[UIImage imageNamed:@"portrait_default"]];
@@ -100,6 +100,7 @@
     //求职意向
     NSArray *positionArray = @[@"普工", @"客服", @"销售", @"服务员", @"物流仓储", @"司机", @"才艺技能", @"文员助理", @"快递配送", @"促销导购", @"展会演出", @"家教培训", @"模特", @"贸易采购", @"厨师", @"编辑", @"线上推广", @"设计", @"技工", @"保洁", @"其它"];
     NSString *positionStr = @"";
+    
     if (model.expectationPosition.length > 0)
     {
         NSArray *expectationPositionArray = [model.expectationPosition componentsSeparatedByString:@","];
@@ -115,15 +116,19 @@
             }
         }
     }
-    if (positionStr.length > 0)
-    {
-        cell.jobsLabel.text = [NSString stringWithFormat:@"（%@/%@岁/%@）",sex,model.birthYear,schoolStr];
-    }
-    else
+    
+    cell.nameLabel.text = [NSString stringWithFormat:@"%@（%@/%@岁/%@）",model.realName,sex,model.birthYear,schoolStr];
+    
+    if (model.realName.length > 0)
     {
-        cell.jobsLabel.text = [NSString stringWithFormat:@"（%@/%@岁/%@）",sex,model.birthYear,schoolStr];
+        NSMutableAttributedString *countAtt1 = [[NSMutableAttributedString alloc]initWithString:cell.nameLabel.text];
+        [countAtt1 addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:17] range:NSMakeRange(0, [model.realName length])];
+        cell.nameLabel.attributedText = countAtt1;
     }
     
+    
+//    cell.jobsLabel.text = [NSString stringWithFormat:@"（%@/%@岁/%@）",sex,model.birthYear,schoolStr];
+    
     //投递岗位
     cell.positionLabel.text = [NSString stringWithFormat:@"投递岗位：%@",model.dpPositionName];
     

HappyJob/HappyJob/BClass/BHome_首页/Views/Cell/BHomeListCell.h

@@ -20,8 +20,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UILabel     *timeLabel;
 
 
-
-
 @end
 
 NS_ASSUME_NONNULL_END

HappyJob/HappyJob/BClass/BHome_首页/Views/Cell/BHomeListCell.m

@@ -76,6 +76,7 @@
     [_nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(weakSelf.headerImageV.mas_trailing).offset(20);
         make.top.equalTo(weakSelf.bgView.mas_top).offset(20);
+        make.trailing.equalTo(weakSelf.timeLabel.mas_leading).offset(-5);
     }];
     
     [_jobsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -137,8 +138,9 @@
     if (_nameLabel == nil)
     {
         _nameLabel = [[UILabel alloc]init];
-        _nameLabel.font = [UIFont systemFontOfSize:17];
+        _nameLabel.font = [UIFont systemFontOfSize:14];
         _nameLabel.textColor = COLOR_BACK3;
+        
     }
     return _nameLabel;
 }
@@ -149,7 +151,7 @@
         _jobsLabel = [[UILabel alloc]init];
         _jobsLabel.font = [UIFont systemFontOfSize:14];
         _jobsLabel.textColor = COLOR_BACK3;
-        _jobsLabel.numberOfLines = 1;
+//        _jobsLabel.numberOfLines = 1;
     }
     return _jobsLabel;
 }
@@ -174,6 +176,7 @@
         _timeLabel.textColor = COLOR_BACKC;
         _timeLabel.textAlignment = NSTextAlignmentRight;
         [_timeLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
+       
     }
     return _timeLabel;
 }

HappyJob/HappyJob/BClass/BPosition_职位/View/BCheckPeopleCell.m

@@ -16,10 +16,12 @@
 @property (nonatomic, strong) UIImageView *iconImageV;
 @property (nonatomic, strong) UILabel     *nameLabel;
 @property (nonatomic, strong) UILabel     *infoLabel;
+@property (nonatomic, strong) UILabel     *timeLabel;
 @property (nonatomic, strong) UIButton    *checkBtn;
 @property (nonatomic, strong) UIView      *bottomView;
 @property (nonatomic, strong) UIImageView *selectIcon;
 
+
 @end
 
 @implementation BCheckPeopleCell
@@ -47,6 +49,7 @@
     [self.bgView addSubview:self.iconImageV];
     [self.bgView addSubview:self.nameLabel];
     [self.bgView addSubview:self.infoLabel];
+    [self.bgView addSubview:self.timeLabel];
     [self.bgView addSubview:self.checkBtn];
     [self.contentView addSubview:self.bottomView];
 }
@@ -72,7 +75,7 @@
         
         NSArray *schoolArray = @[@"不限",@"小学",@"中学",@"高中",@"大专",@"本科",@"研究生",@"博士",@"博士后",@"其他"];
         NSString *schoolStr = [NSString stringWithFormat:@"%@",schoolArray[[model.highestQualification integerValue]]];
-        self.infoLabel.text = [NSString stringWithFormat:@"%@,%@岁,%@",sex,model.birthYear,schoolStr];
+        self.infoLabel.text = [NSString stringWithFormat:@"(%@/%@岁/%@)",sex,model.birthYear,schoolStr];
     
         if ([model.select boolValue] == 1)
         {
@@ -82,6 +85,12 @@
         {
             self.selectIcon.image = [UIImage imageNamed:@"b_position_signupnoselect"];
         }
+        
+        if (model.createDate)
+        {
+            self.timeLabel.text = [NSString stringWithFormat:@"%@ 投递",[HJAppService compareCurrentTimeDayAndMonth:[NSString stringWithFormat:@"%ld",[HJAppService timeSwitchTimestamp:model.createDate]]]];
+        }
+        
     }
 }
 - (void)autoLayOutViews {
@@ -116,9 +125,14 @@
     [_nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(weakSelf.headerImageV.mas_trailing).offset(25);
         make.top.equalTo(weakSelf.headerImageV.mas_top).offset(0);
+        make.width.mas_lessThanOrEqualTo(HJHorizontalScale(150));
     }];
-   
     [_infoLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.centerY.equalTo(weakSelf.nameLabel);
+        make.left.equalTo(weakSelf.nameLabel.mas_right).offset(0);
+    }];
+    [_timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(weakSelf.headerImageV.mas_trailing).offset(25);
         make.bottom.equalTo(weakSelf.headerImageV.mas_bottom).offset(0);
     }];
@@ -199,12 +213,21 @@
     if (_infoLabel == nil)
     {
         _infoLabel = [[UILabel alloc]init];
-        _infoLabel.textColor = COLOR_BACK6;
+        _infoLabel.textColor = COLOR_BACK3;
         _infoLabel.font = [UIFont systemFontOfSize:14];
     }
     return _infoLabel;
 }
-
+- (UILabel *)timeLabel {
+    
+    if (_timeLabel == nil)
+    {
+        _timeLabel = [[UILabel alloc]init];
+        _timeLabel.textColor = COLOR_BACK6;
+        _timeLabel.font = [UIFont systemFontOfSize:14];
+    }
+    return _timeLabel;
+}
 - (UIButton *)checkBtn {
     
     if (_checkBtn == nil)

HappyJob/HappyJob/BClass/BPosition_职位/ViewController/BCheckPeopleViewController.m

@@ -42,7 +42,7 @@ FBAPIManagerInterceptor
     
     self.listArray = [NSMutableArray array];
     [self hj_setupNavBar];
-    self.navigationItem.title = @"投递人员";
+    self.navigationItem.title = @"简历管理";
     [self autoLayOutViews];
     
     self.listAPI.type = @"1";

HappyJob/HappyJob/CClass/DataCenter/Model/Position/HJPositionModel.h

@@ -13,6 +13,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSUInteger, HJPositionType) {
+    
     HJPositionTypeFullTime = 0,  //全职工作
     HJPositionTypePartTime,      //兼职工作
     HJPositionTypeReward,        //入职奖励

HappyJob/HappyJob/CClass/Home_首页/Agent_全民经纪人/HJAgentNavBarView.h

@@ -11,7 +11,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface HJAgentNavBarView : FBNavigationBar
+
 @property (nonatomic, strong) UIButton *backButton;
+
 @end
 
 NS_ASSUME_NONNULL_END

HappyJob/HappyJob/CClass/Home_首页/Agent_全民经纪人/HJAgentNavBarView.m

@@ -11,7 +11,8 @@
 @implementation HJAgentNavBarView
 
 - (instancetype)init {
-    if (self = [super init]) {
+    if (self = [super init])
+    {
         self.backgroundColor = [UIColor colorWithRed:81/255.0 green:145/255.0 blue:211/255.0 alpha:0];
         
         [self addSubview:self.backButton];
@@ -21,6 +22,7 @@
 }
 
 - (void)makeConstraints {
+    
     [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self).with.offset(17);
         make.bottom.equalTo(self).with.offset(-10);
@@ -31,7 +33,9 @@
 #pragma mark - getters and setters
 
 - (UIButton *)backButton {
-    if (_backButton == nil) {
+    
+    if (_backButton == nil)
+    {
         _backButton = [UIButton buttonWithType:UIButtonTypeCustom];
         _backButton.imageEdgeInsets = UIEdgeInsetsMake(0, -27, 0, 0);
         [_backButton setImage:[UIImage imageNamed:@"navbar_back_white"] forState:UIControlStateNormal];

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

@@ -178,7 +178,7 @@ NSString * const HJPositionListRefreshNotification = @"HJPositionListRefreshNoti
     self.peopleDateLabel.text = peopleDate;
     [dict setObject:self.peopleDateLabel forKey:kHJPositionKeyRecruitAndDate];
     
-    NSString *publishTime = model.position.publishTime.xh_format_MM_dd;
+    NSString *publishTime = model.position.updateDate.xh_format_MM_dd;
     self.timeLabel.text = publishTime ? publishTime:@"-";
     [dict setObject:self.timeLabel forKey:kHJPositionKeyTime];
     

HappyJob/HappyJob/CClass/Join_拼工/HJJoinDetailViewController.m

@@ -453,7 +453,17 @@ FBAPIManagerDelegate
     {
         NSArray *addressArray = data[kHJPositionKeyAddress][kHJPositionKeyInnerValue];
         self.addressView.titleLabel.text = [NSString stringWithFormat:@"%@",addressArray[0][@"kHJWorkplaceKeyAddress"]];
-        self.addressView.allLabel.text = [NSString stringWithFormat:@"全部(%@)",@(addressArray.count)];
+        if (addressArray.count <= 1)
+        {
+            self.addressView.allLabel.hidden = YES;
+            self.addressView.lineView.hidden = YES;
+        }
+        else
+        {
+            self.addressView.allLabel.hidden = NO;
+            self.addressView.lineView.hidden = NO;
+            self.addressView.allLabel.text = [NSString stringWithFormat:@"全部(%@)",@(addressArray.count)];
+        }
         self.addressView.citylabel.text = [NSString stringWithFormat:@"%@",addressArray[0][@"kHJWorkplaceKeyArea"]];
         [self.scrollLayoutView.contentView addSubview:self.addressView];
     }

HappyJob/HappyJob/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>4</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>iosamap</string>

HappyJob/HappyJob/Support/HJConfig.h

@@ -29,17 +29,17 @@
 
 
 /******** 测试服接口地址 ********/
-static NSString * const kHJBaseURL = @"https://kf.hap-job.com/happyjob/f/api/";
-static NSString * const kBuglyAppID = @"d3e4636207";
-static NSString * const kWeiXinAPIKey = @"wx9c053f7126db0b28";
+//static NSString * const kHJBaseURL = @"https://kf.hap-job.com/happyjob/f/api/";
+//static NSString * const kBuglyAppID = @"d3e4636207";
+//static NSString * const kWeiXinAPIKey = @"wx9c053f7126db0b28";
 
 
 /******** 正式服接口地址 ********/
-//static NSString * const kHJBaseURL = @"https://web.hap-job.com/happyjob/f/api/";
-// /* Bugly开放平台AppID，注册地址：https://bugly.qq.com */
-//static NSString * const kBuglyAppID = @"b532795704";
-///* 微信开放平台AppID，注册地址：https:open.weixin.qq.com */
-//static NSString * const kWeiXinAPIKey = @"wxeb8c2418a8ace030";
+static NSString * const kHJBaseURL = @"https://web.hap-job.com/happyjob/f/api/";
+ /* Bugly开放平台AppID，注册地址：https://bugly.qq.com */
+static NSString * const kBuglyAppID = @"b532795704";
+/* 微信开放平台AppID，注册地址：https:open.weixin.qq.com */
+static NSString * const kWeiXinAPIKey = @"wxeb8c2418a8ace030";
 
 
 /* 使用高德地图API，请注册Key，注册地址：http://lbs.amap.com/dev/#/ */