修改微信分享

HappyJob/HappyJob.xcodeproj/project.pbxproj

@@ -240,7 +240,6 @@
 		71AC1A5722F91AE600569CB5 /* HJJoinApplyContentListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5622F91AE600569CB5 /* HJJoinApplyContentListView.m */; };
 		71AC1A5D22F982AC00569CB5 /* HJPositionDetailCompanyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5C22F982AC00569CB5 /* HJPositionDetailCompanyView.m */; };
 		71AC1A6022F9CEA000569CB5 /* HJPositionDetailCompanyInfoVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5F22F9CEA000569CB5 /* HJPositionDetailCompanyInfoVC.m */; };
-		71AC1A6622FAB6C800569CB5 /* HJCircularGradientProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A6422FAB6C800569CB5 /* HJCircularGradientProgress.m */; };
 		71AC1A6922FBBE3300569CB5 /* HJExperienceListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A6822FBBE3300569CB5 /* HJExperienceListViewController.m */; };
 		71AC1A6C22FBFDB400569CB5 /* HJAuthPictureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A6B22FBFDB400569CB5 /* HJAuthPictureViewController.m */; };
 		71C9A076232DCB96004DADB1 /* HJConfirmPanelInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C9A073232DCB94004DADB1 /* HJConfirmPanelInputView.m */; };
@@ -943,8 +942,6 @@
 		71AC1A5C22F982AC00569CB5 /* HJPositionDetailCompanyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJPositionDetailCompanyView.m; sourceTree = "<group>"; };
 		71AC1A5E22F9CEA000569CB5 /* HJPositionDetailCompanyInfoVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJPositionDetailCompanyInfoVC.h; sourceTree = "<group>"; };
 		71AC1A5F22F9CEA000569CB5 /* HJPositionDetailCompanyInfoVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJPositionDetailCompanyInfoVC.m; sourceTree = "<group>"; };
-		71AC1A6422FAB6C800569CB5 /* HJCircularGradientProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HJCircularGradientProgress.m; sourceTree = "<group>"; };
-		71AC1A6522FAB6C800569CB5 /* HJCircularGradientProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HJCircularGradientProgress.h; sourceTree = "<group>"; };
 		71AC1A6722FBBE3300569CB5 /* HJExperienceListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJExperienceListViewController.h; sourceTree = "<group>"; };
 		71AC1A6822FBBE3300569CB5 /* HJExperienceListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJExperienceListViewController.m; sourceTree = "<group>"; };
 		71AC1A6A22FBFDB400569CB5 /* HJAuthPictureViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJAuthPictureViewController.h; sourceTree = "<group>"; };
@@ -4127,8 +4124,6 @@
 				C49DB95722687CC9000D8AFE /* HJMeResumeView.m */,
 				C49DB94922681826000D8AFE /* HJMeHeaderView.h */,
 				C49DB94A22681826000D8AFE /* HJMeHeaderView.m */,
-				71AC1A6522FAB6C800569CB5 /* HJCircularGradientProgress.h */,
-				71AC1A6422FAB6C800569CB5 /* HJCircularGradientProgress.m */,
 			);
 			path = "Header_头视图";
 			sourceTree = "<group>";
@@ -4740,7 +4735,6 @@
 				7132694A22CAEC1F00DEB10B /* BCheckPeopleBottomView.m in Sources */,
 				C40FA71D2276E37600EB2371 /* UIImageView+FBRotation.m in Sources */,
 				C40E8F09226DA96000F3900A /* HJErrorView.m in Sources */,
-				71AC1A6622FAB6C800569CB5 /* HJCircularGradientProgress.m in Sources */,
 				C4F657A4224CF57900E1E625 /* FBBaseAPIManager.m in Sources */,
 				713268F322C9AACA00DEB10B /* BHomeViewController.m in Sources */,
 				C414D8832266B51500719CE0 /* HJResumeViewController.m in Sources */,

HappyJob/HappyJob/Assets.xcassets/Auth/auth_failed.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "未通过.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "未通过@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "未通过@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Auth/auth_failed_bg.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "背景 橙色.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "背景 橙色@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "背景 橙色@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Common/panel_del.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "形状 2.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 2@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 2@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Home/Scroll/home_banner_bg.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "home_banner_bg.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "home_banner_bg@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "home_banner_bg@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Home/Scroll/scroll_dot.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "椭圆 2@2x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "椭圆 2@3x-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "椭圆 2@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Home/Scroll/scroll_dot_selected.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "scroll_dot_selected.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "scroll_dot_selected@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "scroll_dot_selected@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/JobDetail/job_detail_man.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "形状 8.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 8@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 8@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/JobDetail/job_detail_woman.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "形状 7.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 7@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 7@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Location/location_hot_city1.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "形状 3.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 3@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 3@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Location/location_hot_city2.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "形状 2.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 2@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 2@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Location/location_location.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "形状 1.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 1@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "形状 1@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/Assets.xcassets/Me/me_opinion.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "意见反馈.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "意见反馈@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "意见反馈@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

HappyJob/HappyJob/CClass/Home_首页/Search_搜索页面/HJSearchHotView.m

@@ -68,7 +68,6 @@
     CGSize maxSize = CGSizeMake(flowLayoutView.contentWidth, MAXFLOAT);
     UIButton *tagButton = [UIButton hj_createTagButtonWithTitle:title maxSize:maxSize];
     [tagButton setTitleColor:COLOR_666666 forState:UIControlStateNormal];
-//    tagButton.contentEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10);
     return tagButton;
 }
 

HappyJob/HappyJob/CClass/Integral_我的积分/View/HJIntegralNaviBarView.m

@@ -22,7 +22,7 @@
     
     CGFloat contentYoffset = contentOffset.y;
     // contentOffset在Y轴的偏移量是负数，则隐藏导航栏
-    self.hidden = (contentYoffset < -STATUS_BAR_H) ? YES : NO;
+    self.hidden = (contentYoffset < 0) ? YES : NO;
     
     // 让导航条背景色的透明度变化 100是范围 越大渐变越慢
     CGFloat alpha = contentYoffset / 100;
@@ -31,7 +31,7 @@
     
 }
 - (void)shadeBackgroundColorWithAlpha:(CGFloat)alpha {
-    
+   
     self.bgView.alpha = alpha;
     self.lineView.alpha = alpha;
     self.titleLabel.textColor = [UIColor colorWithR:255.0 - alpha*255.0 G:255.0 - alpha*255.0 B:255.0 - alpha*255.0 A:1.0];
@@ -76,6 +76,7 @@
     {
         _bgView = [[UIView alloc]init];
         _bgView.backgroundColor = [UIColor whiteColor];
+        _bgView.alpha = 0;
     }
     return _bgView;
 }
@@ -86,6 +87,7 @@
     {
         _titleLabel = [[UILabel alloc]init];
         _titleLabel.font = [UIFont boldSystemFontOfSize:17];
+        _titleLabel.textColor = [UIColor whiteColor];
         _titleLabel.text = @"积分";
     }
     return _titleLabel;
@@ -105,6 +107,7 @@
     {
         _lineView = [[UIView alloc] init];
         _lineView.backgroundColor = COLOR_EEEEEE;
+        self.lineView.alpha = 0;
     }
     return _lineView;
 }

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(-STATUS_BAR_H);
+        make.top.equalTo(self.view.mas_top).offset(-0);
         make.left.right.bottom.offset(0);
     }];
 }
@@ -422,6 +422,16 @@ FBAPIManagerInterceptor
         _tableView.estimatedRowHeight = 10.0;
         _tableView.translatesAutoresizingMaskIntoConstraints = YES;
         _tableView.mj_header = self.refreshHeader;
+        self.edgesForExtendedLayout = UIRectEdgeNone;
+        //去除顶部空白
+        if (@available(iOS 11.0, *))
+        {
+            _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        }
+        else
+        {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
     }
     return _tableView;
 }

HappyJob/HappyJob/CClass/JobList_工作列表信息/Benefit_福利岗位/HJBenefitDetailViewController.m

@@ -101,11 +101,9 @@
 
 - (void)subviewsMakeConstraintsInScrollLayoutView:(FBScrollLayoutView *)scrollLayoutView footerView:(UIView *)footerView {
     
-    [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(62);
-    }];
     [self.detailView.favoriteButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, 15, 9, HJHorizontalScale(250)));
+        make.height.mas_equalTo(44);
     }];
     [self.detailView.applyButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, HJHorizontalScale(135), 9, 15));

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

@@ -181,11 +181,9 @@ UIScrollViewDelegate
     }
     else
     {
-        [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.height.mas_equalTo(62);
-        }];
         [self.detailView.favoriteButton mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, 15, 9, HJHorizontalScale(250)));
+            make.height.mas_equalTo(44);
         }];
         [self.detailView.applyButton mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, HJHorizontalScale(135), 9, 15));

HappyJob/HappyJob/CClass/JobList_工作列表信息/PartTime_兼职工作/HJPartTimeDetailViewController.m

@@ -200,11 +200,9 @@ UIScrollViewDelegate
     }
     else
     {
-        [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.height.mas_equalTo(62);
-        }];
         [self.detailView.favoriteButton mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, 15, 9, HJHorizontalScale(250)));
+            make.height.mas_equalTo(44);
         }];
         [self.detailView.applyButton mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, HJHorizontalScale(135), 9, 15));

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

@@ -70,7 +70,6 @@ FBAPIManagerDelegate
     
     [[NSNotificationCenter defaultCenter] removeObserver:self name:HJJoinApplySuccessNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:HJLoginRefreshNotification object:nil];
-    self.navigationController.delegate = nil;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -85,12 +84,11 @@ FBAPIManagerDelegate
     
     self.title = @"拼工详情";
     [self hj_setupNavBar];
-    [self subViewsMakeConstraints];
-    
     //调用拼团详情接口
     self.detailAPIManager.positionID = self.positionID;
     self.detailAPIManager.positionType = self.positionType;
     [self.detailAPIManager start];
+    [self subViewsMakeConstraints];
 
     //通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(joinSuccess:) name:HJJoinApplySuccessNotification object:nil];
@@ -111,16 +109,15 @@ FBAPIManagerDelegate
     }];
     // 错误页面刷新事件
     [self.view.errorView.refreshButton addTarget:self action:@selector(refreshButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
-    
-    
 }
+
 #pragma mark - FBScrollLayoutViewDelegate
 
 - (void)scrollLayoutViewMakeConstraints:(FBScrollLayoutView *)scrollLayoutView {
     
     [self.scrollLayoutView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.left.right.equalTo(self.view);
-        make.bottom.equalTo(self.mas_bottomLayoutGuide);
+        make.top.left.right.equalTo(self.view).offset(0);
+        make.bottom.equalTo(self.view.mas_bottomMargin).offset(0);
     }];
 }
 
@@ -190,12 +187,9 @@ FBAPIManagerDelegate
 
 - (void)subviewsMakeConstraintsInScrollLayoutView:(FBScrollLayoutView *)scrollLayoutView footerView:(UIView *)footerView {
     
-    [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.height.mas_equalTo(62);
-    }];
     [self.favoriteButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, 15, 9, HJHorizontalScale(250)));
+        make.height.mas_equalTo(44);
     }];
     [self.joinApplyButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, HJHorizontalScale(135), 9, 15));
@@ -234,7 +228,6 @@ FBAPIManagerDelegate
     vc.positionType = pType;
     vc.groupID = gId;
     [self.navigationController pushViewController:vc animated:YES];
-
 }
 
 - (void)joinViewAllJoinButtonClicked:(HJJoinDetailJoinView *)joinView {
@@ -540,7 +533,6 @@ FBAPIManagerDelegate
     [self.scrollLayoutView.contentView addSubview:self.companyInfoView];
     [self.scrollLayoutView.footerView addSubview:self.joinApplyButton];
     [self.scrollLayoutView.footerView addSubview:self.favoriteButton];
-    
     [self.scrollLayoutView makeConstraints];
     
     __weak typeof(self) weakSelf = self;

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/工作经验/HJExperienceListView.m

@@ -81,7 +81,7 @@
     [_timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(weakSelf.timeIcon.mas_top).offset(0);
         make.left.equalTo(weakSelf.timeIcon.mas_right).offset(10);
-        make.right.equalTo(weakSelf.editButton.mas_left).offset(-5);
+        make.right.equalTo(weakSelf.mas_right).offset(-45);
     }];
     
     

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/工作经验/HJExperienceNoResumeView.m

@@ -53,6 +53,7 @@
         make.right.equalTo(self.bgView.mas_right).offset(0);
     }];
 }
+
 #pragma mark - lazy
 
 - (UIView *)bgView {

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/求职意向/HJExpectationViewController.m

@@ -230,7 +230,6 @@ HJExpectAddressViewControllerDelegate
     
     HJExpectAddressViewController *addressVC = [[HJExpectAddressViewController alloc]init];
     addressVC.delegate = self;
-    NSLog(@"::::%@",self.resumeDataBox.resume[kHJExpectationProvinceId]);
     addressVC.provinceID = self.saveExpectationAPIManager.provinceCode;
     addressVC.cityID = self.saveExpectationAPIManager.cityCode;
     addressVC.areaID = self.saveExpectationAPIManager.countryCode;

HappyJob/HappyJob/CClass/Me_我/Setting_设置/ViewController/HJSettingViewController.m

@@ -8,11 +8,8 @@
 
 #import "HJSettingViewController.h"
 #import "HJSettingCell.h"
-#import "UIViewController+HJNavBar.h"
 #import "UIButton+HJGradientButton.h"
-#import "HJConfirmPanelViewController.h"
 #import "HJAboutViewController.h"
-#import "UIView+FBProgressHUD.h"
 #import "HJLoginPhoneViewController.h"
 #import "HJUserInfoModel.h"
 #import "HJUpdateViewController.h"
@@ -38,19 +35,20 @@ static NSString * const HJSettingCellIdentifier = @"HJSettingCell";
     [super viewDidLoad];
     self.title = @"设置";
     [self hj_setupNavBar];
-    [self.view addSubview:self.tableView];
-    [self.view addSubview:self.logoutButton];
+    
     [self makeConstraints];
 }
 
 - (void)makeConstraints {
     
-    self.view.backgroundColor = COLOR_F5F5F5;
+    self.view.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:self.tableView];
+    [self.view addSubview:self.logoutButton];
     [self.logoutButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.view).with.offset(9);
         make.right.equalTo(self.view).with.offset(-9);
-        make.bottom.equalTo(self.mas_bottomLayoutGuide).with.offset(-9);
-        make.height.mas_equalTo(50);
+        make.bottom.equalTo(self.view.mas_bottomMargin).with.offset(-9);
+        make.height.mas_equalTo(44);
     }];
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.view).offset(1);
@@ -146,7 +144,7 @@ static NSString * const HJSettingCellIdentifier = @"HJSettingCell";
 }
 
 #pragma mark - private methods
-/** 缓存大小 */
+/* 缓存大小 */
 - (CGFloat)folderSize {
     
     CGFloat folderSize = 0.0;
@@ -163,7 +161,7 @@ static NSString * const HJSettingCellIdentifier = @"HJSettingCell";
     CGFloat sizeM = folderSize /1024.0/1024.0;
     return sizeM;
 }
-/** 清除缓存 */
+/* 清除缓存 */
 - (void)removeCache {
     
     NSString*cachePath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory,NSUserDomainMask,YES)objectAtIndex:0];
@@ -201,7 +199,6 @@ static NSString * const HJSettingCellIdentifier = @"HJSettingCell";
                          action:@selector(logoutConfirmButtonClicked:)
                forControlEvents:UIControlEventTouchUpInside];
     [self presentViewController:vc animated:YES completion:nil];
-    
 }
 
 - (void)clearCacheConfirmButtonClicked:(UIButton *)sender {

HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJCircularGradientProgress.h

@@ -1,152 +0,0 @@
-//
-//  ZZGradientProgress.h
-//  ZZGradientProgress
-//
-//  Created by 周兴 on 2018/2/6.
-//  Copyright © 2018年 周兴. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface HJCircularGradientProgress : UIView
-
-/**
- 元素个数。默认为64，越高线条越平滑，性能越差。
- */
-@property (nonatomic, assign) int subdivCount;
-
-/**
- 进度条进度。0-1之间。
- */
-@property (nonatomic, assign) CGFloat progress;
-
-/**
- 线条宽度。
- */
-@property (nonatomic, assign) CGFloat strokeWidth;
-
-/**
- 半径。中心点距离视图边界的距离，包含线宽。
- 默认为视图宽或高的一半
- */
-@property (nonatomic, assign) CGFloat radius;
-
-/**
- 进度条起点角度。直接传度数，如-90，起点位置为水平右方，顺时针角度增加。
- */
-@property (nonatomic, assign) CGFloat startAngle;
-
-/**
- 进度条缺少角度。
- */
-@property (nonatomic, assign) CGFloat reduceAngle;
-
-/**
- 动画时长。当animationSameTime为NO时，此属性为动画的最长时间，即progress=1时的动画时间。
- */
-@property (nonatomic, assign) CGFloat animationDuration;
-
-/**
- 线条背景色。只有设置了showPathBack为YES时此属性才会生效。
- */
-@property (nonatomic, strong) UIColor *pathBackColor;
-
-/**
- 渐变色开始颜色。
- */
-@property (nonatomic, strong) UIColor *startColor;
-
-/**
- 渐变色结束颜色。
- */
-@property (nonatomic, strong) UIColor *endColor;
-
-/**
- 进度条中间文本颜色。
- */
-@property (nonatomic, strong) UIColor *textColor;
-
-/**
- 进度条中间文本字体。
- */
-@property (nonatomic, strong) UIFont *textFont;
-
-/**
- 进度条终点的小图标。
- */
-@property (nonatomic, strong) UIImage *pointImage;
-
-
-
-/**
- 进度条两端是否是圆角样式。
- 默认为NO
- */
-@property (nonatomic, assign) BOOL roundStyle;
-
-/**
- 颜色是否跟着渐变。为YES颜色会在起点位置和当前进度之间渐变，否则颜色只会在进度条起点和终点之间渐变。
- 默认为YES
- */
-@property (nonatomic, assign) BOOL colorGradient;
-
-/**
- 是否显示背景线条。
- 默认为YES
- */
-@property (nonatomic, assign) BOOL showPathBack;
-
-/**
- 是否从上次数值开始动画。
- 默认为NO，即每次都从0开始刷新。
- */
-@property (nonatomic, assign) BOOL increaseFromLast;
-
-/**
- 不加动画。
- 默认为NO。
- */
-@property (nonatomic, assign) BOOL notAnimated;
-
-/**
- 是否显示小圆点。
- 默认为NO
- */
-@property (nonatomic, assign) BOOL showPoint;
-
-/**
- 是否显示进度文本。
- 默认为YES
- */
-@property (nonatomic, assign) BOOL showProgressText;
-
-/**
- 动画是否同等时间。
- 为YES则不同进度动画时长都为animationDuration，
- 为NO则根据不同进度对应不同动画时长，进度最大时动画时长为animationDuration。
- 默认为YES
- */
-@property (nonatomic, assign) BOOL animationSameTime;
-
-
-/**
- 初始化
-
- @param frame 坐标
- @param startColor 开始颜色
- @param endColor 结束颜色
- @param startAngle 开始角度
- @param reduceAngle 缺少角度
- @param strokeWidth 线条宽度
- @return self
- */
-- (instancetype)initWithFrame:(CGRect)frame
-                   startColor:(UIColor *)startColor
-                     endColor:(UIColor *)endColor
-                   startAngle:(CGFloat)startAngle
-                  reduceAngle:(CGFloat)reduceAngle
-                  strokeWidth:(CGFloat)strokeWidth;
-
-
-
-@end

HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJCircularGradientProgress.m

@@ -1,458 +0,0 @@
-//
-//  ZZGradientProgress.m
-//  ZZGradientProgress
-//
-//  Created by 周兴 on 2018/2/6.
-//  Copyright © 2018年 周兴. All rights reserved.
-//
-#define ZZCircleDegreeToRadian(d) ((d)*M_PI)/180.0
-#define ZZCircleSelfWidth self.frame.size.width
-#define ZZCircleSelfHeight self.frame.size.height
-
-#import "HJCircularGradientProgress.h"
-
-@interface HJCircularGradientProgress ()
-
-@property (nonatomic, strong) CADisplayLink *playLink;
-@property (nonatomic, assign) CGFloat fakeProgress;
-@property (nonatomic, assign) CGFloat increaseValue;
-@property (nonatomic, assign) BOOL isReverse;
-@property (nonatomic, strong) UILabel *progressLabel;
-
-@end
-
-@implementation HJCircularGradientProgress
-
-- (instancetype)init {
-    
-    if (self = [super init])
-    {
-        [self initialization];
-    }
-    return self;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    
-    if (self = [super initWithFrame:frame])
-    {
-        [self initialization];
-    }
-    return self;
-}
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    [self initialization];
-}
-
-/**
- 初始化
- 
- @param frame 坐标
- @param startColor 开始颜色
- @param endColor 结束颜色
- @param startAngle 开始角度
- @param reduceAngle 缺少角度
- @param strokeWidth 线条宽度
- @return self
- */
-- (instancetype)initWithFrame:(CGRect)frame
-                   startColor:(UIColor *)startColor
-                     endColor:(UIColor *)endColor
-                   startAngle:(CGFloat)startAngle
-                  reduceAngle:(CGFloat)reduceAngle
-                  strokeWidth:(CGFloat)strokeWidth {
-    
-    if (self = [super initWithFrame:frame])
-    {
-        
-        [self initialization];
-        
-        _startColor = startColor;
-        _endColor = endColor;
-        _startAngle = ZZCircleDegreeToRadian(startAngle);
-        _reduceAngle = ZZCircleDegreeToRadian(reduceAngle);
-        _strokeWidth = strokeWidth;
-
-        
-        [self addSubview:self.progressLabel];
-        [self.progressLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            
-            make.center.equalTo(self);
-        }];
-    
-    }
-    return self;
-}
-
-- (void)initialization {
-    
-    self.backgroundColor = [UIColor clearColor];
-    
-    _startColor = [UIColor redColor];
-    _endColor = [UIColor cyanColor];
-    _pathBackColor = [UIColor lightGrayColor];
-    _textColor = [UIColor blueColor];
-    _textFont = [UIFont systemFontOfSize:0.15*ZZCircleSelfWidth];
-    
-    _strokeWidth = 10;
-    _subdivCount = 64;
-    _animationDuration = 2;
-    _radius = MIN(CGRectGetWidth(self.frame), CGRectGetHeight(self.frame))/2.0;
-    _startAngle = -ZZCircleDegreeToRadian(90);
-    _reduceAngle = ZZCircleDegreeToRadian(0);
-    
-    _showProgressText = YES;
-    _animationSameTime = YES;
-    _colorGradient = YES;
-    
-}
-
--(void)drawRect:(CGRect)rect {
-    
-    CGContextRef ctx = UIGraphicsGetCurrentContext();
-    
-    [self.backgroundColor set];
-    
-    UIRectFill(self.bounds);
-    
-    CGRect r = self.bounds;
-    
-    if (r.size.width > r.size.height)
-        r.size.width=r.size.height;
-    else r.size.height=r.size.width;
-    
-    [self drawGradientInContext:ctx
-                  startingAngle:_startAngle
-                       endAngle:_startAngle + _fakeProgress*(2*M_PI - _reduceAngle)
-                      intRadius:_radius - _strokeWidth
-                      outRadius:_radius - 1
-                     withSubdiv:_subdivCount<=5?5:_subdivCount
-                     withCenter:CGPointMake(CGRectGetMidX(r), CGRectGetMidY(r))];
-    
-}
-
-- (void)drawGradientInContext:(CGContextRef)ctx startingAngle:(float)startAngle endAngle:(float)endAngle intRadius:(CGFloat)intRadius outRadius:(CGFloat)outRadius withSubdiv:(int)subdivCount withCenter:(CGPoint)center {
-    
-    if (_showPathBack) {
-        //背景线条
-        UIBezierPath *basePath = [UIBezierPath bezierPathWithArcCenter:center radius:outRadius-_strokeWidth/2.0 + 0.5 startAngle:_startAngle endAngle:_startAngle + 2*M_PI - _reduceAngle clockwise:YES];
-        CGContextSetLineWidth(ctx, _strokeWidth);
-        if (_roundStyle) {
-            CGContextSetLineCap(ctx, kCGLineCapRound);
-        }
-        [_pathBackColor setStroke];
-        CGContextAddPath(ctx, basePath.CGPath);
-        CGContextStrokePath(ctx);
-    }
-    
-    float angleDelta = (endAngle - startAngle)/subdivCount;//每一块的角度
-    
-    CGPoint p0,p1,p2,p3;
-    
-    float currentAngle = startAngle;
-    p0 = [self pointForTrapezoidWithAngle:currentAngle andRadius:intRadius forCenter:center];
-    p3 = [self pointForTrapezoidWithAngle:currentAngle andRadius:outRadius forCenter:center];
-    CGMutablePathRef innerEnveloppe = CGPathCreateMutable(),
-    outerEnveloppe = CGPathCreateMutable();
-    
-    CGPathMoveToPoint(outerEnveloppe, 0, p3.x, p3.y);
-    CGPathMoveToPoint(innerEnveloppe, 0, p0.x, p0.y);
-    CGContextSaveGState(ctx);
-    CGContextSetLineWidth(ctx, 1);
-    
-    for (int i = 0;i < subdivCount; i++)
-    {
-        float fraction = (float)i/subdivCount;
-        float colorFraction = fraction;
-        
-        if (!_colorGradient)
-        {
-            colorFraction = _fakeProgress*i/subdivCount;
-        }
-        
-        UIColor *currentColor = [self getGradientColor:colorFraction];
-        
-        currentAngle = startAngle + fraction*(endAngle - startAngle);
-        CGMutablePathRef trapezoid = CGPathCreateMutable();
-        
-        p1 = [self pointForTrapezoidWithAngle:currentAngle + angleDelta andRadius:intRadius forCenter:center];
-        p2 = [self pointForTrapezoidWithAngle:currentAngle + angleDelta andRadius:outRadius forCenter:center];
-        
-        CGPathMoveToPoint(trapezoid, 0, p0.x, p0.y);
-        CGPathAddLineToPoint(trapezoid, 0, p1.x, p1.y);
-        CGPathAddLineToPoint(trapezoid, 0, p2.x, p2.y);
-        CGPathAddLineToPoint(trapezoid, 0, p3.x, p3.y);
-        CGPathCloseSubpath(trapezoid);
-        
-        CGPoint centerofTrapezoid = CGPointMake((p0.x + p1.x + p2.x + p3.x)/4, (p0.y + p1.y + p2.y + p3.y)/4);
-        
-        CGAffineTransform t = CGAffineTransformMakeTranslation(-centerofTrapezoid.x, -centerofTrapezoid.y);
-        CGAffineTransform s = CGAffineTransformMakeScale(1, 1);
-        CGAffineTransform concat = CGAffineTransformConcat(t, CGAffineTransformConcat(s, CGAffineTransformInvert(t)));
-        CGPathRef scaledPath = CGPathCreateCopyByTransformingPath(trapezoid, &concat);
-        
-        CGContextAddPath(ctx, scaledPath);
-        CGContextSetFillColorWithColor(ctx, currentColor.CGColor);
-        CGContextSetStrokeColorWithColor(ctx, currentColor.CGColor);
-        CGContextSetMiterLimit(ctx, 0);
-        
-        CGContextDrawPath(ctx, kCGPathFillStroke);
-        
-        CGPathRelease(trapezoid);
-        
-        if (_roundStyle) {
-            //画半圆
-            if (i == 0) {
-                
-                CGPoint roundCenter = CGPointMake((p0.x+p3.x)/2.0, (p0.y+p3.y)/2.0);
-                
-                CGMutablePathRef halfCircle = CGPathCreateMutable();
-                CGPathAddArc(halfCircle, &concat, roundCenter.x, roundCenter.y, (outRadius-intRadius)/2.0, M_PI-currentAngle, 2*M_PI-currentAngle, 1);
-                
-                CGContextSetFillColorWithColor(ctx, currentColor.CGColor);
-                CGContextSetStrokeColorWithColor(ctx, currentColor.CGColor);
-                
-                CGPathCloseSubpath(halfCircle);
-                
-                CGPathRef halfCirclePath = CGPathCreateCopyByTransformingPath(halfCircle, &concat);
-                
-                CGContextAddPath(ctx, halfCirclePath);
-                CGContextDrawPath(ctx, kCGPathFillStroke);
-                CGPathRelease(halfCircle);
-            }
-            else if (i == subdivCount-1)
-            {
-                
-                //最后一个梯形
-                CGPoint roundCenter = CGPointMake((p1.x+p2.x)/2.0, (p1.y+p2.y)/2.0);
-                
-                CGMutablePathRef halfCircle = CGPathCreateMutable();
-                CGPathAddArc(halfCircle, &concat, roundCenter.x, roundCenter.y, (outRadius-intRadius)/2.0, M_PI+currentAngle+angleDelta, 2*M_PI+currentAngle+angleDelta, 1);
-                
-                CGContextSetFillColorWithColor(ctx, currentColor.CGColor);
-                CGContextSetStrokeColorWithColor(ctx, currentColor.CGColor);
-                
-                CGPathCloseSubpath(halfCircle);
-                
-                CGPathRef halfCirclePath = CGPathCreateCopyByTransformingPath(halfCircle, &concat);
-                
-                CGContextAddPath(ctx, halfCirclePath);
-                CGContextDrawPath(ctx, kCGPathFillStroke);
-                CGPathRelease(halfCircle);
-                
-                
-            }
-        }
-        
-        //画小圆点
-        if (_showPoint && i == subdivCount-1)
-        {
-            CGPoint imageCenter = CGPointMake((p1.x+p2.x)/2.0, (p1.y+p2.y)/2.0);
-            CGContextDrawImage(ctx, CGRectMake(imageCenter.x-0.5*_strokeWidth, imageCenter.y-0.5*_strokeWidth, _strokeWidth, _strokeWidth), _pointImage.CGImage);
-        }
-        
-        //画文字
-        if (_showProgressText)
-        {
-            NSString *currentText = [NSString stringWithFormat:@"%.0f%%",_fakeProgress*100];
-
-            self.progressLabel.text = currentText;
-//            NSMutableParagraphStyle *textStyle = [[NSMutableParagraphStyle alloc] init];
-//            textStyle.lineBreakMode = NSLineBreakByWordWrapping;
-//            textStyle.alignment = NSTextAlignmentCenter;
-//
-//            NSDictionary *attributes = @{
-//                                         NSFontAttributeName:_textFont,
-//                                         NSForegroundColorAttributeName:_textColor,
-//                                         NSParagraphStyleAttributeName:textStyle
-//                                         };
-//            CGSize stringSize = [currentText sizeWithAttributes:attributes];
-//            //垂直居中
-//            CGRect r = CGRectMake((int)((ZZCircleSelfWidth-stringSize.width)/2.0), (int)((ZZCircleSelfHeight - stringSize.height)/2.0),(int)stringSize.width, (int)stringSize.height);
-//            [currentText drawInRect:r withAttributes:attributes];
-        }
-        
-        p0=p1;
-        p3=p2;
-        
-        CGPathAddLineToPoint(outerEnveloppe, 0, p3.x, p3.y);
-        CGPathAddLineToPoint(innerEnveloppe, 0, p0.x, p0.y);
-    }
-    
-    CGPathRelease(innerEnveloppe);
-    CGPathRelease(outerEnveloppe);
-}
-
-- (void)setProgress:(CGFloat)progress {
-    
-    if (progress>1.0 || progress<0.0) {
-        return;
-    }
-    
-    _fakeProgress = _increaseFromLast==YES?_progress:0.0;
-    _isReverse = progress<_fakeProgress?YES:NO;
-    
-    _progress = progress;
-    
-    if (_notAnimated)
-    {
-        _fakeProgress = _progress;
-        [self setNeedsDisplay];
-    }
-    else
-    {
-        
-        if (_increaseFromLast)
-        {
-            //从上次开始动画
-            if (_animationSameTime)
-            {
-                _increaseValue = (_progress - _fakeProgress)/(30.0*_animationDuration);
-            }
-            else
-            {
-                _increaseValue = _isReverse==YES?-1.0/(30.0*_animationDuration):1.0/(30.0*_animationDuration);
-            }
-        }
-        else
-        {
-            //从新开始动画
-            if (_animationSameTime)
-            {
-                _increaseValue = _progress/(30.0*_animationDuration);
-            }
-            else
-            {
-                _increaseValue = 1.0/(30.0*_animationDuration);
-            }
-        }
-        
-        if (self.playLink)
-        {
-            [self.playLink invalidate];
-            self.playLink = nil;
-        }
-        
-        CADisplayLink *playLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(countingAction)];
-        if (@available(iOS 10.0, *)) {
-            playLink.preferredFramesPerSecond = 30;
-        } else {
-            playLink.frameInterval = 2;//不可更改
-        }
-        [playLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
-        [playLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:UITrackingRunLoopMode];
-        self.playLink = playLink;
-    }
-    
-}
-
-- (void)countingAction {
-    
-    _fakeProgress += _increaseValue;
-    [self setNeedsDisplay];
-    
-    if (_increaseFromLast) {
-        if (_isReverse) {
-            if (_fakeProgress <= _progress) {
-                [self dealWithLast];
-            }
-        } else {
-            if (_fakeProgress >= _progress) {
-                [self dealWithLast];
-            }
-        }
-    } else {
-        if (_fakeProgress >= _progress) {
-            [self dealWithLast];
-        }
-    }
-    
-}
-
-- (void)dealWithLast {
-    
-    _fakeProgress = _progress;
-    [self.playLink invalidate];
-    self.playLink = nil;
-    
-    [self setNeedsDisplay];
-}
-
-//获取当前颜色
-- (UIColor *)getGradientColor:(CGFloat)current {
-    
-    CGFloat c1[4];
-    CGFloat c2[4];
-    
-    [_startColor getRed:&c1[0] green:&c1[1] blue:&c1[2] alpha:&c1[3]];
-    [_endColor getRed:&c2[0] green:&c2[1] blue:&c2[2] alpha:&c2[3]];
-    
-    return [UIColor colorWithRed:current*c2[0]+(1-current)*c1[0] green:current*c2[1]+(1-current)*c1[1] blue:current*c2[2]+(1-current)*c1[2] alpha:current*c2[3]+(1-current)*c1[3]];
-}
-
-//获取点
-- (CGPoint)pointForTrapezoidWithAngle:(float)a andRadius:(float)r forCenter:(CGPoint)p {
-    return CGPointMake(p.x + r*cos(a), p.y + r*sin(a));
-}
-
-#pragma Set
-- (void)setStartAngle:(CGFloat)startAngle {
-    if (_startAngle != ZZCircleDegreeToRadian(startAngle)) {
-        _startAngle = ZZCircleDegreeToRadian(startAngle);
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setReduceAngle:(CGFloat)reduceAngle {
-    if (_reduceAngle != ZZCircleDegreeToRadian(reduceAngle)) {
-        if (reduceAngle>=360) {
-            return;
-        }
-        _reduceAngle = ZZCircleDegreeToRadian(reduceAngle);
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setStrokeWidth:(CGFloat)strokeWidth {
-    if (_strokeWidth != strokeWidth) {
-        _strokeWidth = strokeWidth;
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setPathBackColor:(UIColor *)pathBackColor {
-    if (_pathBackColor != pathBackColor) {
-        _pathBackColor = pathBackColor;
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setShowPoint:(BOOL)showPoint {
-    if (_showPoint != showPoint) {
-        _showPoint = showPoint;
-        [self setNeedsDisplay];
-    }
-}
-
--(void)setShowProgressText:(BOOL)showProgressText {
-    
-    if (_showProgressText != showProgressText)
-    {
-        _showProgressText = showProgressText;
-        [self setNeedsDisplay];
-    }
-}
-- (UILabel *)progressLabel {
-    
-    if (_progressLabel == nil)
-    {
-        _progressLabel = [[UILabel alloc]init];
-        _progressLabel.font = [UIFont systemFontOfSize:17];
-        _progressLabel.textColor = [UIColor colorFromHexString:@"0071DE"];
-    }
-    return _progressLabel;
-}
-
-@end

HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJMeHeaderView.m

@@ -48,7 +48,7 @@
 }
 
 - (void)didMoveToSuperview {
-    
+
     [super didMoveToSuperview];
     //在这里添加解决iOS9使用自动布局的Bug
     if (self.superview != nil)

HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJMeProfileView.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "HJPortraitView.h"
+//#import "HJPortraitView.h"
 #import "HJUserInfoModel.h"
 
 NS_ASSUME_NONNULL_BEGIN

HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJMeProfileView.m

@@ -7,7 +7,6 @@
 //
 
 #import "HJMeProfileView.h"
-#import "UIView+AZGradient.h"
 
 @interface HJMeProfileView ()
 
@@ -39,7 +38,9 @@
     
     [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.mas_top).offset(0);
-        make.left.right.equalTo(self).offset(0);
+        make.left.equalTo(self.mas_left).offset(0);
+        make.right.equalTo(self.mas_right).offset(0);
+//        make.bottom.equalTo(self.mas_bottom).offset(0);
     }];
     [self.headImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(self.bgImageView).with.offset(-40);
@@ -50,7 +51,7 @@
     
     [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.bgImageView).offset(35);
-        make.centerY.equalTo(self.bgImageView);
+        make.top.equalTo(self.bgImageView.mas_top).offset(68);
         make.width.mas_lessThanOrEqualTo(HJHorizontalScale(140));
     }];
     [self.phoneLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -63,9 +64,10 @@
         make.size.mas_equalTo(CGSizeMake(45, 16));
     }];
     [self.authBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.bgImageView.mas_bottom).with.offset(0);
-        make.left.right.equalTo(self).offset(0);
-        make.height.mas_equalTo(1);
+        make.top.equalTo(self.bgImageView.mas_bottom).offset(0);
+        make.left.equalTo(self.mas_left).offset(0);
+        make.right.equalTo(self.mas_right).offset(0);
+        make.height.mas_equalTo(0);
         make.bottom.equalTo(self.mas_bottom).offset(0);
     }];
     self.authBtn.hidden = YES;
@@ -90,20 +92,14 @@
     if (self.auth)
     {
         [self.authBtn mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.bgImageView.mas_bottom).with.offset(0);
-            make.left.right.equalTo(self).offset(0);
-            make.height.mas_equalTo(1);
-            make.bottom.equalTo(self.mas_bottom).offset(0);
+            make.height.mas_equalTo(0);
         }];
         self.authBtn.hidden = YES;
     }
     else
     {
         [self.authBtn mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.bgImageView.mas_bottom).with.offset(0);
-            make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(41);
-            make.bottom.equalTo(self.mas_bottom).offset(0);
         }];
         self.authBtn.hidden = NO;
     }
@@ -199,7 +195,6 @@
         _tagLabel.textAlignment = NSTextAlignmentCenter;
         _tagLabel.text = @"未认证";
         _tagLabel.backgroundColor = COLOR_BBBBBB;
-
     }
     return _tagLabel;
 }

HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJMeResumeView.m

@@ -7,7 +7,6 @@
 //
 
 #import "HJMeResumeView.h"
-#import "HJCircularGradientProgress.h"
 
 @interface HJMeResumeView ()
 

HappyJob/HappyJob/CClass/Me_我/ViewController/HJMeViewController.m

@@ -94,6 +94,8 @@ FBAPIManagerDelegate
 
 - (void)makeConstraints {
     
+    //使用自动布局的时候先设置tableView的布局再给tableView.tableHeaderView赋值，不然会有布局Bug
+    self.tableView.tableHeaderView = self.dataBox.headerView;//设置头部视图
     [self.navBarView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.right.equalTo(self.view);
         make.height.mas_equalTo(HJNavBarDefaultHeight);
@@ -101,8 +103,7 @@ FBAPIManagerDelegate
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(self.view);
     }];
-    //使用自动布局的时候先设置tableView的布局再给tableView.tableHeaderView赋值，不然会有布局Bug
-    self.tableView.tableHeaderView = self.dataBox.headerView;//设置头部视图
+    
 }
 
 #pragma mark - FBAPIManagerInterceptor
@@ -540,7 +541,7 @@ FBAPIManagerDelegate
         _tableView.backgroundColor = COLOR_F5F5F5;
         _tableView.estimatedRowHeight = 10.0;
         _tableView.separatorStyle = NO;
-        // 去除顶部空白
+        //去除顶部空白
         if (@available(iOS 11.0, *))
         {
             _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;

HappyJob/HappyJob/HappyJob.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:web.hap-job.com</string>
+		<string>applinks:kf.hap-job.com</string>
 	</array>
 </dict>
 </plist>

HappyJob/HappyJob/Login_登录/ViewController/HJLoginBindPhoneViewController.m

@@ -54,8 +54,7 @@
 - (void)scrollLayoutViewMakeConstraints:(FBScrollLayoutView *)scrollLayoutView {
     
     [scrollLayoutView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.bottom.offset(0);
-        make.top.equalTo(self.view.mas_top).offset(-STATUS_BAR_H);
+        make.left.right.bottom.top.offset(0);
     }];
 }
 
@@ -186,6 +185,15 @@
     {
         _scrollLayoutView = [[FBScrollLayoutView alloc] init];
         _scrollLayoutView.delegate = self;
+        // 去除顶部空白
+        if (@available(iOS 11.0, *))
+        {
+            _scrollLayoutView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        }
+        else
+        {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
     }
     return _scrollLayoutView;
 }

HappyJob/HappyJob/Login_登录/ViewController/HJLoginCodeViewController.m

@@ -25,11 +25,14 @@
 
 @implementation HJLoginCodeViewController
 
+#pragma mark - life cycle
+
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:YES animated:YES];
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     

HappyJob/HappyJob/Login_登录/ViewController/HJLoginPhoneViewController.m

@@ -21,8 +21,6 @@
 #import "HJLoginGetAuthCodeAPIManager.h"
 #import "HJloginWeChatLoginAPIManager.h"
 
-
-
 @interface HJLoginPhoneViewController ()
 <
 HJWeiXinAPIManagerDelegate,
@@ -33,7 +31,7 @@ FBAPIManagerInterceptor
 >
 
 @property (nonatomic, strong) FBScrollLayoutView   *scrollLayoutView;
-@property (nonatomic, strong) HJLoginPhoneView     *naviView;
+@property (nonatomic, strong) HJLoginPhoneView     *phoneView;
 @property (nonatomic, strong) UIButton             *codeButton;
 @property (nonatomic, strong) HJLoginAgreementView *agreementView; // 用户协议视图
 @property (nonatomic, strong) UIButton             *wechatLoginButton;//微信登录button
@@ -43,7 +41,7 @@ FBAPIManagerInterceptor
 @property (nonatomic, strong) BMainViewController  *bmainTabBar;
 
 @property (nonatomic, strong) HJLoginGetAuthCodeAPIManager *getAuthCodeAPIManager;//获得验证码
-@property (nonatomic, strong) HJWeiXinAPIManager           *wxAPIManager;
+@property (nonatomic, strong) HJWeiXinAPIManager           *wxAPIManager;//微信
 @property (nonatomic, strong) HJLoginWeChatLoginAPIManager *wechatLgoinAPIManager;//微信登录
 
 @end
@@ -65,17 +63,17 @@ FBAPIManagerInterceptor
     self.title = @"手机登录";
     [self hj_setupNavBar];
     
-    [self addSubViews];
+    [self addSubViewsMakeConstraints];
     _wxAPIManager = [HJWeiXinAPIManager sharedManager];
     _wxAPIManager.delegate = self;
 }
 
-- (void)addSubViews {
+- (void)addSubViewsMakeConstraints {
     
     [self.view addSubview:self.scrollLayoutView];
-    [self.scrollLayoutView.contentView addSubview:self.naviView];
-    [self.scrollLayoutView.contentView addSubview:self.codeButton];
+    [self.scrollLayoutView.contentView addSubview:self.phoneView];
     [self.scrollLayoutView.contentView addSubview:self.agreementView];
+    [self.scrollLayoutView.contentView addSubview:self.codeButton];
     [self.scrollLayoutView.contentView addSubview:self.wechatLoginButton];
     [self.scrollLayoutView makeConstraints];
     [self.wechatLoginButton layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleTop imageTitleSpace:20];
@@ -86,14 +84,13 @@ FBAPIManagerInterceptor
 - (void)scrollLayoutViewMakeConstraints:(FBScrollLayoutView *)scrollLayoutView {
     
     [scrollLayoutView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.bottom.offset(0);
-        make.top.equalTo(self.view.mas_top).offset(-STATUS_BAR_H);
+        make.left.right.bottom.top.offset(0);
     }];
 }
 
 - (void)subviewsMakeConstraintsInScrollLayoutView:(FBScrollLayoutView *)scrollLayoutView contentView:(UIView *)contentView {
     
-    [self.naviView mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.phoneView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.top.equalTo(contentView).with.offset(0);
         make.left.equalTo(contentView).with.offset(0);
@@ -101,7 +98,7 @@ FBAPIManagerInterceptor
     }];
     [self.agreementView mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.top.equalTo(self.naviView.mas_bottom).offset(17);
+        make.top.equalTo(self.phoneView.mas_bottom).offset(17);
         make.left.equalTo(contentView).offset(45);
         make.right.equalTo(contentView).offset(-45);
     }];
@@ -167,7 +164,7 @@ FBAPIManagerInterceptor
     if (manager == self.getAuthCodeAPIManager)
     {
         HJLoginCodeViewController *loginVC = [[HJLoginCodeViewController alloc] init];
-        loginVC.phoneStr = self.naviView.phoneTF.text;
+        loginVC.phoneStr = self.phoneView.phoneTF.text;
         [self.navigationController pushViewController:loginVC animated:YES];
     }
     if (manager == self.wechatLgoinAPIManager && self.wechatLgoinAPIManager.type == HJLoginWeChatLoginAPIManagerTypeNotBinding)
@@ -221,17 +218,17 @@ FBAPIManagerInterceptor
     
     [self.view endEditing:NO];
 
-    if (self.naviView.phoneTF.text.length == 0 )
+    if (self.phoneView.phoneTF.text.length == 0 )
     {
         [self.view fb_showFailureWithStatus:@"用户名或手机号码不能为空"];
         return;
     }
-    if (self.naviView.phoneTF.text.length != 11)
+    if (self.phoneView.phoneTF.text.length != 11)
     {
         [self.view fb_showFailureWithStatus:@"请输入正确的手机号"];
         return;
     }
-   self.getAuthCodeAPIManager.phone = self.naviView.phoneTF.text;
+   self.getAuthCodeAPIManager.phone = self.phoneView.phoneTF.text;
    [self.getAuthCodeAPIManager start];
 
 }
@@ -245,7 +242,7 @@ FBAPIManagerInterceptor
 /* 手机号码 */
 - (void)textFieldTextDidChange:(UITextField *)textChange {
     
-    if (self.naviView.phoneTF.text.length == 11 )
+    if (self.phoneView.phoneTF.text.length == 11 )
     {
         _codeButton.userInteractionEnabled = YES;
         _codeButton.backgroundColor = COLOR_0177FF;
@@ -287,21 +284,30 @@ FBAPIManagerInterceptor
         _scrollLayoutView = [[FBScrollLayoutView alloc] init];
         _scrollLayoutView.delegate = self;
         _scrollLayoutView.backgroundColor = [UIColor whiteColor];
+        // 去除顶部空白
+        if (@available(iOS 11.0, *))
+        {
+            _scrollLayoutView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        }
+        else
+        {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
     }
     return _scrollLayoutView;
 }
-- (HJLoginPhoneView *)naviView {
+- (HJLoginPhoneView *)phoneView {
     
-    if (_naviView == nil)
+    if (_phoneView == nil)
     {
-        _naviView = [[HJLoginPhoneView alloc] init];
-        _naviView.titleLabel.text = @"登录开心工作";
-        [_naviView.backBtn addTarget:self action:@selector(backClick:) forControlEvents:UIControlEventTouchUpInside];
-        [_naviView.phoneTF addTarget:self
+        _phoneView = [[HJLoginPhoneView alloc] init];
+        _phoneView.titleLabel.text = @"登录开心工作";
+        [_phoneView.backBtn addTarget:self action:@selector(backClick:) forControlEvents:UIControlEventTouchUpInside];
+        [_phoneView.phoneTF addTarget:self
                   action:@selector(textFieldTextDidChange:)
         forControlEvents:UIControlEventEditingChanged];
     }
-    return _naviView;
+    return _phoneView;
 }
 - (UIButton *)codeButton {
     

HappyJob/HappyJob/Login_登录/ViewController/HJLoginUserAgreementViewController.m

@@ -19,7 +19,7 @@
 
 @implementation HJLoginUserAgreementViewController
 
-#pragma marrk - life cycle
+#pragma mark - life cycle
 
 - (void)viewWillAppear:(BOOL)animated {
     
@@ -33,7 +33,6 @@
     self.title = @"开心工作用户协议";
     [self hj_setupNavBar];
     [self addSubViews];
-    
 }
 
 - (void)addSubViews {

HappyJob/HappyJob/Login_登录/ViewController/HJWeChatLoginViewController.m

@@ -139,7 +139,6 @@
 
 #pragma mark - lazy
 
-
 - (HJLoginCodeView *)codeView {
     
     if (_codeView == nil)

HappyJob/HappyJob/Login_登录/信息合并/ViewController/HJLoginInfoMergeViewController.m

@@ -86,7 +86,6 @@ FBAPIManagerInterceptor
         make.top.equalTo(self.view.mas_top).offset(0);
         make.bottom.equalTo(self.view).offset(0);
     }];
-    
 }
 
 #pragma mark - UITableView代理
@@ -110,7 +109,6 @@ FBAPIManagerInterceptor
         HJLoginInfoLookResumeViewController *vc =[[HJLoginInfoLookResumeViewController alloc]init];
         vc.resumeDict = self.userList[indexPath.row];
         [self.navigationController pushViewController:vc animated:YES];
-        
     };
     return cell;
 }
@@ -128,7 +126,6 @@ FBAPIManagerInterceptor
     [self.tableView reloadData];
     _makeSureBtn.userInteractionEnabled = YES;
     _makeSureBtn.backgroundColor = COLOR_0177FF;
-    
 }
 - (void)autoLayOutViews {
     

HappyJob/HappyJob/Main_标签栏控制器/AppDelegate.m

@@ -119,6 +119,10 @@
     
     return YES;
 }
+- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void(^)(NSArray<id<UIUserActivityRestoring>> * __nullable restorableObjects))restorationHandler
+{
+    return [WXApi handleOpenUniversalLink:userActivity delegate:[HJWeiXinAPIManager sharedManager]];
+}
 
 #pragma mark - HJWelcomeViewDelegate
 

HappyJob/HappyJob/Support/HJConfig.h

@@ -13,7 +13,7 @@
 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 kuniversalLink = @"https://kf.hap-job.com/";
+static NSString * const kuniversalLink = @"https://kf.hap-job.com/happyjob/";
 
 /* ------ 正式服接口地址 -------*/
 //static NSString * const kHJBaseURL = @"https://web.hap-job.com/happyjob/f/api/";
@@ -21,7 +21,7 @@ static NSString * const kuniversalLink = @"https://kf.hap-job.com/";
 //static NSString * const kBuglyAppID = @"b532795704";
 // /* 微信开放平台AppID，注册地址：https:open.weixin.qq.com */
 //static NSString * const kWeiXinAPIKey = @"wxeb8c2418a8ace030";
-//static NSString * const  kuniversalLink = @"https://web.hap-job.com/";
+//static NSString * const kuniversalLink = @"https://web.hap-job.com/happyjob/";
 
 
 /* 使用高德地图API，请注册Key，注册地址：http://lbs.amap.com/dev/#/ */