15555599100 il y a 6 ans
Parent
commit
6a2ce0c815

+ 1 - 14
HappyJob/HappyJob/BClass/BHome_首页/ViewController/BHomeViewController.m

@@ -9,7 +9,6 @@
 #import "BHomeViewController.h"
 #import "BHomeListCell.h"
 #import "BHomeSearchView.h"
-#import "IQKeyboardManager.h"
 #import "BHomeNoCertificationView.h"//认证结果
 #import "BHomeResumeDetailViewController.h"//简历详情
 #import "BHomeCertificationEnterpriseVC.h"//企业认证
@@ -49,22 +48,10 @@ FBAPIManagerInterceptor
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    //这个类不需要使用 IQKeyboardManager
-    IQKeyboardManager *keyboardManager =  [IQKeyboardManager sharedManager];
-    keyboardManager.enable = YES;
-    keyboardManager.enableAutoToolbar = NO;
+    
     [self.navigationController setNavigationBarHidden:YES animated:YES];
 
 }
-- (void)viewDidDisappear:(BOOL)animated {
-    
-    //测试分支
-    [super viewDidDisappear:animated];
-    //试图将要消失的时候打开
-    IQKeyboardManager *keyboardManager =  [IQKeyboardManager sharedManager];
-    keyboardManager.enable = YES;
-    keyboardManager.enableAutoToolbar = YES;
-}
 
 - (void)viewDidLoad {
     

+ 2 - 2
HappyJob/HappyJob/BClass/BHome_首页/企业认证/ViewController/BHomeCertificationEnterpriseVC.m

@@ -53,8 +53,8 @@ UIGestureRecognizerDelegate
 
 - (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
     // 判断要显示的控制器是否是自己
-    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
-    [self.navigationController setNavigationBarHidden:isPushSelfClass animated:animated];
+//    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
+    [self.navigationController setNavigationBarHidden:YES animated:animated];
     
 }
 #pragma mark - FBAPIManagerInterceptor

+ 5 - 0
HappyJob/HappyJob/BClass/BMy_我的/APIManager/BMyDataBox.m

@@ -101,6 +101,11 @@
         {
             cell.titleLabel.text = @"企业认证";
             cell.leftImageV.image = [UIImage imageNamed:@"b_enterprise_certification"];
+            cell.rightImageV.hidden = YES;
+            [cell.rightLabel mas_updateConstraints:^(MASConstraintMaker *make) {
+                
+                make.right.equalTo(cell).offset(-15);
+            }];
             if ([model.authenticationStatus integerValue] == 3)
             {
                 cell.rightLabel.text = @"已认证";

+ 2 - 0
HappyJob/HappyJob/BClass/BMy_我的/View/BMyListCell.h

@@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UILabel     *titleLabel;
 @property (nonatomic, strong) UILabel     *rightLabel;
 @property (nonatomic, strong) UIImageView *leftImageV;
+@property (nonatomic, strong) UIImageView *rightImageV;
+@property (nonatomic, strong) UIView      *lineView;
 
 
 @end

+ 3 - 9
HappyJob/HappyJob/BClass/BMy_我的/View/BMyListCell.m

@@ -10,8 +10,6 @@
 
 @interface BMyListCell ()
 
-@property (nonatomic, strong) UIImageView *rightImageV;
-@property (nonatomic, strong) UIView      *lineView;
 
 
 @end
@@ -28,21 +26,19 @@
     {
         self.selectionStyle = UITableViewCellSelectionStyleNone;
         self.backgroundColor = [UIColor whiteColor];
-        [self initViews];
+       
         [self autoLayOutViews];
     }
     return self;
 }
-- (void)initViews {
+
+- (void)autoLayOutViews {
     
     [self.contentView addSubview:self.leftImageV];
     [self.contentView addSubview:self.titleLabel];
     [self.contentView addSubview:self.rightImageV];
     [self.contentView addSubview:self.lineView];
     [self.contentView addSubview:self.rightLabel];
-}
-- (void)autoLayOutViews {
-    
     __weak typeof(self) weakSelf = self;
     
     [_leftImageV mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -56,7 +52,6 @@
         make.centerY.equalTo(weakSelf.leftImageV);
     }];
     
-    
     [_rightImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(weakSelf.contentView);
         make.trailing.equalTo(weakSelf.contentView.mas_trailing).offset(-15);
@@ -125,7 +120,6 @@
         _lineView.backgroundColor = COLOR_BACKE;
     }
     return _lineView;
-    
 }
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];

+ 1 - 1
HappyJob/HappyJob/BClass/BMy_我的/View/BMyTopCell.m

@@ -63,7 +63,7 @@
     self.headerImageV.layer.masksToBounds = YES;
     [_nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(weakSelf.headerImageV.mas_trailing).offset(20);
-        make.top.equalTo(weakSelf.headerImageV.mas_top).offset(20);
+        make.top.equalTo(weakSelf.headerImageV.mas_top).offset(25);
     }];
     [_infoLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(weakSelf.headerImageV.mas_trailing).offset(20);

+ 12 - 4
HappyJob/HappyJob/BClass/BMy_我的/ViewController/BMyViewController.m

@@ -13,7 +13,8 @@
 #import "BHomeChangeIdentityAPI.h"
 #import "BMyDataBox.h"
 
-@interface BMyViewController ()<UITableViewDelegate,FBAPIManagerDelegate>
+@interface BMyViewController ()<UITableViewDelegate,FBAPIManagerDelegate,UINavigationControllerDelegate,
+UIGestureRecognizerDelegate>
 
 @property (nonatomic, strong) UITableView            *tableView;
 @property (nonatomic, strong) BHomeChangeIdentityAPI *IDAPI;
@@ -28,13 +29,12 @@
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:NO animated:animated];
-    
+    self.navigationController.delegate = self;
+    self.navigationController.interactivePopGestureRecognizer.delegate = self;
     if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] != 0)
     {
         [self.IDAPI start];
     }
-    
 }
 
 - (void)viewDidLoad {
@@ -56,6 +56,14 @@
         
     }];
 }
+#pragma mark - 导航栏的代理
+
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
+    // 判断要显示的控制器是否是自己
+    //    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
+    [self.navigationController setNavigationBarHidden:NO animated:animated];
+    
+}
 #pragma mark - FBAPIManagerDelegate
 
 - (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {

+ 1 - 2
HappyJob/HappyJob/BClass/BPosition_职位/ViewController/BCheckPeopleViewController.m

@@ -108,7 +108,6 @@ FBAPIManagerInterceptor
         {
             [self.listArray removeObjectAtIndex:i];
         }
-        
     }
     [self.tableView.tableView reloadData];
     
@@ -194,7 +193,7 @@ FBAPIManagerInterceptor
             }
         }
     }
-    if (count == self.listArray.count)
+    if (count == self.listArray.count && count != 0)
     {
         self.bottomView.allBtn.selected = YES;
     }

+ 1 - 2
HappyJob/HappyJob/BClass/BPosition_职位/ViewController/BPositionDetailViewController.m

@@ -74,7 +74,7 @@ FBScrollLayoutViewDelegate
     
     [self.view dismissErrorView];
 //    self.detailDict = [manager fetchDataWithBox:nil][@"data"][@"position"];
-    NSLog(@"::::::%@",[manager fetchDataWithBox:self.dataBox]);
+
     [self positionDetailconfigData:[manager fetchDataWithBox:self.dataBox]];
 
 }
@@ -149,7 +149,6 @@ FBScrollLayoutViewDelegate
         [contentView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.bottom.equalTo(self.trafficView.mas_bottom);
         }];
-        
     }
     else
     {

+ 16 - 3
HappyJob/HappyJob/BClass/BPosition_职位/ViewController/BPositionViewController.m

@@ -30,7 +30,9 @@
 UITableViewDelegate,
 FBAPIManagerDelegate,
 FBAPIManagerInterceptor,
-BPositionDataBoxDelegate
+BPositionDataBoxDelegate,
+UINavigationControllerDelegate,
+UIGestureRecognizerDelegate
 >
 
 @property (nonatomic, strong) UIButton                 *certificationBtn;
@@ -60,8 +62,9 @@ BPositionDataBoxDelegate
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:NO animated:animated];
-    [self hj_setupNavBar];
+    self.navigationController.delegate = self;
+    self.navigationController.interactivePopGestureRecognizer.delegate = self;
+    
 }
 
 - (void)viewDidLoad {
@@ -69,6 +72,7 @@ BPositionDataBoxDelegate
     [super viewDidLoad];
 
     self.navigationItem.title = @"职位";
+    [self hj_setupNavBar];
     [self.authAPI start];
     // 错误页面刷新事件
     [self.view.errorView.refreshButton addTarget:self action:@selector(refreshButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
@@ -79,6 +83,15 @@ BPositionDataBoxDelegate
    
 }
 
+#pragma mark - 导航栏的代理
+
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
+    // 判断要显示的控制器是否是自己
+    //    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
+    [self.navigationController setNavigationBarHidden:NO animated:animated];
+    
+}
+
 #pragma mark - event response
 
 /* 发布职位成功回调 */