3.3.1bug的修改

HappyJob/HappyJob.xcodeproj/project.pbxproj

@@ -4914,7 +4914,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "HappyJob/HappyJob-Prefix.pch";
 				INFOPLIST_FILE = HappyJob/Info.plist;
@@ -4923,7 +4923,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.0;
+				MARKETING_VERSION = 3.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.kaixing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4939,7 +4939,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "HappyJob/HappyJob-Prefix.pch";
 				INFOPLIST_FILE = HappyJob/Info.plist;
@@ -4948,7 +4948,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.0;
+				MARKETING_VERSION = 3.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.kaixing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -53,10 +53,12 @@
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.bgicon.mas_left).offset(36);
+        make.width.mas_lessThanOrEqualTo(150);
         make.top.equalTo(self.bgicon.mas_top).offset(127);
     }];
     [self.companyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.titleLabel);
+        make.width.mas_lessThanOrEqualTo(150);
         make.top.equalTo(self.titleLabel.mas_bottom).offset(HJHorizontalScale(3));
     }];
     [self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -67,6 +69,7 @@
     [self.welfareView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.titleLabel);
         make.right.equalTo(self.bgicon.mas_right).offset(-36);
+//        make.width.mas_lessThanOrEqualTo(100);
         make.top.equalTo(self.moneyLabel.mas_bottom).offset(HJHorizontalScale(6));
         make.height.mas_equalTo(19);
     }];
@@ -82,7 +85,7 @@
     }];
     
     [self.qrcodeImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-       //HJHorizontalScale(66)
+       
         make.left.equalTo(self.bgicon.mas_left).offset(42);
         make.bottom.equalTo(self.bgicon.mas_bottom).offset(-52);
         make.size.mas_offset(CGSizeMake(66, 66));
@@ -128,11 +131,17 @@
     
     if (positionType == HJPositionTypePartTime || positionType == HJPositionTypeBPartTime)
     {//兼职，自发布兼职
-        self.welfareTagArray = [model.position.welfare componentsSeparatedByString:@","];
+        if (model.position.welfare.length > 0)
+        {
+            self.welfareTagArray = [model.position.welfare componentsSeparatedByString:@","];
+        }
     }
     else if (positionType == HJPositionTypeBenefit)
     {//福利岗位
-        self.welfareTagArray  = [model.position.settlementMethod componentsSeparatedByString:@","];
+        if (model.position.settlementMethod.length > 0)
+        {
+            self.welfareTagArray  = [model.position.settlementMethod componentsSeparatedByString:@","];
+        }
         self.bgicon.image = [UIImage imageNamed:@"share_welfare"];
     }
     else
@@ -223,6 +232,7 @@
         _titleLabel = [[UILabel alloc]init];
         _titleLabel.font = [UIFont boldSystemFontOfSize:16];
         _titleLabel.textColor = COLOR_BACK3;
+//        _titleLabel.backgroundColor = [UIColor redColor];
     }
     return _titleLabel;
 }

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

@@ -107,7 +107,7 @@
             
             make.top.equalTo(self.timerLabel.mas_bottom).with.offset(13);
             make.left.equalTo(self.titleView);
-            make.size.mas_offset(CGSizeMake(35, 20));
+            make.size.mas_offset(CGSizeMake(55, 20));
             make.bottom.equalTo(self.bgView.mas_bottom).offset(-15);
         }];
         

HappyJob/HappyJob/CClass/Join_拼工/Scroll_拼工轮播/HJJoinDetailJoinView.m

@@ -86,6 +86,10 @@
             [self.delegate joinViewAllJoinButtonClicked:self];
         }
     }
+    else
+    {
+        [self fb_showInfoWithStatus:@"拼工都已经完成啦，您可以申请开团哦！"];
+    }
 }
 
 #pragma mark - getters and setters

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

@@ -64,6 +64,7 @@
 }
 
 - (NSDictionary *)parameters {
+    
     return @{
         @"user_id": [HJUserInfoModel userInfo].userID,
         @"user_token": [HJUserInfoModel userInfo].userToken,

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

@@ -60,7 +60,7 @@ NSString *const HJResumeUpdateNotification = @"HJResumeUpdateNotification";//更
             [manager isKindOfClass:[HJSaveExpectationAPIManager class]])
         {
             [self saveResume:data];
-            return @"保存成功";
+            return @"保存成功！";
         }
         
         if ([manager isKindOfClass:[HJGetResumeAPIManager class]])
@@ -100,9 +100,8 @@ NSString *const HJResumeUpdateNotification = @"HJResumeUpdateNotification";//更
     {
         [HJResumeModel removeResume];
     }
-    //发送通知在我的页面接受
+    //发送通知--->我的页面,个人简历
     [[NSNotificationCenter defaultCenter] postNotificationName:HJResumeUpdateNotification object:nil];
-    
 }
 
 #pragma mark - getters and setters

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/ViewController/HJResumeViewController.m

@@ -48,6 +48,8 @@ UIScrollViewDelegate
 
 @implementation HJResumeViewController
 
+#pragma mark - life
+
 - (void)dealloc {
     
     [[NSNotificationCenter defaultCenter] removeObserver:self name:HJResumeUpdateNotification object:nil];
@@ -66,12 +68,12 @@ UIScrollViewDelegate
     self.title = @"个人简历";
     [self autoLayOutViews];
     [self.getResumeAPIManager start];
-    
-    [self.view az_setGradientBackgroundWithColors:@[COLOR_GRADIENT_START,COLOR_GRADIENT_END] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 1)];
     //添加简历更新通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateResume:) name:HJResumeUpdateNotification object:nil];
-    
 }
+
+#pragma mark - init
+
 - (void)autoLayOutViews {
     
     [self.view addSubview:self.scrollLayoutView];
@@ -84,9 +86,8 @@ UIScrollViewDelegate
        
         make.left.top.right.offset(0);
         make.height.mas_equalTo(STATUS_H + NAVIGATION_H);
-        
     }];
-
+   [self.view az_setGradientBackgroundWithColors:@[COLOR_GRADIENT_START,COLOR_GRADIENT_END] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 1)];
 }
 
 #pragma mark - FBScrollLayoutViewDelegate
@@ -116,6 +117,7 @@ UIScrollViewDelegate
         make.bottom.equalTo(self.experienceView.mas_bottom).with.offset(40);
     }];
 }
+
 #pragma mark - UIScrollViewDelegate
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
@@ -183,7 +185,6 @@ UIScrollViewDelegate
     HJExperienceListViewController *vc = [[HJExperienceListViewController alloc]init];
     vc.listArray = self.resumeDataBox.resume[kHJResumeKeyWorkExperience];
     [self.navigationController pushViewController:vc animated:YES];
-
 }
 
 #pragma mark - event response
@@ -193,7 +194,7 @@ UIScrollViewDelegate
     [self.navigationController popViewControllerAnimated:YES];
 }
 - (void)updateResume:(NSNotification *)notification {
-   
+    
     NSDictionary *data = self.resumeDataBox.resume;
     [self.basicInfoView configWithData:data];
     [self.expectationView configWithData:data];

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/工作经验/HJExperienceView.h

@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface HJExperienceView : UIView
+
 @property (nonatomic, weak) id<HJExperienceViewDelegate> delegate;
 
 - (void)configWithData:(NSDictionary *)data;

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/求职意向/HJExpectationView.h

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak) id<HJExpectationViewDelegate> delegate;
 
 - (void)configWithData:(NSDictionary *)data;
+
 @end
 
 NS_ASSUME_NONNULL_END

HappyJob/HappyJob/CClass/Me_我/Reward_入职奖励/ViewController/HJReturnFeeCodeViewController.m

@@ -201,7 +201,6 @@
            }
        }];
     }
-    
     return _codeView;
 }
 - (UIButton *)codeBtn {

HappyJob/HappyJob/CClass/Me_我/Reward_入职奖励/ViewController/HJReturnFeeDetailViewController.m

@@ -181,9 +181,16 @@ FBAPIManagerInterceptor
 }
 - (void)callPhone:(UIButton *)btn {
     
-    NSMutableString* str=[[NSMutableString alloc] initWithFormat:@"tel:400-692-0099"];
-    NSURL *url = [NSURL URLWithString:str];
-    [[UIApplication sharedApplication] openURL:url];
+    
+//    NSMutableString *str = [[NSMutableString alloc] initWithFormat:@"telprompt:400-692-0099"];
+//    NSURL *url = [NSURL URLWithString:str];
+//    [[UIApplication sharedApplication] openURL:url];
+    
+    NSURL *url = [NSURL URLWithString:@"tel:400-692-0099"];
+    UIWebView *webView = [[UIWebView alloc] init];
+    [webView loadRequest:[NSURLRequest requestWithURL:url]];
+    [self.view addSubview:webView];
+    
 }
 
 /* 确认 */

HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/SalaryAPIManager/HJSalaryDataBox.m

@@ -99,9 +99,9 @@ NSString * const kHJSalaryKeyCutPayment = @"kHJSalaryKeyCutPayment";
         [dict setObject:@{kHJSalaryKeyInnerKey: @"公司名称：", kHJSalaryKeyInnerValue: data[@"companyName"]} forKey:kHJSalaryKeyCompanyName];
         [dict setObject:@{kHJSalaryKeyInnerKey: @"员工号码：", kHJSalaryKeyInnerValue: data[@"workNumber"]} forKey:kHJSalaryKeyEmployeeNumber];
         [dict setObject:@{kHJSalaryKeyInnerKey: @"员工姓名：", kHJSalaryKeyInnerValue: data[@"name"]} forKey:kHJSalaryKeyEmployeeName];
-        [dict setObject:@{kHJSalaryKeyInnerKey: @"应发合计：", kHJSalaryKeyInnerValue: [NSString stringWithFormat:@"%@元", data[@"grossPayment"]]} forKey:kHJSalaryKeyGrossPayment];
-        [dict setObject:@{kHJSalaryKeyInnerKey: @"扣款合计：", kHJSalaryKeyInnerValue: [NSString stringWithFormat:@"-%@元", data[@"totalChargeback"]]} forKey:kHJSalaryKeyCutPayment];
-        [dict setObject:@{kHJSalaryKeyInnerKey: @"实发工资：", kHJSalaryKeyInnerValue: [NSString stringWithFormat:@"%@元", data[@"netPayment"]]} forKey:kHJSalaryKeyNetPayment];
+        [dict setObject:@{kHJSalaryKeyInnerKey: @"应发合计：", kHJSalaryKeyInnerValue: [NSString stringWithFormat:@"%@", data[@"grossPayment"]]} forKey:kHJSalaryKeyGrossPayment];
+        [dict setObject:@{kHJSalaryKeyInnerKey: @"扣款合计：", kHJSalaryKeyInnerValue: [NSString stringWithFormat:@"%@", data[@"totalChargeback"]]} forKey:kHJSalaryKeyCutPayment];
+        [dict setObject:@{kHJSalaryKeyInnerKey: @"实发工资：", kHJSalaryKeyInnerValue: [NSString stringWithFormat:@"%@", data[@"netPayment"]]} forKey:kHJSalaryKeyNetPayment];
         
         NSData *jsonData =[data[@"payrollDetail"] dataUsingEncoding:NSUTF8StringEncoding];
         if (jsonData)

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

@@ -17,6 +17,11 @@
 @property (nonatomic, strong) HJLabelContentView *workNumberView;
 @property (nonatomic, strong) HJLabelContentView *nameView;
 
+@property (nonatomic, strong) HJLabelContentView *grossPaymentView;//应发合计
+@property (nonatomic, strong) HJLabelContentView *totalChargebackView;//扣款合计
+@property (nonatomic, strong) HJLabelContentView *netPaymentView;//实发工资
+
+
 @property (nonatomic, strong) HJLabelContentView *lastListView;
 
 @end
@@ -40,6 +45,11 @@
         [self addSubview:self.companyView];
         [self addSubview:self.nameView];
         [self addSubview:self.workNumberView];
+        
+        [self addSubview:self.grossPaymentView];
+        [self addSubview:self.totalChargebackView];
+        [self addSubview:self.netPaymentView];
+        
 
         [self.monthView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.mas_top).offset(0);
@@ -70,6 +80,11 @@
         self.nameView.contentLabel.text = data[kHJSalaryKeyEmployeeName][kHJSalaryKeyInnerValue];
         self.workNumberView.contentLabel.text = data[kHJSalaryKeyEmployeeNumber][kHJSalaryKeyInnerValue];
         
+        self.grossPaymentView.contentLabel.text = data[kHJSalaryKeyGrossPayment][kHJSalaryKeyInnerValue];
+        self.totalChargebackView.contentLabel.text = data[kHJSalaryKeyCutPayment][kHJSalaryKeyInnerValue];
+        self.netPaymentView.contentLabel.text = data[kHJSalaryKeyNetPayment][kHJSalaryKeyInnerValue];
+        
+        
         self.lastListView = self.workNumberView;
         NSArray *listArray = data[kHJSalaryKeyPayrollDetail];
         
@@ -86,13 +101,35 @@
                 make.left.right.equalTo(self).offset(0);
                 make.top.equalTo(self.lastListView.mas_bottom).offset(0);
                 make.height.mas_equalTo(58);
-                if (i == listArray.count - 1)
-                {
-                    make.bottom.equalTo(self.mas_bottom).offset(0);
-                }
+//                if (i == listArray.count - 1)
+//                {
+//                    make.bottom.equalTo(self.mas_bottom).offset(0);
+//                }
             }];
             self.lastListView = listView;
         }
+        
+        
+        [self.grossPaymentView mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.top.equalTo(self.lastListView.mas_bottom).offset(0);
+            make.left.right.equalTo(self).offset(0);
+            make.height.mas_equalTo(58);
+        }];
+        [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.netPaymentView mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.top.equalTo(self.totalChargebackView.mas_bottom).offset(0);
+            make.left.right.equalTo(self).offset(0);
+            make.height.mas_equalTo(58);
+            make.bottom.equalTo(self.mas_bottom).offset(0);
+        }];
+        
     }
 }
 
@@ -134,4 +171,33 @@
     }
     return _nameView;
 }
+- (HJLabelContentView *)grossPaymentView {
+    
+    if (_grossPaymentView == nil)
+    {
+        _grossPaymentView = [[HJLabelContentView alloc]init];
+        _grossPaymentView.titleLabel.text = @"应发合计：";
+    }
+    return _grossPaymentView;
+}
+- (HJLabelContentView *)totalChargebackView {
+    
+    if (_totalChargebackView == nil)
+    {
+        _totalChargebackView = [[HJLabelContentView alloc]init];
+        _totalChargebackView.titleLabel.text = @"扣款合计：";
+    }
+    return _totalChargebackView;
+}
+- (HJLabelContentView *)netPaymentView {
+    
+    if (_netPaymentView == nil)
+    {
+        _netPaymentView = [[HJLabelContentView alloc]init];
+        _netPaymentView.titleLabel.text = @"实发工资：";
+    }
+    return _netPaymentView;
+}
+
+
 @end

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

@@ -199,8 +199,8 @@ FBAPIManagerDelegate
     if (manager == self.getResumeAPIManager)
     {
         // 不需要根据返回值来处理视图，在DataBox类中做了封装
-        [manager fetchDataWithBox:self.resumeDataBox];
-        [self saveUserResumeInfo:[manager fetchDataWithBox:self.resumeDataBox]];
+        id resumeDict = [manager fetchDataWithBox:self.resumeDataBox];
+        [self saveUserResumeInfo:resumeDict];
         [self.refreshHeader endRefreshing];
     }
 }
@@ -440,20 +440,12 @@ FBAPIManagerDelegate
     self.dataBox.headerView.resumeView.percent = [data[kHJResumeKeyPercent] floatValue];
 }
 
-/* 更新用户信息 */
+/* 更新用户信息，积分 */
 - (void)updateUserInfo:(NSNotification *)notification {
     
     [self.getUserInfoAPIManager start];
 }
 
-///* 设置 */
-//- (void)setingButtonClicked:(UIButton *)btn {
-//
-//    HJSettingViewController *vc = [[HJSettingViewController alloc] init];
-//    vc.hidesBottomBarWhenPushed = YES;
-//    [self.navigationController pushViewController:vc animated:YES];
-//}
-
 /* 我的收藏 */
 - (void)myFavoriteButtonClicked:(UIButton *)sender {
     
@@ -563,7 +555,6 @@ FBAPIManagerDelegate
     {
         _navBarView = [[HJMeNavBarView alloc] init];
         _navBarView.titleLabel.text = self.title;
-//        [_navBarView.setingButton addTarget:self action:@selector(setingButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _navBarView;
 }

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/APIManager/HJMyIntegralDataBox.m

@@ -84,7 +84,7 @@
         NSDictionary *dict = [self.dataSource objectAtIndex:indexPath.row];
         HJMyIntergralListModel *model = [HJMyIntergralListModel yy_modelWithJSON:dict];
         
-        if ([model.pointType integerValue] <= 7 && [model.pointType integerValue] >= 0)
+        if ([model.pointType integerValue] <= 8 && [model.pointType integerValue] >= 0)
         {
             cell.titleLabel.text = self.typeArray[[model.pointType integerValue]];
         }
@@ -230,7 +230,7 @@
     
     if (_typeArray == nil)
     {
-        _typeArray = [NSMutableArray arrayWithObjects:@"签到",@"新手任务",@"日常任务",@"兑好礼",@"兑活动",@"积分退还",@"积分后台调整",@"入职奖励赠送积分", nil];
+        _typeArray = [NSMutableArray arrayWithObjects:@"签到",@"新手任务",@"日常任务",@"兑好礼",@"兑活动",@"积分退还",@"积分后台调整",@"入职奖励赠送积分",@"过期积分", nil];
     }
     return _typeArray;
 }

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/ViewController/HJMyIntegralViewController.m

@@ -52,10 +52,9 @@ FBAPIManagerInterceptor
 #pragma mark - life cycle
 
 - (void)dealloc {
-//    DDLogDebug(@"------%@",self);
     //移除
     [[NSNotificationCenter defaultCenter] removeObserver:self name:HJIntegralTaskNotification object:nil];
-
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:HJIntegralChangeNotification object:nil];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -74,7 +73,7 @@ FBAPIManagerInterceptor
     //积分改变通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(integralChange:) name:HJIntegralChangeNotification object:nil];
     
-    //积分任务通知
+    //积分任务通知(在全职详情和收藏发送通知)
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(integralChange:) name:HJIntegralTaskNotification object:nil];
     
     //错误页面刷新事件
@@ -145,9 +144,9 @@ FBAPIManagerInterceptor
             [self.view fb_showSuccessWithStatus:@"领取奖励成功"];
         }
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5*NSEC_PER_SEC)),dispatch_get_main_queue(), ^{
-            //发送通知-积分改变(我的页面，我的积分页面)
-//            [[NSNotificationCenter defaultCenter] postNotificationName:HJIntegralChangeNotification object:nil];
-            [self.integralAPI start];
+            //发送通知-积分改变(我的页面)// HJMyPageIntegralChangeNotification
+            [[NSNotificationCenter defaultCenter] postNotificationName:HJIntegralChangeNotification object:nil];
+//            [self.integralAPI start];
         });
     }
 }

HappyJob/HappyJob/CClass/Me_我/wallet_我的钱包/ViewController/HJMyWalletViewController.m

@@ -143,6 +143,7 @@ FBAPIManagerInterceptor
 }
 
 #pragma mark - event response
+
 /* 错误刷新 */
 - (void)refreshButtonClicked:(UIButton *)btn {
     
@@ -172,9 +173,10 @@ FBAPIManagerInterceptor
 }
 - (void)callPhone:(UIButton *)btn {
     
-    NSMutableString* str=[[NSMutableString alloc] initWithFormat:@"tel:400-692-0099"];
-    NSURL *url = [NSURL URLWithString:str];
-    [[UIApplication sharedApplication] openURL:url];
+    NSURL *url = [NSURL URLWithString:@"tel:400-692-0099"];
+    UIWebView *webView = [[UIWebView alloc] init];
+    [webView loadRequest:[NSURLRequest requestWithURL:url]];
+    [self.view addSubview:webView];
 }
 
 /* 好的*/

HappyJob/HappyJob/HappyJob-Prefix.pch

@@ -65,6 +65,9 @@ static const DDLogLevel ddLogLevel = DDLogLevelWarning;
 /* 获取当前版本号 */
 #define APP_VERSION      [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]
 
+/* 系统版本判断 */
+#define IOSSYS [[[UIDevice currentDevice] systemVersion] floatValue] 
+
 /* 屏幕的宽度和高度 */
 #define SCREEN_WIDTH     [UIScreen mainScreen].bounds.size.width
 #define SCREEN_HEIGHT    [UIScreen mainScreen].bounds.size.height
@@ -127,6 +130,8 @@ self.navigationItem.backBarButtonItem = barItem;
 #define HJLoginRefreshNotification              @"loginRefreshNotification"
 /* 积分改变通知 */
 #define HJIntegralChangeNotification            @"integralChangeNotification"
+/* 个人中心积分改变通知 */
+//#define HJMyPageIntegralChangeNotification      @"myPageIntegralChangeNotification"
 /* 积分任务通知 */
 #define HJIntegralTaskNotification              @"integralTaskNotification"
 /* 入职奖励通知 */

HappyJob/HappyJob/Support/HJConfig.h

@@ -36,7 +36,7 @@ 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 */
+// /* 微信开放平台AppID，注册地址：https:open.weixin.qq.com */
 //static NSString * const kWeiXinAPIKey = @"wxeb8c2418a8ace030";