ios 13bug修改

HappyJob/HappyJob/CClass/Home_首页/City_城市定位/HJCityPickerLocationView.m

@@ -106,8 +106,8 @@
     {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.text = @"当前定位";
-        _titleLabel.textColor = [UIColor colorWithRed:153/255.0 green:153/255.0 blue:153/255.0 alpha:1.0];
-        _titleLabel.font = [UIFont systemFontOfSize:13];
+        _titleLabel.textColor = COLOR_GRAY9;
+        _titleLabel.font = [UIFont systemFontOfSize:14];
     }
     return _titleLabel;
 }
@@ -117,8 +117,8 @@
     {
         _cityLabel = [[UILabel alloc] init];
         _cityLabel.text = [HJCityPickerCity locationCity].name;
-        _cityLabel.textColor = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
-        _cityLabel.font = [UIFont systemFontOfSize:16];
+        _cityLabel.textColor = COLOR_BACK3;
+        _cityLabel.font = [UIFont boldSystemFontOfSize:16];
     }
     return _cityLabel;
 }
@@ -127,8 +127,9 @@
     
     if (_locationButton == nil)
     {
-        _locationButton = [UIButton buttonWithType:UIButtonTypeSystem];
-        _locationButton.titleLabel.font = [UIFont systemFontOfSize:13];
+        _locationButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        _locationButton.titleLabel.font = [UIFont systemFontOfSize:14];
+        [_locationButton setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [_locationButton setTitle:@"重新定位" forState:UIControlStateNormal];
         [_locationButton addTarget:self action:@selector(locationButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
     }

HappyJob/HappyJob/CClass/Home_首页/City_城市定位/HJCityPickerViewController.m

@@ -92,7 +92,6 @@ static NSString *const UITableViewCellReuseID = @"UITableViewCellReuseID";
     
     return (cityGroup.type == HJCityPickerGroupModelTypeHotCity) ? 1 : cityGroup.cityArray.count;
 }
-
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
     
     HJCityPickerGroupModel *cityGroup = [self.cityGroupArray objectAtIndex:section];
@@ -151,6 +150,8 @@ static NSString *const UITableViewCellReuseID = @"UITableViewCellReuseID";
                 cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:UITableViewCellReuseID];
             }
             cell.textLabel.text = city.name;
+            cell.textLabel.font = [UIFont systemFontOfSize:16];
+            cell.textLabel.textColor = COLOR_BACK3;
             return cell;
         }
     }

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

@@ -143,6 +143,7 @@
 - (void)navBarViewCityButtonClicked:(HJNavBarView *)navBarView {
     //城市选择
     HJCityPickerViewController *cityViewController = [[HJCityPickerViewController alloc] init];
+    cityViewController.modalPresentationStyle = UIModalPresentationFullScreen;
     [self presentViewController:cityViewController animated:YES completion:nil];
 }
 
@@ -151,6 +152,7 @@
     // 先用导航控制器包一层，不然在搜索页面push视图的时候会失效
     HJSearchViewController *searchViewController = [[HJSearchViewController alloc] init];
     UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:searchViewController];
+    nav.modalPresentationStyle = UIModalPresentationFullScreen;
     [self presentViewController:nav animated:YES completion:nil];
 }
 

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

@@ -111,7 +111,7 @@
         _cityButton = [UIButton buttonWithType:UIButtonTypeCustom];
         [_cityButton setImage:[UIImage imageNamed:@"navbar_location_white"] forState:UIControlStateNormal];
         _cityButton.titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
-        _cityButton.titleLabel.font = [UIFont systemFontOfSize:16];
+        _cityButton.titleLabel.font = [UIFont boldSystemFontOfSize:15];
         [_cityButton addTarget:self action:@selector(cityButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _cityButton;

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

@@ -114,7 +114,7 @@
         _historyLabel = [[UILabel alloc] init];
         _historyLabel.textColor = COLOR_BACK3;
         _historyLabel.text = @"历史纪录：";
-        _historyLabel.font = [UIFont systemFontOfSize:13];
+        _historyLabel.font = [UIFont boldSystemFontOfSize:14];
     }
     return _historyLabel;
 }

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

@@ -89,7 +89,7 @@
         _hotLabel = [[UILabel alloc] init];
         _hotLabel.textColor = COLOR_BACK3;
         _hotLabel.text = @"热门搜索：";
-        _hotLabel.font = [UIFont systemFontOfSize:14];
+        _hotLabel.font = [UIFont boldSystemFontOfSize:14];
     }
     return _hotLabel;
 }

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

@@ -214,7 +214,7 @@
     {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:19];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:18];
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
     return _titleLabel;

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

@@ -109,7 +109,7 @@
     if (_titleLabel == nil)
     {
         _titleLabel = [[UILabel alloc]init];
-        _titleLabel.font = [UIFont systemFontOfSize:18];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:18];
         _titleLabel.textColor = COLOR_BACK3;
         _titleLabel.text = @"公司信息";
     }

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

@@ -403,7 +403,7 @@ NSString * const HJPositionListRefreshNotification = @"HJPositionListRefreshNoti
     {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:21];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:21];
     }
     return _titleLabel;
 }

HappyJob/HappyJob/CClass/Join_拼工/Apply_申请拼工/HJJoinApplyHeaderView.m

@@ -125,7 +125,7 @@
     {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:21];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:21];
     }
     return _titleLabel;
 }

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

@@ -216,7 +216,7 @@
     {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:19];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:18];
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
     return _titleLabel;

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

@@ -56,7 +56,7 @@
     button.titleLabel.textAlignment = NSTextAlignmentCenter;
     [button setImage:[UIImage imageNamed:imageNamed] forState:UIControlStateNormal];
     [button setTitle:title forState:UIControlStateNormal];
-    [button setTitleColor:COLOR_BACK6 forState:UIControlStateNormal];
+    [button setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
     //文字图片上下显示
     CGSize imageSize = CGSizeMake(HJHorizontalScale(34), HJHorizontalScale(34));
     CGSize titleSize = CGSizeMake(HJHorizontalScale(60), HJHorizontalScale(13));

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

@@ -173,7 +173,7 @@
     {
         _nameLabel = [[UILabel alloc] init];
         _nameLabel.textColor = [UIColor whiteColor];
-        _nameLabel.font = [UIFont systemFontOfSize:21];
+        _nameLabel.font = [UIFont boldSystemFontOfSize:21];
         _nameLabel.text = @"开心用户";
     }
     return _nameLabel;

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

@@ -147,7 +147,7 @@
     {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:17];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:17];
         _titleLabel.text = @"我的简历";
     }
     return _titleLabel;

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/Cell_岗位列表样式/HJPartTimeCellView.m

@@ -91,7 +91,7 @@
     {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:19];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:18];
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
     return _titleLabel;

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/JobDetail_职位详情/HJJobDetailForwardView.m

@@ -151,7 +151,7 @@
     {
         _citylabel = [[UILabel alloc] init];
         _citylabel.textColor = COLOR_BACK6;
-        _citylabel.font = [UIFont systemFontOfSize:14];
+        _citylabel.font = [UIFont systemFontOfSize:13];
     }
     return _citylabel;
 }

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/JobDetail_职位详情/HJJobDetailInfoView.m

@@ -104,7 +104,7 @@
     {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:18];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:18];
     }
     return _titleLabel;
 }

HappyJob/HappyJob/Custom/Components/CustomControl/UIViewController/HJConfirmPanelViewController.m

@@ -142,7 +142,7 @@
         _titleLabel.numberOfLines = 0;
         _titleLabel.textAlignment = NSTextAlignmentCenter;
         _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:16];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:16];
     }
     return _titleLabel;
 }
@@ -165,7 +165,7 @@
     if (_confirmButton == nil)
     {
         _confirmButton = [UIButton buttonWithType:UIButtonTypeSystem];
-        _confirmButton.titleLabel.font = [UIFont systemFontOfSize:16];
+        _confirmButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
         [_confirmButton setTitle:@"确认删除" forState:UIControlStateNormal];
         [_confirmButton setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
     }

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

@@ -253,7 +253,7 @@
     if (_bindingButton == nil)
     {
         _bindingButton = [[UIButton alloc] init];
-        _bindingButton.layer.cornerRadius = 22;
+        _bindingButton.layer.cornerRadius = 5;
         _bindingButton.layer.masksToBounds = YES;
         _bindingButton.titleLabel.font = [UIFont systemFontOfSize:17];
         _bindingButton.userInteractionEnabled = YES;

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

@@ -337,7 +337,7 @@
     if (_loginButton == nil)
     {
         _loginButton = [[UIButton alloc] init];
-        _loginButton.layer.cornerRadius = 25;
+        _loginButton.layer.cornerRadius = 5;
         _loginButton.layer.masksToBounds = YES;
         _loginButton.titleLabel.font = [UIFont systemFontOfSize:HJHorizontalScale(19)];
         [_loginButton setTitle:@"登录" forState:UIControlStateNormal];
@@ -367,14 +367,18 @@
         [_wechatLoginButton setTitle:@"微信快捷登录" forState:UIControlStateNormal];
         [_wechatLoginButton setTitleColor:COLOR_BACKC forState:UIControlStateNormal];
         [_wechatLoginButton addTarget:self action:@selector(wechatLoginButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
-        
+        _wechatLoginButton.imageView.contentMode = UIViewContentModeScaleAspectFit;
         //文字图片上下显示
         CGSize imageSize = CGSizeMake(28, 23);
         CGSize titleSize = CGSizeMake(75, 10);
         CGFloat maxWidth = MAX(imageSize.width, titleSize.width);
         CGFloat padding = 20;
-        _wechatLoginButton.imageRect = CGRectMake((maxWidth - imageSize.width) / 2, 0, imageSize.width, imageSize.height);
-        _wechatLoginButton.titleRect = CGRectMake((maxWidth - titleSize.width) / 2, imageSize.height + padding, titleSize.width, titleSize.height);
+//        _wechatLoginButton.imageRect = CGRectMake((maxWidth - imageSize.width) / 2, 0, imageSize.width, imageSize.height);
+//        _wechatLoginButton.titleRect = CGRectMake((maxWidth - titleSize.width) / 2, imageSize.height + padding, titleSize.width, titleSize.height);
+        
+        [_wechatLoginButton setImageEdgeInsets:UIEdgeInsetsMake(0, 0, titleSize.height + padding, 0)];
+        [_wechatLoginButton setTitleEdgeInsets:UIEdgeInsetsMake(imageSize.height + padding, - titleSize.width, 0, 0)];
+        
         _wechatLoginButton.frame = CGRectMake(0, 0, maxWidth, imageSize.height + titleSize.height + padding);
     }
     return _wechatLoginButton;