签到bug，和学历显示bug

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

@@ -54,7 +54,6 @@ HJPageListViewDelegate
 
 @implementation HJHomeViewController
 
-
 #pragma mark - life cycle
 
 - (void)dealloc {

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

@@ -37,7 +37,6 @@
         make.right.equalTo(self.view.mas_right).offset(0);
         make.top.bottom.equalTo(self.view).offset(0);
     }];
-//    NSLog(@"webUrl::::::%@",self.webUrl);
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
 }
 

HappyJob/HappyJob/CClass/Home_首页/HomeAPIManager/HJGetBannerAPIManager.m

@@ -40,5 +40,9 @@
     
     return FBAPIManagerRequestTypeGet;
 }
+//- (NSInteger)cacheTimeInSeconds {
+//
+//    return 60*3;
+//}
 
 @end

HappyJob/HappyJob/CClass/Home_首页/NavBar_头部自定义导航栏/HJNavBarView.m

@@ -53,7 +53,7 @@
     [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) {
     
         make.right.equalTo(self).with.offset(-20);
-        make.left.equalTo(self.cityButton.mas_right).with.offset(24);
+        make.left.equalTo(self.cityButton.mas_right).offset(20);
         make.bottom.equalTo(self).with.offset(-6);
         make.height.mas_equalTo(37);
     }];
@@ -128,7 +128,7 @@
         [_searchButton setTitleColor:COLOR_CCCCCC forState:UIControlStateNormal];
         [_searchButton setImage:[UIImage imageNamed:@"search_search"] forState:UIControlStateNormal];
         [_searchButton addTarget:self action:@selector(searchButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
-        _searchButton.contentEdgeInsets = UIEdgeInsetsMake(0, 25, 0, 0);
+        _searchButton.contentEdgeInsets = UIEdgeInsetsMake(0, 15, 0, 0);
         _searchButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
         _searchButton.layer.borderWidth = 2;
         _searchButton.layer.borderColor = COLOR_0177FF.CGColor;

HappyJob/HappyJob/CClass/Integral_我的积分/ViewController/HJIntegralViewController.m

@@ -97,7 +97,7 @@ FBAPIManagerInterceptor
     
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
        
-        make.top.equalTo(self.view.mas_top).offset(-0);
+        make.top.equalTo(self.view.mas_top).offset(0);
         make.left.right.bottom.offset(0);
     }];
 }
@@ -126,18 +126,17 @@ FBAPIManagerInterceptor
         self.dataDict = [manager fetchDataWithBox:nil];
         [self.tableView reloadData];
         [self.refreshHeader endRefreshing];
+        self.signinBtn.userInteractionEnabled = YES;//签到成功，补签成功获取数据后在打开按钮属性（0.5后）
     }
     else
     {
         if (manager == self.signinAPI)
         {
             [self.view fb_showSuccessWithStatus:@"签到成功"];
-            self.signinBtn.userInteractionEnabled = YES;
         }
         if (manager == self.repairAPI)
         {
             [self.view fb_showSuccessWithStatus:@"补签成功"];
-            self.signinBtn.userInteractionEnabled = YES;
         }
         if (manager == self.receiveRewardAPI)
         {
@@ -218,6 +217,7 @@ FBAPIManagerInterceptor
             cell = [[HJIntegralSigninCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:signinCell];
         }
         [cell hJMyIntegralSigninCellDict:self.dataDict];
+        self.signinBtn = cell.signInBtn;
         [cell.ruleBtn addTarget:self action:@selector(signinruleButtonClick:) forControlEvents:UIControlEventTouchUpInside];
         [cell.moreBtn addTarget:self action:@selector(moreTaskButtonClock:) forControlEvents:UIControlEventTouchUpInside];
         [cell.signInBtn addTarget:self action:@selector(signInButtonClick:) forControlEvents:UIControlEventTouchUpInside];
@@ -326,9 +326,7 @@ FBAPIManagerInterceptor
 
 /* 签到 */
 - (void)signInButtonClick:(UIButton *)btn {
-    
-    self.signinBtn = btn;
-    
+
     HJMyIntergralModel *model = [HJMyIntergralModel yy_modelWithDictionary:self.dataDict[@"data"]];
     if ([model.isSign integerValue] == 0 )
     {   //签到

HappyJob/HappyJob/CClass/Me_我/Auth_实名认证/ViewController/HJAuthFailedViewController.m

@@ -20,6 +20,8 @@
 
 @implementation HJAuthFailedViewController
 
+#pragma mark - cycle life
+
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
@@ -32,8 +34,8 @@
     [self hj_setupNavBar];
     self.title = @"实名认证";
     [self initSubViews];
-    
 }
+
 #pragma mark - init
 
 - (void)initSubViews {
@@ -64,7 +66,6 @@
         make.bottom.equalTo(self.view).offset(-20);
         make.height.mas_equalTo(50);
     }];
-    
 }
 
 #pragma mark - event response
@@ -75,7 +76,7 @@
     [self.navigationController pushViewController:vc animated:YES];
 }
 
-#pragma mark - setter & getter
+#pragma mark - lazy
 
 - (UIView *)bgView {
     

HappyJob/HappyJob/CClass/Me_我/Auth_实名认证/ViewController/HJAuthPictureViewController.m

@@ -50,6 +50,8 @@ FBAPIManagerInterceptor
 
 @implementation HJAuthPictureViewController
 
+#pragma mark - cycle file
+
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];

HappyJob/HappyJob/CClass/Me_我/Auth_实名认证/ViewController/HJAuthViewController.m

@@ -31,7 +31,6 @@ FBScrollLayoutViewDelegate
     
     [super viewWillAppear:animated];
     [self hj_setupNavBar];
-
 }
 - (void)viewDidLoad {
     

HappyJob/HappyJob/CClass/Me_我/Auth_实名认证/ViewController/HJAuthingViewController.m

@@ -7,7 +7,6 @@
 //
 
 #import "HJAuthingViewController.h"
-#import "UIButton+Layout.h"
 
 @interface HJAuthingViewController ()<UINavigationControllerDelegate,UIGestureRecognizerDelegate>
 
@@ -55,7 +54,6 @@
    
     self.navigationController.delegate = self;
     self.navigationController.interactivePopGestureRecognizer.delegate = self;
-    
 }
 
 #pragma mark - 导航栏的代理
@@ -63,7 +61,6 @@
 - (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
   
     UIViewController *root = navigationController.viewControllers[0];
-    
     if (root != viewController)
     {
         UIBarButtonItem *itemleft = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"navbar_back_white"] style:UIBarButtonItemStylePlain target:self action:@selector(backClick)];

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/ResumeAPIManager/HJResumeDataBox.m

@@ -161,7 +161,7 @@ NSString *const HJResumeUpdateNotification = @"HJResumeUpdateNotification";
     NSInteger education = model.education;
     if (education > 0 && (education - 1) < self.educationDataSource.count)
     {
-        educationStr = self.educationDataSource[education - 1];
+        educationStr = self.educationDataSource[education-1];
     }
     [dict setObject:educationStr forKey:kHJResumeKeyEducation];
     
@@ -249,7 +249,7 @@ NSString *const HJResumeUpdateNotification = @"HJResumeUpdateNotification";
     
     if (_educationDataSource == nil)
     {
-        _educationDataSource = @[@"不限",@"小学", @"中学", @"高中", @"大专", @"本科", @"研究生", @"博士", @"博士后"];
+        _educationDataSource = @[@"小学", @"中学", @"高中", @"大专", @"本科", @"研究生", @"博士", @"博士后"];
     }
     return _educationDataSource;
 }

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/ResumeAPIManager/HJSaveBasicInfoAPIManager.h

@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger gender;
 @property (nonatomic, copy)   NSString *birthYear;
 @property (nonatomic, assign) NSInteger education;
-@property (nonatomic, copy)   UIImage *photo;
+@property (nonatomic, copy)   UIImage  *photo;
 @property (nonatomic, copy)   NSString *wechatNumber;
 
 @end

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/ResumeAPIManager/HJSaveBasicInfoAPIManager.m

@@ -80,7 +80,7 @@
     }
     if (self.education > -1)
     {
-        [dict setObject:[NSString stringWithFormat:@"%@", @(self.education++)] forKey:@"highestQualification"];
+        [dict setObject:[NSString stringWithFormat:@"%@", @(self.education)] forKey:@"highestQualification"];
     }
     if (self.wechatNumber)
     {
@@ -90,11 +90,13 @@
 }
 
 - (FBAPIManagerRequestType)requestType {
+    
     return FBAPIManagerRequestTypePost;
 }
 
 - (NSArray<FBUploadDataModel *> *)uploadDataArray {
     if (self.photo) {
+        
         NSMutableArray *array = [NSMutableArray arrayWithCapacity:1];
         
         FBUploadDataModel *model = [[FBUploadDataModel alloc] init];

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/个人资料/HJBasicInfoViewController.m

@@ -253,7 +253,7 @@ UIGestureRecognizerDelegate
         self.saveResumeBaseInfoAPIManager.phone = self.phoneView.contentTextField.text;
         self.saveResumeBaseInfoAPIManager.gender = [self.resumeDataBox.genderDataSource indexOfObject:self.sexView.contentTextField.text];
         self.saveResumeBaseInfoAPIManager.birthYear = self.yearView.contentTextField.text;
-        self.saveResumeBaseInfoAPIManager.education = [self.resumeDataBox.educationDataSource indexOfObject:self.educationView.contentTextField.text];
+        self.saveResumeBaseInfoAPIManager.education = [self.resumeDataBox.educationDataSource indexOfObject:self.educationView.contentTextField.text] + 1;
         self.saveResumeBaseInfoAPIManager.wechatNumber = self.WeChatView.contentTextField.text;
         [self.saveResumeBaseInfoAPIManager start];
     }

HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/View/HJSalarySheetView.m

@@ -56,33 +56,40 @@
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
+        [self autoLayOutHJLabelContentView:self.monthView];
+        
+        
         [self.companyView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.monthView.mas_bottom).offset(0);
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
+        [self autoLayOutHJLabelContentView:self.companyView];
+        
         [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.top.equalTo(self.companyView.mas_bottom).offset(0);
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
+        [self autoLayOutHJLabelContentView:self.nameView];
+        
         [self.workNumberView mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.top.equalTo(self.nameView.mas_bottom).offset(0);
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
-        
+        [self autoLayOutHJLabelContentView:self.workNumberView];
        
         self.monthView.contentLabel.text = data[kHJSalaryKeyMonth][kHJSalaryKeyInnerValue];
         self.companyView.contentLabel.text = data[kHJSalaryKeyCompanyName][kHJSalaryKeyInnerValue];
         self.nameView.contentLabel.text = data[kHJSalaryKeyEmployeeName][kHJSalaryKeyInnerValue];
         self.workNumberView.contentLabel.text = data[kHJSalaryKeyEmployeeNumber][kHJSalaryKeyInnerValue];
         
-        self.grossPaymentView.contentLabel.text = data[kHJSalaryKeyGrossPayment][kHJSalaryKeyInnerValue];
+        self.grossPaymentView.contentLabel.text = [NSString stringWithFormat:@"%.2f",[data[kHJSalaryKeyGrossPayment][kHJSalaryKeyInnerValue] floatValue]];
         self.totalChargebackView.contentLabel.text = data[kHJSalaryKeyCutPayment][kHJSalaryKeyInnerValue];
-        self.netPaymentView.contentLabel.text = data[kHJSalaryKeyNetPayment][kHJSalaryKeyInnerValue];
+        self.netPaymentView.contentLabel.text = [NSString stringWithFormat:@"%.2f",[data[kHJSalaryKeyNetPayment][kHJSalaryKeyInnerValue] floatValue]];
         
         
         self.lastListView = self.workNumberView;
@@ -91,6 +98,10 @@
         for (int i = 0; i < listArray.count; i ++ )
         {
             HJLabelContentView *listView = [[HJLabelContentView alloc]init];
+            [listView.contentLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+                make.centerY.equalTo(listView);
+                make.left.equalTo(listView.mas_left).offset(120);
+            }];
             listView.titleLabel.text = listArray[i][kHJSalaryKeyInnerKey];
             listView.contentLabel.text = listArray[i][kHJSalaryKeyInnerValue];
             
@@ -112,12 +123,16 @@
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
+        [self autoLayOutHJLabelContentView:self.grossPaymentView];
+        
         [self.totalChargebackView mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.top.equalTo(self.grossPaymentView.mas_bottom).offset(0);
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
+        [self autoLayOutHJLabelContentView:self.totalChargebackView];
+        
         [self.netPaymentView mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.top.equalTo(self.totalChargebackView.mas_bottom).offset(0);
@@ -125,10 +140,17 @@
             make.height.mas_equalTo(58);
             make.bottom.equalTo(self.mas_bottom).offset(0);
         }];
+        [self autoLayOutHJLabelContentView:self.netPaymentView];
         
     }
 }
-
+- (void)autoLayOutHJLabelContentView:(HJLabelContentView *)view {
+    
+    [view.contentLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.equalTo(view);
+        make.left.equalTo(view.mas_left).offset(120);
+    }];
+}
 #pragma mark - getters and setters
 
 - (HJLabelContentView *)monthView {

HappyJob/HappyJob/Support/HJConfig.h

@@ -16,7 +16,6 @@ static NSString * const kWeiXinAPIKey = @"wx9c053f7126db0b28";
 static NSString * const kuniversalLink = @"https://kf.hap-job.com/happyjob/";
 
 
-
 /* ------ 正式服接口地址 -------*/
 //static NSString * const kHJBaseURL = @"https://web.hap-job.com/happyjob/f/api/";
 //static NSString * const kBuglyAppID = @"b532795704";
@@ -24,12 +23,10 @@ static NSString * const kuniversalLink = @"https://kf.hap-job.com/happyjob/";
 //static NSString * const kuniversalLink = @"https://web.hap-job.com/happyjob/";
 
 
-
 /* ---------公共的---------- */
 static NSString * const kGAODEAPIKey = @"ec6c542ecc7faeaac443d9c2a0b74d67";//高德地图API
 static NSString * const kCustomerServiceURL = @"http://s.zhimakf.com/s/15421ibrr";//客服
 
 
 
-
 #endif /* HJConfig_h */