解决 几个线上bug

jiaPei.xcodeproj/project.pbxproj

@@ -11810,7 +11810,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2192024042801;
+				CURRENT_PROJECT_VERSION = 2192024043001;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11893,7 +11893,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2192024042801;
+				CURRENT_PROJECT_VERSION = 2192024043001;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;

jiaPei/Modules/HomePageModule/ViewModel/HomePage/itemViewModel/RQHomePageOneOrFourSmallItemViewModel.m

@@ -55,11 +55,14 @@
                             [RQ_APPDELEGATE.services pushViewModel:webViewModel animated:YES];
                             RQ_VIP_Module.freeLookSimExamNum = 0;
                         } else {
-                            [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_AD title:@"" message:@"" confirmTitle:@"充值会员无限使用" cancelTitle:@"看广告解锁使用" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                                [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
-                            } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                                [RQ_AD_Module loadRewardvodAd];
-                            }];
+                            if(!RQ_COMMON_MANAGER.APP_SWITCH){
+                                [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_AD title:@"" message:@"" confirmTitle:@"充值会员无限使用" cancelTitle:@"看广告解锁使用" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                                    [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+                                } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                                    [RQ_AD_Module loadRewardvodAd];
+                                }];
+                            }
+                            
                         }
                     }
                 }];

jiaPei/Modules/HomePageModule/ViewModel/HomePage/itemViewModel/RQHomePageSimulationExamItemViewModel.m

@@ -38,11 +38,13 @@
                         [RQ_APPDELEGATE.services pushViewModel:webViewModel animated:YES];
                         RQ_VIP_Module.freeLookSimExamNum = 0;
                     } else {
-                        [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_AD title:@"" message:@"" confirmTitle:@"充值会员无限使用" cancelTitle:@"看广告解锁使用" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                            [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
-                        } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                            [RQ_AD_Module loadRewardvodAd];
-                        }];
+                        if(!RQ_COMMON_MANAGER.APP_SWITCH){
+                            [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_AD title:@"" message:@"" confirmTitle:@"充值会员无限使用" cancelTitle:@"看广告解锁使用" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                                [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+                            } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                                [RQ_AD_Module loadRewardvodAd];
+                            }];
+                        }
                     }
                 }
             }];

jiaPei/Modules/OtherModules/ExerciseModule/View/ExerciseSubPage/考试相关/RQSimulateExamBeginCell.m

@@ -100,11 +100,13 @@
                     [RQ_APPDELEGATE.services pushViewModel:webViewModel animated:YES];
                     RQ_VIP_Module.freeLookSimExamNum = 0;
                 } else {
-                    [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_AD title:@"" message:@"" confirmTitle:@"充值会员无限使用" cancelTitle:@"看广告解锁使用" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                        [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
-                    } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                        [RQ_AD_Module loadRewardvodAd];
-                    }];
+                    if(!RQ_COMMON_MANAGER.APP_SWITCH){
+                        [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_AD title:@"" message:@"" confirmTitle:@"充值会员无限使用" cancelTitle:@"看广告解锁使用" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                            [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+                        } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                            [RQ_AD_Module loadRewardvodAd];
+                        }];
+                    }
                 }
             }
         }];

jiaPei/Modules/OtherModules/VIPModule/View/怎么学/RQVipContentCell.m

@@ -153,11 +153,13 @@
                     [RQ_APPDELEGATE.services pushViewModel:webViewModel animated:YES];
                     RQ_VIP_Module.freeLookSimExamNum = 0;
                 } else {
-                    [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_AD title:@"" message:@"" confirmTitle:@"充值会员无限使用" cancelTitle:@"看广告解锁使用" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                        [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
-                    } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                        [RQ_AD_Module loadRewardvodAd];
-                    }];
+                    if(!RQ_COMMON_MANAGER.APP_SWITCH){
+                        [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_AD title:@"" message:@"" confirmTitle:@"充值会员无限使用" cancelTitle:@"看广告解锁使用" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                            [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+                        } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                            [RQ_AD_Module loadRewardvodAd];
+                        }];
+                    }
                 }
             }
         }];

jiaPei/Modules/TimeModule/ViewModel/itemViewModel/RQTimeSingleItemViewModel.m

@@ -104,6 +104,7 @@
             //判断-是否是 辽宁-并且当前是科目一时
             NSString *citystr = @"yntms,2101,2108";
             NSString *pxkm = RQ_USER_MANAGER.currentUser.pxjd;
+            NSLog(@"pxkm=%@",pxkm);
             if(pxkm==nil) pxkm=@"1";
             if ([citystr rangeOfString:RQ_USER_MANAGER.currentUser.city].location != NSNotFound) {
                 if(pxkm.intValue==1){

jiaPei/NewTheory/NYClassRoomVC.m

@@ -17,7 +17,7 @@
 @interface NYClassRoomVC ()
 /// viewModel
 @property (nonatomic, readonly, strong) NYClassRoomViewModel *viewModel;
-@property (nonatomic, readwrite, strong) UIBarButtonItem *signInOrsignOutItem;
+@property (nonatomic, readwrite, strong) UIButton *signInOrsignOutItem;
 @property (nonatomic, readwrite, strong) NYClassRoomPeiCell *nyClassRoomPeiCell;
 @end
 
@@ -43,7 +43,8 @@
     
     if(self.viewModel.isSimulationRoom){ //模拟训练
         self.viewModel.classRoomPeiViewModel.isSimulationRoom = self.viewModel.isSimulationRoom;
-        [self.navigationItem setRightBarButtonItems:@[self.signInOrsignOutItem]];
+        UIBarButtonItem *baritem = [[UIBarButtonItem alloc] initWithCustomView:self.signInOrsignOutItem];
+        [self.navigationItem setRightBarButtonItems:@[baritem]];
     }
     
 }
@@ -101,9 +102,17 @@
 }
 
 
-- (UIBarButtonItem *)signInOrsignOutItem {
+- (UIButton *)signInOrsignOutItem {
     if (!_signInOrsignOutItem) {
-        _signInOrsignOutItem = [UIBarButtonItem rq_systemItemWithTitle:@"签到" titleColor:RQ_LIST_BACKGROUNDCOLOR imageName:nil target:self selector:@selector(gotoSignInOrsignOut) textType:YES];
+        
+        UIButton *customButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        customButton.titleLabel.font = [UIFont systemFontOfSize:16.0];
+        [customButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
+        [customButton setTitle:@"签到" forState:UIControlStateNormal];
+        [customButton addTarget:self action:@selector(gotoSignInOrsignOut) forControlEvents:UIControlEventTouchUpInside];
+        _signInOrsignOutItem = customButton;
+            
+//        _signInOrsignOutItem = [UIBarButtonItem rq_systemItemWithTitle:@"签到" titleColor:RQ_LIST_BACKGROUNDCOLOR imageName:nil target:self selector:@selector(gotoSignInOrsignOut) textType:YES];
     }
     return _signInOrsignOutItem;
 }

jiaPei/NewTheory/View/NYClassRoomPeiCell.h

@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
 //暂无数据 - view
 @property (weak, nonatomic) IBOutlet UIView *not_data_view;
 
-@property (nonatomic, readwrite, weak) UIBarButtonItem *signInOrsignOutItem;
+@property (nonatomic, readwrite, weak) UIButton *signInOrsignOutItem;
 
 //签到 in 签退
 - (void)gotoSignInOrsignOut;

jiaPei/NewTheory/View/NYClassRoomPeiCell.m

@@ -85,23 +85,13 @@
 }
 
 - (void)updateUIBarButtonItem:(int)code{
-    if (@available(iOS 16.0, *)) {
-        self.signInOrsignOutItem.hidden = NO;
-    } else {
-        [self.signInOrsignOutItem setHidden:NO];
-        // Fallback on earlier versions
-    }
+    self.signInOrsignOutItem.hidden = NO;
     if(code==99){
-        if (@available(iOS 16.0, *)) {
-            self.signInOrsignOutItem.hidden = YES;
-        } else {
-            [self.signInOrsignOutItem setHidden:YES];
-            // Fallback on earlier versions
-        }
+        self.signInOrsignOutItem.hidden = YES;
     }
-    self.signInOrsignOutItem.title = @"签到";
+    [self.signInOrsignOutItem setTitleNormal:@"签到"];
     if(_cultivateInfo){
-        self.signInOrsignOutItem.title = @"签退";
+        [self.signInOrsignOutItem setTitleNormal:@"签退"];
     }
 }
 

jiaPei/TrainInfoVC.m

@@ -133,7 +133,8 @@
     NSMutableArray* arr   = [NSMutableArray array];
     [arr addPro:@"cx"            Value:RQ_USER_MANAGER.currentUser.carType];
     [arr addPro:@"dqbh"          Value:RQ_USER_MANAGER.currentUser.city];
-	
+    [arr addPro:@"userId"          Value:RQ_USER_MANAGER.currentUser.outId];
+    
     NSString* method = @"getTrainSubjectCredit";
     [jiaPeiManager requestAnythingWithURL:method array:arr data:nil completion:^(NSDictionary * root) {