ios v2.3.2

jiaPei.xcodeproj/project.pbxproj

@@ -102,6 +102,9 @@
 		902614D32CD232F1007A7E1A /* NYExerciseQuestionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 902614D12CD232F1007A7E1A /* NYExerciseQuestionCell.m */; };
 		902614D42CD232F1007A7E1A /* NYExerciseQuestionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 902614D22CD232F1007A7E1A /* NYExerciseQuestionCell.xib */; };
 		9034A0252B80A399001FBB37 /* NYClassRoomPeiPhotoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9034A0242B80A399001FBB37 /* NYClassRoomPeiPhotoCell.m */; };
+		9037BAFF2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9037BAFD2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.m */; };
+		9037BB002D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9037BAFE2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.xib */; };
+		9037BB032D703A3F00C8F6FF /* NYLIHomePageVideoExamItemViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9037BB022D703A3F00C8F6FF /* NYLIHomePageVideoExamItemViewModel.m */; };
 		9040D2852B6F703E002F4686 /* NYClassRoomVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9040D2842B6F703E002F4686 /* NYClassRoomVC.m */; };
 		9040D2882B6F7E07002F4686 /* NYClassRoomViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9040D2872B6F7E07002F4686 /* NYClassRoomViewModel.m */; };
 		9040D28C2B6F8ACB002F4686 /* NYClassRoomPeiCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9040D28A2B6F8ACB002F4686 /* NYClassRoomPeiCell.m */; };
@@ -1957,6 +1960,11 @@
 		902614D22CD232F1007A7E1A /* NYExerciseQuestionCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYExerciseQuestionCell.xib; sourceTree = "<group>"; };
 		9034A0232B80A399001FBB37 /* NYClassRoomPeiPhotoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYClassRoomPeiPhotoCell.h; sourceTree = "<group>"; };
 		9034A0242B80A399001FBB37 /* NYClassRoomPeiPhotoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYClassRoomPeiPhotoCell.m; sourceTree = "<group>"; };
+		9037BAFC2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIHomePageVideoExamCell.h; sourceTree = "<group>"; };
+		9037BAFD2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIHomePageVideoExamCell.m; sourceTree = "<group>"; };
+		9037BAFE2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYLIHomePageVideoExamCell.xib; sourceTree = "<group>"; };
+		9037BB012D703A3F00C8F6FF /* NYLIHomePageVideoExamItemViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIHomePageVideoExamItemViewModel.h; sourceTree = "<group>"; };
+		9037BB022D703A3F00C8F6FF /* NYLIHomePageVideoExamItemViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIHomePageVideoExamItemViewModel.m; sourceTree = "<group>"; };
 		9040D2832B6F703E002F4686 /* NYClassRoomVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYClassRoomVC.h; sourceTree = "<group>"; };
 		9040D2842B6F703E002F4686 /* NYClassRoomVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYClassRoomVC.m; sourceTree = "<group>"; };
 		9040D2862B6F7E07002F4686 /* NYClassRoomViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYClassRoomViewModel.h; sourceTree = "<group>"; };
@@ -4916,6 +4924,9 @@
 				906710A32D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.h */,
 				906710A42D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.m */,
 				906710A52D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.xib */,
+				9037BAFC2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.h */,
+				9037BAFD2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.m */,
+				9037BAFE2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -4939,6 +4950,8 @@
 				90D8AF6F2D5C4C420087C165 /* NYLIVideoDetailSubFooterViewModel.m */,
 				906710A82D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.h */,
 				906710A92D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.m */,
+				9037BB012D703A3F00C8F6FF /* NYLIHomePageVideoExamItemViewModel.h */,
+				9037BB022D703A3F00C8F6FF /* NYLIHomePageVideoExamItemViewModel.m */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -10971,6 +10984,7 @@
 				D0295D1E243F0B8C00B46AB1 /* 1-6-6.jpg in Resources */,
 				D0295BB1243F0B8A00B46AB1 /* 1-2-9.jpg in Resources */,
 				D0295BBF243F0B8B00B46AB1 /* 1-10-33.jpg in Resources */,
+				9037BB002D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.xib in Resources */,
 				D0A927D527078CF4005902DB /* com.baidu.idl.face.live.action.image.bundle in Resources */,
 				D0295C5B243F0B8B00B46AB1 /* 1-3-5.jpg in Resources */,
 				D0295B87243F0B8A00B46AB1 /* 1-4-83.jpg in Resources */,
@@ -11940,6 +11954,7 @@
 				D0870D882701A6B9004EC94E /* UIView+YYAdd.m in Sources */,
 				D0B2D4FE289A624B00D6C5F4 /* RQErrorViewModel.m in Sources */,
 				18CDE8181CC60439004EF0A6 /* ScanVC.m in Sources */,
+				9037BAFF2D6FFDEE00C8F6FF /* NYLIHomePageVideoExamCell.m in Sources */,
 				9034A0252B80A399001FBB37 /* NYClassRoomPeiPhotoCell.m in Sources */,
 				D0870D802701A6B9004EC94E /* UITextField+YYAdd.m in Sources */,
 				D04DF6B827006C56006E3633 /* RQTableViewModel.m in Sources */,
@@ -12139,6 +12154,7 @@
 				D04DF7A127006F72006E3633 /* UIViewController+RQExtension.m in Sources */,
 				D03BCA9A28C9DF3C00094B7F /* RQHomePageSubjectModuleCell.m in Sources */,
 				D00177EB2886ABE40078949E /* RQExercisExplainCell.m in Sources */,
+				9037BB032D703A3F00C8F6FF /* NYLIHomePageVideoExamItemViewModel.m in Sources */,
 				D056D3BF28B762F40003F024 /* RQHTTPService+RQSaveStuScore.m in Sources */,
 				D09E5D5625E3AA260099E87C /* BDFaceCircleView.m in Sources */,
 				D04DF6BA27006C56006E3633 /* RQBaseModel.m in Sources */,
@@ -12587,7 +12603,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2322025022101;
+				CURRENT_PROJECT_VERSION = 2322025030302;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -12625,7 +12641,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.3.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -12673,7 +12689,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2322025022101;
+				CURRENT_PROJECT_VERSION = 2322025030302;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -12711,7 +12727,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.3.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/Images.xcassets/Modules/OtherModule/VipModule/精选300题背景.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "精选300题背景@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "精选300题背景@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Modules/HomePageModule/View/HomePage/NYHomePageOneBigCell.m

@@ -174,11 +174,21 @@
                     RQ_VIP_Module.freeLookSimExamNum = 0;
                 } else {
                     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];
-                        }];
+                        // 修改后的弹窗调用逻辑
+                        NSString *ukey = [NSString stringWithFormat:@"%@%d",RQ_USER_MANAGER.currentUser.loginCode,RQ_YDTQuestion_Module.subjectStr.intValue];
+                        if (![NYTools hasUserWatchedAdToday:ukey]) {
+                            [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];
+                                [NYTools saveUWatchedAdToday:ukey];
+                            }];
+                        }else{
+                            //显示真实考场
+                            NYExaminationViewModel *examinationViewModel = [[NYExaminationViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{}];
+                            examinationViewModel.km = RQ_YDTQuestion_Module.subjectStr.intValue;
+                            [RQ_APPDELEGATE.services pushViewModel:examinationViewModel animated:YES];
+                        }
                     }
                     
                 }

jiaPei/Modules/HomePageModule/ViewController/HomePage/RQHomePageSubjectOneOrFourViewController.m

@@ -64,8 +64,10 @@
         return [NYHomePageOneBigCell cellWithCollectionView:collectionView forIndexPath:indexPath]; /// 新
     } else if ([itemViewModel isKindOfClass:[RQHomePageOneOrFourSmallItemViewModel class]]) {
         return [RQHomePageOneOrFourSmallCell cellWithCollectionView:collectionView forIndexPath:indexPath];
-    } else if ([itemViewModel isKindOfClass:[NYLIHomePageSimulationExamItemViewModel class]]) {
-        return [NYLIHomePageSimulationExamCell cellWithCollectionView:collectionView forIndexPath:indexPath];
+    } else if ([itemViewModel isKindOfClass:[RQHomePageSimulationExamItemViewModel class]]) {
+        return [RQHomePageSimulationExamCell cellWithCollectionView:collectionView forIndexPath:indexPath];
+    } else if ([itemViewModel isKindOfClass:[NYLIHomePageVideoExamItemViewModel class]]) {
+        return [NYLIHomePageVideoExamCell cellWithCollectionView:collectionView forIndexPath:indexPath];
     } else if ([itemViewModel isKindOfClass:[RQHomePageJiaoGuan12123ItemViewModel class]]) {
         return [RQHomePageJiaoGuan12123Cell cellWithCollectionView:collectionView forIndexPath:indexPath];
     } else if ([itemViewModel isKindOfClass:[RQHomePageDriveMethodItemViewModel class]]) {
@@ -103,9 +105,12 @@
     } else if ([itemViewModel isKindOfClass:[RQHomePageOneOrFourSmallItemViewModel class]]) {
         RQHomePageOneOrFourSmallCell *homePageOneOrFourSmallCell = (RQHomePageOneOrFourSmallCell *)cell;
         [homePageOneOrFourSmallCell bindViewModel:object];
-    } else if ([itemViewModel isKindOfClass:[NYLIHomePageSimulationExamItemViewModel class]]) {
-        NYLIHomePageSimulationExamCell *homePageSimulationExamCell = (NYLIHomePageSimulationExamCell *)cell;
+    } else if ([itemViewModel isKindOfClass:[RQHomePageSimulationExamItemViewModel class]]) {
+        RQHomePageSimulationExamCell *homePageSimulationExamCell = (RQHomePageSimulationExamCell *)cell;
         [homePageSimulationExamCell bindViewModel:object];
+    } else if ([itemViewModel isKindOfClass:[NYLIHomePageVideoExamItemViewModel class]]) {
+        NYLIHomePageVideoExamCell *homePageVideoExamCell = (NYLIHomePageVideoExamCell *)cell;
+        [homePageVideoExamCell bindViewModel:object];
     } else if ([itemViewModel isKindOfClass:[RQHomePageJiaoGuan12123ItemViewModel class]]) {
         RQHomePageJiaoGuan12123Cell *homePageJiaoGuan12123Cell = (RQHomePageJiaoGuan12123Cell *)cell;
         [homePageJiaoGuan12123Cell bindViewModel:object];

jiaPei/Modules/HomePageModule/ViewController/HomePage/考场视频/RQPlaceDetailViewController.m

@@ -24,6 +24,25 @@
     [super viewDidLoad];
     /// 初始化
     [self rq_setup];
+    self.viewModel.wpviewModel = nil;
+    [self.view addSubview:self.viewModel.wpviewModel.wView];
+    [self.viewModel.wpviewModel.wView evaluateJavaScript:@"navigator.userAgent" completionHandler:^(id result, NSError *error) {
+        NSLog(@"navigator.userAgent.result is ++++ %@", result);
+    }];
+    if(!isOfficial){
+        [self.viewModel.wpviewModel wkvPL:NYPiapphkc_test];
+    }else{
+        [self.viewModel.wpviewModel wkvPL:NYPiapphkc];
+    }
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    /// 清除缓存
+    NSSet *websiteDataTypes = [WKWebsiteDataStore allWebsiteDataTypes];
+    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{
+    }];
 }
 
 - (void)viewDidLayoutSubviews {
@@ -64,7 +83,7 @@
 
 - (id<JXPagerViewListViewDelegate>)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index {
     if (index == 0) {
-        RQPlaceDetailNoteViewModel *placeDetailNoteViewModel = [[RQPlaceDetailNoteViewModel alloc] initWithServices:self.viewModel.services params:@{RQViewCommonValueKey : self.viewModel.placeListModel}];
+        RQPlaceDetailNoteViewModel *placeDetailNoteViewModel = [[RQPlaceDetailNoteViewModel alloc] initWithServices:self.viewModel.services params:@{RQViewCommonValueKey : self.viewModel.placeListModel,@"NYWPviewmodel":self.viewModel.wpviewModel}];
         RQPlaceDetailNoteViewController *placeDetailNoteViewController = [[RQPlaceDetailNoteViewController alloc] initWithViewModel:placeDetailNoteViewModel];
         return placeDetailNoteViewController;
     } else {

jiaPei/Modules/HomePageModule/ViewModel/HomePage/RQHomePageSubjectOneOrFourViewModel.m

@@ -34,6 +34,7 @@
 @property (nonatomic, readwrite, strong) RQCommonGroupViewModel *group0;
 @property (nonatomic, readwrite, strong) RQCommonGroupViewModel *group1;
 @property (nonatomic, readwrite, strong) RQCommonGroupViewModel *group2;
+@property (nonatomic, readwrite, strong) RQCommonGroupViewModel *group2_1;
 
 @property (nonatomic, readwrite, strong) RQCommonGroupViewModel *group3;
 @property (nonatomic, readwrite, strong) RQCommonGroupViewModel *group4;
@@ -94,25 +95,29 @@
         self.group3 = group3;
         
         ///    第二组
-        RQHomeSubPageVideoHeaderGroupViewModel *group4 = [self group4WithDspListModelArr:dspListModelArr];
-        self.group4 = group4;
+//        RQHomeSubPageVideoHeaderGroupViewModel *group4 = [self group4WithDspListModelArr:dspListModelArr];
+//        self.group4 = group4;
         
         if (RQArrayIsEmpty(treeListModelArr)) {
-            return (self.homePageSubjectType == RQHomePageSubjectType_SubjectTwo)? (RQArrayIsEmpty(dspListModelArr)? @[self.group, self.group12123] : @[self.group, self.group12123, group4]) : ((self.homePageSubjectType == RQHomePageSubjectType_SubjectThree)? (RQArrayIsEmpty(dspListModelArr)? @[self.group, self.groupKaoChang, self.groupSubject3Module, self.groupDriveMethods, self.group12123] : @[self.group, self.groupKaoChang, self.groupSubject3Module, self.groupDriveMethods, self.group12123, group4]) : @[self.group, self.group0, self.group1, self.group2]);
+//            return (self.homePageSubjectType == RQHomePageSubjectType_SubjectTwo)? (RQArrayIsEmpty(dspListModelArr)? @[self.group, self.group12123] : @[self.group, self.group12123, group4]) : ((self.homePageSubjectType == RQHomePageSubjectType_SubjectThree)? (RQArrayIsEmpty(dspListModelArr)? @[self.group, self.groupKaoChang, self.groupSubject3Module, self.groupDriveMethods, self.group12123] : @[self.group, self.groupKaoChang, self.groupSubject3Module, self.groupDriveMethods, self.group12123, group4]) : @[self.group, self.group0, self.group1, self.group2_1 ,self.group2]);
+            return (self.homePageSubjectType == RQHomePageSubjectType_SubjectTwo)? (RQArrayIsEmpty(dspListModelArr)? @[self.group, self.group12123] : @[self.group, self.group12123]) : ((self.homePageSubjectType == RQHomePageSubjectType_SubjectThree)? (RQArrayIsEmpty(dspListModelArr)? @[self.group, self.groupKaoChang, self.groupSubject3Module, self.groupDriveMethods, self.group12123] : @[self.group, self.groupKaoChang, self.groupSubject3Module, self.groupDriveMethods, self.group12123]) : @[self.group, self.group0, self.group1, self.group2_1 ,self.group2]);
         } else {
             if (self.homePageSubjectType == RQHomePageSubjectType_SubjectTwo) {
 //                if (RQ_COMMON_MANAGER.APP_SWITCH && !RQ_VIP_Module.isSubject2Vip) {
 //                    self.group0.itemViewModels = @[];
 //                    group3.itemViewModels = @[];
 //                }
-                return RQArrayIsEmpty(group3.itemViewModels)? (RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.group0, self.group12123] : @[self.group, self.group0, self.group12123, group4]) : (RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.group0, self.group12123, group3] : @[self.group, self.group0, self.group12123, group3, group4]);
+//                return RQArrayIsEmpty(group3.itemViewModels)? (RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.group0, self.group12123] : @[self.group, self.group0, self.group12123, group4]) : (RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.group0, self.group12123, group3] : @[self.group, self.group0, self.group12123, group3, group4]);
+                return RQArrayIsEmpty(group3.itemViewModels)? ( @[self.group, self.group0, self.group12123]) : ( @[self.group, self.group0, self.group12123, group3]);
             } else if (self.homePageSubjectType == RQHomePageSubjectType_SubjectThree) {
 //                if (RQ_COMMON_MANAGER.APP_SWITCH && !RQ_VIP_Module.isSubject3Vip) {
 //                    self.group0.itemViewModels = @[];
 //                }
-                return RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.groupKaoChang, self.groupSubject3Module, self.group0, self.groupDriveMethods, self.group12123] : @[self.group, self.groupKaoChang, self.groupSubject3Module, self.group0, self.groupDriveMethods, self.group12123, group4];
+//                return RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.groupKaoChang, self.groupSubject3Module, self.group0, self.groupDriveMethods, self.group12123] : @[self.group, self.groupKaoChang, self.groupSubject3Module, self.group0, self.groupDriveMethods, self.group12123, group4];
+                
+                return @[self.group, self.groupKaoChang, self.groupSubject3Module, self.group0, self.groupDriveMethods, self.group12123];
             } else {
-                return [RQ_YDTQuestion_Module.isZhiGeZheng isEqualToString:@"YES"]? @[self.group, self.group0, self.group1, self.group12123] : ( RQArrayIsEmpty(group3.itemViewModels)? @[self.group, self.group0, self.group1, self.group2] : @[self.group, self.group0, self.group1, self.group2, group3]);
+                return [RQ_YDTQuestion_Module.isZhiGeZheng isEqualToString:@"YES"]? @[self.group, self.group0, self.group1, self.group12123] : ( RQArrayIsEmpty(group3.itemViewModels)? @[self.group, self.group0, self.group1, self.group2_1,self.group2] : @[self.group, self.group0, self.group1, self.group2_1,self.group2, group3]);
             }
         }
     }];
@@ -219,13 +224,23 @@
     return _group1;
 }
 
+- (RQCommonGroupViewModel *)group2_1 {
+    if (!_group2_1) {
+        _group2_1 = [RQHomePageSectionTwoGroupViewModel groupViewModel];
+        _group2_1.footerHeight = 0.01;
+        NYLIHomePageVideoExamItemViewModel *homePageVideoExamItemViewModel = [[NYLIHomePageVideoExamItemViewModel alloc] initWithRQHomePageCarType:self.homePageCarType homePageSubjectType:self.homePageSubjectType];
+        _group2_1.itemViewModels = @[homePageVideoExamItemViewModel];
+    }
+    return _group2_1;
+}
+
 - (RQCommonGroupViewModel *)group2 {
     if (!_group2) {
         _group2 = [RQHomePageSectionTwoGroupViewModel groupViewModel];
         
-//        RQHomePageSimulationExamItemViewModel *homePageSimulationExamItemViewModel = [[RQHomePageSimulationExamItemViewModel alloc] initWithRQHomePageCarType:self.homePageCarType homePageSubjectType:self.homePageSubjectType];
+        RQHomePageSimulationExamItemViewModel *homePageSimulationExamItemViewModel = [[RQHomePageSimulationExamItemViewModel alloc] initWithRQHomePageCarType:self.homePageCarType homePageSubjectType:self.homePageSubjectType];
         
-        NYLIHomePageSimulationExamItemViewModel *homePageSimulationExamItemViewModel = [[NYLIHomePageSimulationExamItemViewModel alloc] initWithRQHomePageCarType:self.homePageCarType homePageSubjectType:self.homePageSubjectType];
+//        NYLIHomePageSimulationExamItemViewModel *homePageSimulationExamItemViewModel = [[NYLIHomePageSimulationExamItemViewModel alloc] initWithRQHomePageCarType:self.homePageCarType homePageSubjectType:self.homePageSubjectType];
         
         _group2.itemViewModels = @[homePageSimulationExamItemViewModel];
     }
@@ -254,7 +269,8 @@
                         group3.mySection = section;
                         return [self dataSourceWithItems:childrenItemA.videos treeListModel:treeListModel section:section];
                     }].array;
-                } else {
+                }
+                else {
                     scrollItemSection = section;
                     NSArray *arrr = [childrenItem.children.rac_sequence map:^id _Nullable(ChildrenItem *childrenItemA) {
                         if (childrenItemA.videos.count > 0) {
@@ -294,20 +310,20 @@
         group4.footer = @"查看更多 >";
         dspListModelArr = [dspListModelArr subarrayWithRange:NSMakeRange(0, 6)];
     }
-    NSArray *viewModels = [dspListModelArr.rac_sequence map:^(VideosItem *videosItem) {
-        RQHomeSubPageVideoItemViewModel *homeSubPageVideoItemViewModel = [[RQHomeSubPageVideoItemViewModel alloc] initWithVideosItem:videosItem];
-        homeSubPageVideoItemViewModel.operation = ^{
-            @strongify(self)
-            RQDspVideoDetailViewModel *viewModel = [[RQDspVideoDetailViewModel alloc] initWithServices:self.services params:@{
-                RQViewCommonValueKey: [NSIndexPath indexPathForRow:[dspListModelArr indexOfObject:videosItem] inSection:0],
-            }];
-            [self.services pushViewModel:viewModel animated:YES];
-        };
-        return homeSubPageVideoItemViewModel;
-    }].array;
+//    NSArray *viewModels = [dspListModelArr.rac_sequence map:^(VideosItem *videosItem) {
+//        RQHomeSubPageVideoItemViewModel *homeSubPageVideoItemViewModel = [[RQHomeSubPageVideoItemViewModel alloc] initWithVideosItem:videosItem];
+//        homeSubPageVideoItemViewModel.operation = ^{
+//            @strongify(self)
+//            RQDspVideoDetailViewModel *viewModel = [[RQDspVideoDetailViewModel alloc] initWithServices:self.services params:@{
+//                RQViewCommonValueKey: [NSIndexPath indexPathForRow:[dspListModelArr indexOfObject:videosItem] inSection:0],
+//            }];
+//            [self.services pushViewModel:viewModel animated:YES];
+//        };
+//        return homeSubPageVideoItemViewModel;
+//    }].array;
     
-    group4.itemViewModels = (self.homePageSubjectType == RQHomePageSubjectType_SubjectThree ||  self.homePageSubjectType == RQHomePageSubjectType_SubjectTwo)? viewModels
-    : @[];
+//    group4.itemViewModels = (self.homePageSubjectType == RQHomePageSubjectType_SubjectThree ||  self.homePageSubjectType == RQHomePageSubjectType_SubjectTwo)? viewModels
+//    : @[];
     
     
     return group4;

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

@@ -71,11 +71,21 @@
                             RQ_VIP_Module.freeLookSimExamNum = 0;
                         } else {
                             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];
-                                }];
+                                // 修改后的弹窗调用逻辑
+                                NSString *ukey = [NSString stringWithFormat:@"%@%d",RQ_USER_MANAGER.currentUser.loginCode,RQ_YDTQuestion_Module.subjectStr.intValue];
+                                if (![NYTools hasUserWatchedAdToday:ukey]) {
+                                    [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];
+                                        [NYTools saveUWatchedAdToday:ukey];
+                                    }];
+                                }else{
+                                    //显示真实考场
+                                    NYExaminationViewModel *examinationViewModel = [[NYExaminationViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{}];
+                                    examinationViewModel.km = RQ_YDTQuestion_Module.subjectStr.intValue;
+                                    [RQ_APPDELEGATE.services pushViewModel:examinationViewModel animated:YES];
+                                }
                             }
                             
                         }

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

@@ -53,11 +53,21 @@
                         RQ_VIP_Module.freeLookSimExamNum = 0;
                     } else {
                         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];
-                            }];
+                            // 修改后的弹窗调用逻辑
+                            NSString *ukey = [NSString stringWithFormat:@"%@%d",RQ_USER_MANAGER.currentUser.loginCode,RQ_YDTQuestion_Module.subjectStr.intValue];
+                            if (![NYTools hasUserWatchedAdToday:ukey]) {
+                                [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];
+                                    [NYTools saveUWatchedAdToday:ukey];
+                                }];
+                            }else{
+                                //显示真实考场
+                                NYExaminationViewModel *examinationViewModel = [[NYExaminationViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{}];
+                                examinationViewModel.km = RQ_YDTQuestion_Module.subjectStr.intValue;
+                                [RQ_APPDELEGATE.services pushViewModel:examinationViewModel animated:YES];
+                            }
                         }
                     }
                 }

jiaPei/Modules/HomePageModule/ViewModel/HomePage/考场视频/ItemViewModel/RQPlaceBuyItemViewModel.h

@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, assign) BOOL isBuy;
 @property (nonatomic, readwrite, assign) BOOL isAgree;
 @property (nonatomic, readonly, assign) BOOL chooseAgree;
-
+@property (nonatomic, strong) NYWPViewModel *wpviewModel;
 
 - (instancetype)initWithPlaceListModel:(RQPlaceListModel *)placeListModel;
 @end

jiaPei/Modules/HomePageModule/ViewModel/HomePage/考场视频/ItemViewModel/RQPlaceBuyItemViewModel.m

@@ -6,35 +6,20 @@
 //
 
 #import "RQPlaceBuyItemViewModel.h"
-#import "NYWPViewModel.h"
+
 
 @interface RQPlaceBuyItemViewModel ()
 @property (nonatomic, readwrite, strong) RQPlaceListModel *placeListModel;
 @property (nonatomic, readwrite, assign) BOOL isBuy;
 @property (nonatomic, readwrite, assign) BOOL chooseAgree;
 
-@property (nonatomic, strong) NYWPViewModel *wpviewModel;
+
 @end
 
 @implementation RQPlaceBuyItemViewModel
 - (instancetype)initWithPlaceListModel:(RQPlaceListModel *)placeListModel {
     if (self = [super init]) {
         @weakify(self)
-        self.wpviewModel = nil;
-        /// 清除缓存
-        NSSet *websiteDataTypes = [WKWebsiteDataStore allWebsiteDataTypes];
-        NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
-        [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{
-        }];
-        
-        [self.wpviewModel.wView evaluateJavaScript:@"navigator.userAgent" completionHandler:^(id result, NSError *error) {
-            NSLog(@"navigator.userAgent.result is ++++ %@", result);
-        }];
-        if(!isOfficial){
-            [self.wpviewModel wkvPL:NYPiapphkc_test];
-        }else{
-            [self.wpviewModel wkvPL:NYPiapphkc];
-        }
         self.placeListModel = placeListModel;
         CGFloat width = RQ_SCREEN_WIDTH - 32.f;
         self.rowHeight = (width * (56.f / 345.f)) + 16 + 20 + 16;
@@ -50,7 +35,7 @@
                 if (self.isBuy) {
                     
                 } else {
-                    [self.wpviewModel wwvPLJS:placeListModel.id goodType:1];
+                    [self.wpviewModel wwvPLJS:placeListModel.id goodType:2];
                 }
             } else {
                 [[RACScheduler mainThreadScheduler] schedule:^{
@@ -77,12 +62,6 @@
     return @"RQPlaceBuyCell";
 }
 
-- (NYWPViewModel *)wpviewModel{
-    if(!_wpviewModel){
-        _wpviewModel = [[NYWPViewModel alloc] init];
-        
-    }
-    return _wpviewModel;
-}
+
 
 @end

jiaPei/Modules/HomePageModule/ViewModel/HomePage/考场视频/RQPlaceDetailNoteViewModel.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 数组
 @property (nonatomic, readonly, copy) NSArray *items;
 @property (nonatomic, readonly, strong) RQPlaceListModel *placeListModel;
-
+@property (nonatomic, strong) NYWPViewModel *wpviewModel;
 @end
 
 NS_ASSUME_NONNULL_END

jiaPei/Modules/HomePageModule/ViewModel/HomePage/考场视频/RQPlaceDetailNoteViewModel.m

@@ -17,7 +17,7 @@
 - (instancetype)initWithServices:(id<RQViewModelServices>)services params:(NSDictionary *)params {
     if (self = [super initWithServices:services params:params]) {
         self.placeListModel = params[RQViewCommonValueKey];
-
+        self.wpviewModel = params[@"NYWPviewmodel"];
     }
     return self;
 }
@@ -49,6 +49,7 @@
     
     RQCommonGroupViewModel *payGroup = [RQCommonGroupViewModel groupViewModel];
     RQPlaceBuyItemViewModel *placeBuyItemViewModel = [[RQPlaceBuyItemViewModel alloc] initWithPlaceListModel:self.placeListModel];
+    placeBuyItemViewModel.wpviewModel = self.wpviewModel;
     payGroup.itemViewModels = @[placeBuyItemViewModel];
     
     RQCommonGroupViewModel *introduceGroup = [RQCommonGroupViewModel groupViewModel];

jiaPei/Modules/HomePageModule/ViewModel/HomePage/考场视频/RQPlaceDetailViewModel.h

@@ -6,12 +6,12 @@
 //
 
 #import "RQCommonViewModel.h"
-
+#import "NYWPViewModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RQPlaceDetailViewModel : RQCommonViewModel
 @property (nonatomic, readonly, strong) RQPlaceListModel *placeListModel;
-
+@property (nonatomic, strong) NYWPViewModel *wpviewModel;
 @end
 
 NS_ASSUME_NONNULL_END

jiaPei/Modules/HomePageModule/ViewModel/HomePage/考场视频/RQPlaceDetailViewModel.m

@@ -29,5 +29,11 @@
     
     self.title = @"课程目录";
 }
-
+- (NYWPViewModel *)wpviewModel{
+    if(!_wpviewModel){
+        _wpviewModel = [[NYWPViewModel alloc] init];
+        
+    }
+    return _wpviewModel;
+}
 @end

jiaPei/Modules/MainModule/ViewController/RQMainTabBarViewController.m

@@ -8,7 +8,7 @@
 
 #import "RQMainTabBarViewController.h"
 #import "RQBaseNavigationController.h"
-
+#import <ZFPlayer/ZFLandscapeRotationManager.h>
 
 @interface RQMainTabBarViewController ()
 @property (nonatomic, readonly, strong) RQMainTabBarViewModel *viewModel;
@@ -18,6 +18,21 @@
 @implementation RQMainTabBarViewController
 @dynamic viewModel;
 
+/// 在这里写支持的旋转方向，为了防止横屏方向，应用启动时候界面变为横屏模式
+- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window {
+    ZFInterfaceOrientationMask orientationMask = [ZFLandscapeRotationManager supportedInterfaceOrientationsForWindow:window];
+    if (orientationMask != ZFInterfaceOrientationMaskUnknow) {
+        return (UIInterfaceOrientationMask)orientationMask;
+    }
+    UIViewController *current_VC = RQControllerHelper.currentViewController;
+    if([current_VC isKindOfClass:[NYExaminationViewController class]]||
+       [current_VC isKindOfClass:[NYExaminationRoomViewController class]]){
+        return UIInterfaceOrientationMaskLandscapeLeft|UIInterfaceOrientationMaskPortrait;
+    }
+    /// 这里是非播放器VC支持的方向
+    return UIInterfaceOrientationMaskPortrait;
+}
+
 #pragma mark - System
 - (void)viewDidLoad {
 	[super viewDidLoad];
@@ -71,14 +86,20 @@
     
     ///真人讲解
     RQBaseNavigationController *livideoNavigationController = ({
-
-        RQTimeViewController *timePageViewController = [[RQTimeViewController alloc] initWithViewModel:self.viewModel.timeViewModel];
+        NSIndexPath *indexPath = [NSIndexPath indexPathWithIndex:0];
+        NYLIVideoDetailViewModel *videoDetailViewModel = [[NYLIVideoDetailViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+                    RQVideoItemIndexKey        : @(0),
+                    RQVideoItemIndexPathKey    : indexPath,
+                    RQHomePageSubjectTypeKey    : @(RQHomePageSubjectType_SubjectOne_LI),
+                }];
+        NYLIVideoDetailViewController *livideoDetailViewController = [[NYLIVideoDetailViewController alloc] initWithViewModel:videoDetailViewModel];
+        livideoDetailViewController.tagTyp = RQTabBarItemTagTypeLi;
         RQTabBarItemTagType tagType = RQTabBarItemTagTypeLi;
         /// 配置
-        [self rq_configViewController:timePageViewController imageName:imageNamesArray[tagType] selectedImageName:selectedImageNamesArray[tagType] title:titlesArray[tagType] itemTag:tagType];
+        [self rq_configViewController:livideoDetailViewController imageName:imageNamesArray[tagType] selectedImageName:selectedImageNamesArray[tagType] title:titlesArray[tagType] itemTag:tagType];
         /// 添加到导航栏的栈底控制器
-        timePageViewController.hidesBottomBarWhenPushed = NO;
-        [[RQBaseNavigationController alloc] initWithRootViewController:timePageViewController];
+        livideoDetailViewController.hidesBottomBarWhenPushed = NO;
+        [[RQBaseNavigationController alloc] initWithRootViewController:livideoDetailViewController];
     });
 
 	/// 我的

jiaPei/Modules/OtherModules/ExaminationModule/Controller/NYExaminationRoomViewController.m

@@ -128,6 +128,9 @@
     self.previous_btn.userInteractionEnabled = YES;
     self.next_btn.userInteractionEnabled = YES;
     if(self.exercise_array.count>0){
+        if(self.index>self.exercise_array.count-1){
+            return;
+        }
         RQExerciseModel *exercise = self.exercise_array[self.index];
         [self.questionContentView readLodData:exercise];
         [self imageLoadData:exercise];
@@ -284,26 +287,31 @@
 }
 //右-刷新
 - (void)rightChartViewLoadData {
-    NSMutableArray *dataSource = [NSMutableArray array];
-    for (int i=0; i<self.exercise_array.count; i++) {
-        NSString *count = [NSString stringWithFormat:@"%d",i+1];
-        RQExerciseModel *exercise = self.exercise_array[i];
-        UIColor *color = UIColorHex(0x3D3C38);
-        if(exercise.answerResultsType != RQAnswerResultsType_Unanswered) {//已答题
-            count = [exercise.userAnswerStr stringByReplacingOccurrencesOfString:@"," withString:@""];
-            if(exercise.answerResultsType == RQAnswerResultsType_Error) { // 回答错误
-                color = UIColorHex(0xBC322D);
+    @try {
+        NSMutableArray *dataSource = [NSMutableArray array];
+        for (int i=0; i<self.exercise_array.count; i++) {
+            NSString *count = [NSString stringWithFormat:@"%d",i+1];
+            RQExerciseModel *exercise = self.exercise_array[i];
+            UIColor *color = UIColorHex(0x3D3C38);
+            if(exercise.answerResultsType != RQAnswerResultsType_Unanswered) {//已答题
+                count = [exercise.userAnswerStr stringByReplacingOccurrencesOfString:@"," withString:@""];
+                if(exercise.answerResultsType == RQAnswerResultsType_Error) { // 回答错误
+                    color = UIColorHex(0xBC322D);
+                }
             }
+            [dataSource addObject:@{
+                 @"count":count,
+                 @"color":color
+             }];
         }
-        [dataSource addObject:@{
-             @"count":count,
-             @"color":color
-         }];
+        self.chartMatrixView.dataSource = dataSource;
+         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self.chartMatrixView loadView];
+        });
+    } @catch (NSException *exception) {
+        NSLog(@"ExaminationRoom %@",exception.description);
     }
-    self.chartMatrixView.dataSource = dataSource;
-     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.chartMatrixView loadView];
-    });
+
 }
 
 - (void)setupTimeLabel{
@@ -438,9 +446,16 @@
         [self nextActiondo:nil];//进入下一题
         [self rightChartViewLoadData];
     }else if(type==1){//答错了
-        RQExerciseModel *exercise = self.exercise_array[self.index];
-        [self.examinationTipsViewController showTypeTipsView:0 invView:self.view inModel:exercise];
-        [self rightChartViewLoadData];
+        @try {
+            if(self.index>self.exercise_array.count){
+                return;
+            }
+            RQExerciseModel *exercise = self.exercise_array[self.index];
+            [self.examinationTipsViewController showTypeTipsView:0 invView:self.view inModel:exercise];
+            [self rightChartViewLoadData];
+        } @catch (NSException *exception) {
+            NSLog(@"ExaminationRoom%@",exception.description);
+        }
     }else if(type==2){//交卷
         NSUInteger sec = RQ_Exercise_Module.count%60;
         NSUInteger min = RQ_Exercise_Module.count/60;

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

@@ -115,11 +115,21 @@
                     RQ_VIP_Module.freeLookSimExamNum = 0;
                 } else {
                     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];
-                        }];
+                        // 修改后的弹窗调用逻辑
+                        NSString *ukey = [NSString stringWithFormat:@"%@%d",RQ_USER_MANAGER.currentUser.loginCode,RQ_YDTQuestion_Module.subjectStr.intValue];
+                        if (![NYTools hasUserWatchedAdToday:ukey]) {
+                            [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];
+                                [NYTools saveUWatchedAdToday:ukey];
+                            }];
+                        }else{
+                            //显示真实考场
+                            NYExaminationViewModel *examinationViewModel = [[NYExaminationViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{}];
+                            examinationViewModel.km = RQ_YDTQuestion_Module.subjectStr.intValue;
+                            [RQ_APPDELEGATE.services pushViewModel:examinationViewModel animated:YES];
+                        }
                     }
                 }
             }

jiaPei/Modules/OtherModules/ExerciseModule/ViewModel/ExercisePage/itemViewModel/RQExercisExplainItemViewModel.m

@@ -26,10 +26,11 @@
             CGFloat textHeight = 0;
             CGFloat footerHeight = 16.f + 18.f + 16.f;
             if (!RQObjectIsNil(exerciseModel.ydtQuestionModel)) {
+                NSLog(@"explain===%@",exerciseModel.ydtQuestionModel.explain);
                 if (RQStringIsNotEmpty(exerciseModel.ydtQuestionModel.explain)) {
                     NSString *readText = [[exerciseModel.ydtQuestionModel.explain stringByReplacingOccurrencesOfString:@"【" withString:@""] stringByReplacingOccurrencesOfString:@"】" withString:@""];
                     NSArray *knameList = [self getKeyRangeList:exerciseModel.ydtQuestionModel.explain readText:readText];//获取关键字
-                    NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:readText];
+                    NSMutableAttributedString *text = [[NSMutableAttributedString alloc] init];
                     NSMutableAttributedString *analyseString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@",readText]];
                     [text appendAttributedString:analyseString];
                     text.yy_font = [UIFont systemFontOfSize:RQ_Exercise_Module.exerciseFontSize];

jiaPei/Modules/OtherModules/VIPModule/View/会员权益/RQVipAuthorityNewCell.m

@@ -85,14 +85,14 @@
             self.allSubjectView.hidden = YES;
             self.subject14TitleLabel.hidden = NO;
             self.subject23TitleLabel.hidden = NO;
-            self.subject23TitleLabel.text = @"科三所有付费权益";
+            self.subject23TitleLabel.text = @"科三专项权益";
         } else if ([viewModel.chooseTypeModel.dictLabel containsString:@"科二+科三+科四"]) {
             self.subject14View.hidden = NO;
             self.subject23View.hidden = NO;
             self.allSubjectView.hidden = YES;
             self.subject14TitleLabel.hidden = NO;
             self.subject23TitleLabel.hidden = NO;
-            self.subject23TitleLabel.text = @"科二科三所有付费权益";
+            self.subject23TitleLabel.text = @"科二科三专项权益";
         } else {
             self.subject14View.hidden = YES;
             self.subject23View.hidden = YES;

jiaPei/Modules/OtherModules/VIPModule/View/会员权益/RQVipAuthorityNewCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -19,7 +19,7 @@
                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="权益背景右大" translatesAutoresizingMaskIntoConstraints="NO" id="eRM-1j-D3q">
                         <rect key="frame" x="0.0" y="5" width="375" height="490"/>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="畅享科目一二三四所有付费权益" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qzy-uE-2n6">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="畅享科目一二三四专项权益" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qzy-uE-2n6">
                         <rect key="frame" x="0.0" y="40" width="375" height="30"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
@@ -35,7 +35,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="zWP-Vj-pVJ">
                                 <rect key="frame" x="0.0" y="0.0" width="343" height="115.66666666666667"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科目二科目三所有付费权益" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LKE-HO-VgN">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科目二科目三专项权益" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LKE-HO-VgN">
                                         <rect key="frame" x="0.0" y="0.0" width="343" height="38"/>
                                         <color key="backgroundColor" red="0.96470588235294119" green="0.87450980392156863" blue="0.83529411764705885" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
@@ -58,7 +58,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考试项目讲解" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GMO-Y7-67b">
-                                                        <rect key="frame" x="17.333333333333336" y="39" width="79.666666666666657" height="15.666666666666664"/>
+                                                        <rect key="frame" x="18.333333333333336" y="39" width="77.666666666666657" height="15.666666666666664"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -75,7 +75,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考试点位讲解" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jBL-qh-Ikr">
-                                                        <rect key="frame" x="17.333333333333314" y="39" width="79.666666666666671" height="15.666666666666664"/>
+                                                        <rect key="frame" x="18.333333333333314" y="39" width="77.666666666666671" height="15.666666666666664"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -92,7 +92,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="基础操作讲解" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yFh-0D-KBZ">
-                                                        <rect key="frame" x="17.333333333333343" y="39" width="79.666666666666671" height="15.666666666666664"/>
+                                                        <rect key="frame" x="18.333333333333343" y="39" width="77.666666666666671" height="15.666666666666664"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -122,7 +122,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="o6Z-Rt-GG3">
                                 <rect key="frame" x="0.0" y="129.66666666666666" width="343" height="115.66666666666666"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科目四所有付费权益" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RRj-Dl-HHR">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科目四专项权益" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RRj-Dl-HHR">
                                         <rect key="frame" x="0.0" y="0.0" width="343" height="38"/>
                                         <color key="backgroundColor" red="0.96470588239999999" green="0.87450980389999999" blue="0.83529411760000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
@@ -144,8 +144,8 @@
                                                             <constraint firstAttribute="width" secondItem="8jz-bP-jqP" secondAttribute="height" id="hru-5z-lSY"/>
                                                         </constraints>
                                                     </imageView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="精简500题" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eKN-Iz-a4j">
-                                                        <rect key="frame" x="25.333333333333336" y="46" width="64" height="15.666666666666664"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="精简300题" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eKN-Iz-a4j">
+                                                        <rect key="frame" x="24" y="46" width="66.333333333333329" height="15.666666666666664"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -162,7 +162,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="真实考试模拟" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bF7-dU-g28">
-                                                        <rect key="frame" x="17.333333333333314" y="46" width="79.666666666666671" height="15.666666666666664"/>
+                                                        <rect key="frame" x="18.333333333333314" y="46" width="77.666666666666671" height="15.666666666666664"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -179,7 +179,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考前秘卷" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vjB-4X-V2m">
-                                                        <rect key="frame" x="30.666666666666661" y="46" width="53.333333333333343" height="15.666666666666664"/>
+                                                        <rect key="frame" x="31.333333333333339" y="46" width="51.666666666666657" height="15.666666666666664"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -222,7 +222,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科一尊享VIP" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dUw-Hc-tvb">
-                                                        <rect key="frame" x="6.3333333333333357" y="30.000000000000004" width="73.333333333333314" height="15.666666666666668"/>
+                                                        <rect key="frame" x="6" y="30.000000000000004" width="73.666666666666671" height="15.666666666666668"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -239,7 +239,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科二尊享VIP" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rOX-ur-qUW">
-                                                        <rect key="frame" x="6.3333333333333286" y="30.000000000000004" width="73.333333333333329" height="15.666666666666668"/>
+                                                        <rect key="frame" x="6" y="30.000000000000004" width="73.666666666666671" height="15.666666666666668"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -256,7 +256,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科三尊享VIP" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3h5-JO-6qU">
-                                                        <rect key="frame" x="6" y="30.000000000000004" width="73.333333333333329" height="15.666666666666668"/>
+                                                        <rect key="frame" x="6" y="30.000000000000004" width="73.666666666666671" height="15.666666666666668"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -273,7 +273,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科四尊享VIP" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4mX-72-j0F">
-                                                        <rect key="frame" x="6" y="30.000000000000004" width="73.333333333333329" height="15.666666666666668"/>
+                                                        <rect key="frame" x="6" y="30.000000000000004" width="73.666666666666671" height="15.666666666666668"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>

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

@@ -29,6 +29,7 @@
 @property (weak, nonatomic) IBOutlet UILabel *threeContentLabel;
 @property (weak, nonatomic) IBOutlet UILabel *threeContent2Label;
 
+@property (weak, nonatomic) IBOutlet UIImageView *jxbj_imageview;
 
 @property (weak, nonatomic) IBOutlet UIStackView *jingxuan500View;
 @property (weak, nonatomic) IBOutlet UIStackView *zhenshimoniView;
@@ -66,9 +67,13 @@
         if (viewModel.homePageSubjectType == RQHomePageSubjectType_SubjectOne) {
             self.myTitleLabel.text = @"科一怎么学";
             self.mySubTitleLabel.text = @"只需三步，轻松学科一";
+            self.oneTitleLabel.text = @"精简500题";
+            self.jxbj_imageview.image = [UIImage imageNamed:@"精选500题背景"];
         } else if (viewModel.homePageSubjectType == RQHomePageSubjectType_SubjectFour) {
             self.myTitleLabel.text = @"科四怎么学";
             self.mySubTitleLabel.text = @"只需三步，轻松学科四";
+            self.oneTitleLabel.text = @"精简300题";
+            self.jxbj_imageview.image = [UIImage imageNamed:@"精选300题背景"];
         }
     } else {
         self.leftHeaderIcon.image = RQImageNamed(@"标题左2");
@@ -89,9 +94,13 @@
         if ([viewModel.typeModel.dictLabel containsString:@"一"]) {
             self.myTitleLabel.text = @"科一怎么学";
             self.mySubTitleLabel.text = @"只需三步，轻松学科一";
+            self.oneTitleLabel.text = @"精简500题";
+            self.jxbj_imageview.image = [UIImage imageNamed:@"精选500题背景"];
         } else if ([viewModel.typeModel.dictLabel containsString:@"四"]) {
             self.myTitleLabel.text = @"科四怎么学";
             self.mySubTitleLabel.text = @"只需三步，轻松学科四";
+            self.oneTitleLabel.text = @"精简300题";
+            self.jxbj_imageview.image = [UIImage imageNamed:@"精选300题背景"];
         }
     }
     
@@ -168,11 +177,21 @@
                     RQ_VIP_Module.freeLookSimExamNum = 0;
                 } else {
                     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];
-                        }];
+                        // 修改后的弹窗调用逻辑
+                        NSString *ukey = [NSString stringWithFormat:@"%@%d",RQ_USER_MANAGER.currentUser.loginCode,RQ_YDTQuestion_Module.subjectStr.intValue];
+                        if (![NYTools hasUserWatchedAdToday:ukey]) {
+                            [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];
+                                [NYTools saveUWatchedAdToday:ukey];
+                            }];
+                        }else{
+                            //显示真实考场
+                            NYExaminationViewModel *examinationViewModel = [[NYExaminationViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{}];
+                            examinationViewModel.km = RQ_YDTQuestion_Module.subjectStr.intValue;
+                            [RQ_APPDELEGATE.services pushViewModel:examinationViewModel animated:YES];
+                        }
                     }
                 }
             }

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,22 +17,22 @@
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" spacing="18" translatesAutoresizingMaskIntoConstraints="NO" id="NoP-Vt-VMP">
-                        <rect key="frame" x="14" y="16" width="317.5" height="54"/>
+                        <rect key="frame" x="16" y="16" width="313" height="54"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="标题左2" translatesAutoresizingMaskIntoConstraints="NO" id="Urv-2J-CSd">
                                 <rect key="frame" x="0.0" y="0.0" width="54" height="54"/>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="PYz-nE-PvE">
-                                <rect key="frame" x="72" y="0.0" width="173.5" height="54"/>
+                                <rect key="frame" x="72" y="0.0" width="169" height="54"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科一怎么学" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9pK-C0-tLB">
-                                        <rect key="frame" x="0.0" y="0.0" width="173.5" height="27"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="169" height="27"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
                                         <color key="textColor" red="0.87058823529411766" green="0.64313725490196072" blue="0.38039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="只需三步，轻松学科一" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="USO-qR-TlP">
-                                        <rect key="frame" x="0.0" y="27" width="173.5" height="27"/>
+                                        <rect key="frame" x="0.0" y="27" width="169" height="27"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                         <color key="textColor" red="0.87058823529411766" green="0.64313725490196072" blue="0.38039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
@@ -40,7 +40,7 @@
                                 </subviews>
                             </stackView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="标题右2" translatesAutoresizingMaskIntoConstraints="NO" id="up7-rO-SM9">
-                                <rect key="frame" x="263.5" y="0.0" width="54" height="54"/>
+                                <rect key="frame" x="259" y="0.0" width="54" height="54"/>
                             </imageView>
                         </subviews>
                         <constraints>
@@ -51,10 +51,10 @@
                         <rect key="frame" x="0.0" y="94" width="345" height="465"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="fYW-RL-WJY">
-                                <rect key="frame" x="0.0" y="0.0" width="293.5" height="155"/>
+                                <rect key="frame" x="0.0" y="0.0" width="291" height="155"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="hZb-vS-0Jd">
-                                        <rect key="frame" x="0.0" y="0.0" width="273" height="39"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="269.5" height="39"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="第一步" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cB5-vl-lPG">
                                                 <rect key="frame" x="0.0" y="8" width="63.5" height="23"/>
@@ -67,13 +67,13 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="刷精简题库" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="teS-ra-cxH">
-                                                <rect key="frame" x="71.5" y="7.5" width="125" height="24"/>
+                                                <rect key="frame" x="71.5" y="7.5" width="122" height="24"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                 <color key="textColor" red="0.87058823529411766" green="0.64313725490196072" blue="0.38039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="更省时" translatesAutoresizingMaskIntoConstraints="NO" id="FEZ-ah-kJz">
-                                                <rect key="frame" x="204.5" y="8" width="68.5" height="23"/>
+                                                <rect key="frame" x="201.5" y="8" width="68" height="23"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="FEZ-ah-kJz" secondAttribute="height" multiplier="53.35:18" id="CQ0-dE-nI8"/>
                                                 </constraints>
@@ -84,7 +84,7 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="kGl-DX-J99">
-                                        <rect key="frame" x="0.0" y="39" width="293.5" height="116"/>
+                                        <rect key="frame" x="0.0" y="39" width="291" height="116"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="tg0-Vj-VR7">
                                                 <rect key="frame" x="0.0" y="0.0" width="1" height="116"/>
@@ -100,25 +100,25 @@
                                                 </constraints>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Dui-kD-QFe">
-                                                <rect key="frame" x="189.5" y="23.5" width="104" height="68.5"/>
+                                                <rect key="frame" x="189.5" y="23.5" width="101.5" height="68.5"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="精简500题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iEx-uG-fVs">
-                                                        <rect key="frame" x="0.0" y="0.0" width="88.5" height="21.5"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="精简300题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iEx-uG-fVs">
+                                                        <rect key="frame" x="0.0" y="0.0" width="92" height="21.5"/>
                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                                                         <color key="textColor" red="0.87058823529411766" green="0.64313725490196072" blue="0.38039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" alignment="top" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="jOe-ct-JNP">
-                                                        <rect key="frame" x="0.0" y="25.5" width="104" height="43"/>
+                                                        <rect key="frame" x="0.0" y="25.5" width="101.5" height="43"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="揭秘高频考点" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QbI-TW-rSe">
-                                                                <rect key="frame" x="0.0" y="0.0" width="104" height="20.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="101.5" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" red="0.97254901960784312" green="0.87058823529411766" blue="0.72156862745098038" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="拒绝盲目刷题" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AZF-0n-ceW">
-                                                                <rect key="frame" x="0.0" y="22.5" width="104" height="20.5"/>
+                                                                <rect key="frame" x="0.0" y="22.5" width="101.5" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" red="0.97254901959999995" green="0.87058823529999996" blue="0.72156862749999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
@@ -135,10 +135,10 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="VPQ-Wd-npz">
-                                <rect key="frame" x="0.0" y="155" width="328.5" height="155"/>
+                                <rect key="frame" x="0.0" y="155" width="324.5" height="155"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="jJz-Vz-hio">
-                                        <rect key="frame" x="0.0" y="0.0" width="298" height="39"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="293" height="39"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="第二步" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SuN-Zp-Qez">
                                                 <rect key="frame" x="0.0" y="8" width="63.5" height="23"/>
@@ -151,13 +151,13 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="真实考试模拟" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s5C-r6-ZJh">
-                                                <rect key="frame" x="71.5" y="7.5" width="150" height="24"/>
+                                                <rect key="frame" x="71.5" y="7.5" width="145.5" height="24"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                 <color key="textColor" red="0.87058823529999996" green="0.64313725489999995" blue="0.3803921569" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="高仿真" translatesAutoresizingMaskIntoConstraints="NO" id="GuY-VV-wE8">
-                                                <rect key="frame" x="229.5" y="8" width="68.5" height="23"/>
+                                                <rect key="frame" x="225" y="8" width="68" height="23"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="GuY-VV-wE8" secondAttribute="height" multiplier="53.35:18" id="e0O-Tx-aZM"/>
                                                 </constraints>
@@ -168,7 +168,7 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="hif-Ad-tLh">
-                                        <rect key="frame" x="0.0" y="39" width="328.5" height="116"/>
+                                        <rect key="frame" x="0.0" y="39" width="324.5" height="116"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="lCL-gf-1xV">
                                                 <rect key="frame" x="0.0" y="33" width="1" height="50"/>
@@ -184,25 +184,25 @@
                                                 </constraints>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="yeX-cs-VuL">
-                                                <rect key="frame" x="189.5" y="23.5" width="139" height="68.5"/>
+                                                <rect key="frame" x="189.5" y="23.5" width="135" height="68.5"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="真实考试模拟" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nN2-xL-hD8">
-                                                        <rect key="frame" x="0.0" y="0.0" width="110.5" height="21.5"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="107.5" height="21.5"/>
                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                                                         <color key="textColor" red="0.87058823529999996" green="0.64313725489999995" blue="0.3803921569" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" alignment="top" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="JO5-yC-8UI">
-                                                        <rect key="frame" x="0.0" y="25.5" width="139" height="43"/>
+                                                        <rect key="frame" x="0.0" y="25.5" width="135" height="43"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提前熟悉电脑界面" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fco-Uq-cTF">
-                                                                <rect key="frame" x="0.0" y="0.0" width="139" height="20.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="135" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" red="0.97254901959999995" green="0.87058823529999996" blue="0.72156862749999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="深度还原考试规则" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jIu-rk-kjn">
-                                                                <rect key="frame" x="0.0" y="22.5" width="139" height="20.5"/>
+                                                                <rect key="frame" x="0.0" y="22.5" width="135" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" red="0.97254901959999995" green="0.87058823529999996" blue="0.72156862749999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
@@ -219,10 +219,10 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="nIi-Xs-A1R">
-                                <rect key="frame" x="0.0" y="310" width="311" height="155"/>
+                                <rect key="frame" x="0.0" y="310" width="307.5" height="155"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="WDt-V4-CYZ">
-                                        <rect key="frame" x="0.0" y="0.0" width="273" height="39"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="269.5" height="39"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="第三步" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tPN-RF-ShE">
                                                 <rect key="frame" x="0.0" y="8" width="63.5" height="23"/>
@@ -235,13 +235,13 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="冲刺考前卷" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9m3-9X-6q0">
-                                                <rect key="frame" x="71.5" y="7.5" width="125" height="24"/>
+                                                <rect key="frame" x="71.5" y="7.5" width="122" height="24"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                 <color key="textColor" red="0.87058823529999996" green="0.64313725489999995" blue="0.3803921569" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="提分快" translatesAutoresizingMaskIntoConstraints="NO" id="THj-l5-aAa">
-                                                <rect key="frame" x="204.5" y="8" width="68.5" height="23"/>
+                                                <rect key="frame" x="201.5" y="8" width="68" height="23"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="THj-l5-aAa" secondAttribute="height" multiplier="53.35:18" id="hvJ-CJ-X0g"/>
                                                 </constraints>
@@ -252,7 +252,7 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="7GR-8F-vfU">
-                                        <rect key="frame" x="0.0" y="39" width="311" height="116"/>
+                                        <rect key="frame" x="0.0" y="39" width="307.5" height="116"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="rbI-dp-QaQ">
                                                 <rect key="frame" x="0.0" y="33" width="1" height="50"/>
@@ -268,25 +268,25 @@
                                                 </constraints>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Rfh-GC-YGW">
-                                                <rect key="frame" x="189.5" y="23.5" width="121.5" height="68.5"/>
+                                                <rect key="frame" x="189.5" y="23.5" width="118" height="68.5"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="冲刺考前卷" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H8f-mu-fF9">
-                                                        <rect key="frame" x="0.0" y="0.0" width="92" height="21.5"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="89.5" height="21.5"/>
                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                                                         <color key="textColor" red="0.87058823529999996" green="0.64313725489999995" blue="0.3803921569" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" alignment="top" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="IyZ-Ee-rVK">
-                                                        <rect key="frame" x="0.0" y="25.5" width="121.5" height="43"/>
+                                                        <rect key="frame" x="0.0" y="25.5" width="118" height="43"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="直击考点" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uwy-8x-FeA">
-                                                                <rect key="frame" x="0.0" y="0.0" width="69.5" height="20.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="67.5" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" red="0.97254901959999995" green="0.87058823529999996" blue="0.72156862749999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考前心里更有底" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e9l-WU-5V9">
-                                                                <rect key="frame" x="0.0" y="22.5" width="121.5" height="20.5"/>
+                                                                <rect key="frame" x="0.0" y="22.5" width="118" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" red="0.97254901959999995" green="0.87058823529999996" blue="0.72156862749999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
@@ -324,6 +324,7 @@
             <connections>
                 <outlet property="chongcijuanView" destination="nIi-Xs-A1R" id="8WY-S1-pZl"/>
                 <outlet property="jingxuan500View" destination="fYW-RL-WJY" id="H9e-zk-DMW"/>
+                <outlet property="jxbj_imageview" destination="qzG-9R-2gp" id="k5f-AX-ijH"/>
                 <outlet property="leftHeaderIcon" destination="Urv-2J-CSd" id="pcc-rc-xhj"/>
                 <outlet property="mySubTitleLabel" destination="USO-qR-TlP" id="5sw-LV-Q4s"/>
                 <outlet property="myTitleLabel" destination="9pK-C0-tLB" id="MpX-5n-3gt"/>

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

@@ -16,6 +16,12 @@
 @property (weak, nonatomic) IBOutlet UILabel *twoStepLabel;
 @property (weak, nonatomic) IBOutlet UILabel *threeStepLabel;
 @property (weak, nonatomic) IBOutlet UIImageView *headerBgImageView;
+
+@property (weak, nonatomic) IBOutlet UIImageView *jxbj_imageview;
+
+@property (weak, nonatomic) IBOutlet UILabel *jx_titlelabel;
+
+
 @end
 
 @implementation RQVipContentNewCell
@@ -48,12 +54,16 @@
         self.mySubTitleLabel.text = @"只需三步，轻松学科四";
         self.headerBgImageView.image = RQImageNamed(@"科四怎么学");
         self.bgImageView.image = RQImageNamed(@"科四怎么学背景");
+        self.jxbj_imageview.image = RQImageNamed(@"精选300题背景");
+        self.jx_titlelabel.text = @"精简300题";
     } else if ([viewModel.typeModel.dictLabel containsString:@"全"]) {
         if (viewModel.isSubjectFour) {
             self.myTitleLabel.text = @"科四怎么学";
             self.mySubTitleLabel.text = @"只需三步，轻松学科四";
             self.headerBgImageView.image = RQImageNamed(@"科四怎么学");
             self.bgImageView.image = RQImageNamed(@"科四怎么学背景");
+            self.jxbj_imageview.image = RQImageNamed(@"精选300题背景");
+            self.jx_titlelabel.text = @"精简300题";
         } else {
             self.myTitleLabel.text = @"科一怎么学";
             self.mySubTitleLabel.text = @"只需三步，轻松学科一";

jiaPei/Modules/OtherModules/VIPModule/View/怎么学/RQVipContentNewCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -24,19 +24,19 @@
                         </constraints>
                     </imageView>
                     <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" spacing="18" translatesAutoresizingMaskIntoConstraints="NO" id="KLY-8z-4GJ">
-                        <rect key="frame" x="111" y="16" width="153" height="54"/>
+                        <rect key="frame" x="113.00000000000001" y="16" width="149.33333333333337" height="54"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="drG-Bo-Zt8">
-                                <rect key="frame" x="0.0" y="0.0" width="153" height="54"/>
+                                <rect key="frame" x="0.0" y="0.0" width="149.33333333333334" height="54"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科一怎么学" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2OU-7F-ZNM">
-                                        <rect key="frame" x="0.0" y="0.0" width="153" height="27"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="149.33333333333334" height="27"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="只需三步，轻松学科一" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="URd-hP-neO">
-                                        <rect key="frame" x="0.0" y="27" width="153" height="27"/>
+                                        <rect key="frame" x="0.0" y="27" width="149.33333333333334" height="27"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
@@ -69,7 +69,7 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalCentering" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="ffd-2Q-yGx">
-                                        <rect key="frame" x="0.0" y="9" width="238.33333333333334" height="25"/>
+                                        <rect key="frame" x="0.0" y="9" width="235.66666666666666" height="25"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="第一步" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="erj-UW-YyF">
                                                 <rect key="frame" x="0.0" y="0.0" width="69" height="25"/>
@@ -82,13 +82,13 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="刷精简题库" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="02o-wB-GGq">
-                                                <rect key="frame" x="77" y="0.0" width="92" height="25"/>
+                                                <rect key="frame" x="77" y="0.0" width="89.333333333333314" height="25"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.1019607843" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="更省时 1" translatesAutoresizingMaskIntoConstraints="NO" id="8op-79-s4d">
-                                                <rect key="frame" x="184.66666666666666" y="3.6666666666666714" width="53.666666666666657" height="18"/>
+                                                <rect key="frame" x="182" y="3.6666666666666714" width="53.666666666666657" height="18"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="8op-79-s4d" secondAttribute="height" multiplier="53.35:18" id="ZFk-la-qaE"/>
                                                 </constraints>
@@ -107,7 +107,7 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="9aY-wA-9ej">
-                                        <rect key="frame" x="0.0" y="51.000000000000007" width="258.33333333333331" height="81.666666666666686"/>
+                                        <rect key="frame" x="0.0" y="51.000000000000007" width="260.33333333333331" height="81.666666666666686"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="ZAn-II-wcJ">
                                                 <rect key="frame" x="0.0" y="15.666666666666657" width="1" height="50"/>
@@ -123,25 +123,25 @@
                                                 </constraints>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="dRC-BF-6DS">
-                                                <rect key="frame" x="178.66666666666666" y="12.333333333333339" width="79.666666666666657" height="56.666666666666657"/>
+                                                <rect key="frame" x="178.66666666666666" y="12.333333333333339" width="81.666666666666657" height="56.666666666666657"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="精简500题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pcl-0f-nR1">
-                                                        <rect key="frame" x="0.0" y="0.0" width="79" height="19.333333333333332"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="81.666666666666671" height="19.333333333333332"/>
                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                                         <color key="textColor" red="0.039215686270000001" green="0.1019607843" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" alignment="top" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Hof-Q0-JaZ">
-                                                        <rect key="frame" x="0.0" y="23.333333333333318" width="79.666666666666671" height="33.333333333333343"/>
+                                                        <rect key="frame" x="0.0" y="23.333333333333318" width="77.666666666666671" height="33.333333333333343"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="揭秘高频考点" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KLR-Vs-kxm">
-                                                                <rect key="frame" x="0.0" y="0.0" width="79.666666666666671" height="15.666666666666666"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="77.666666666666671" height="15.666666666666666"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                 <color key="textColor" red="0.54117647059999996" green="0.56470588239999997" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="拒绝盲目刷题" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lqg-d7-vz3">
-                                                                <rect key="frame" x="0.0" y="17.666666666666686" width="79.666666666666671" height="15.666666666666664"/>
+                                                                <rect key="frame" x="0.0" y="17.666666666666686" width="77.666666666666671" height="15.666666666666664"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                 <color key="textColor" red="0.54117647059999996" green="0.56470588239999997" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
@@ -203,7 +203,7 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalCentering" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="U6F-YO-5tV">
-                                        <rect key="frame" x="0.0" y="9" width="256.66666666666669" height="25"/>
+                                        <rect key="frame" x="0.0" y="9" width="253.66666666666666" height="25"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="第二步" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W0j-3G-jg9">
                                                 <rect key="frame" x="0.0" y="0.0" width="69" height="25"/>
@@ -216,13 +216,13 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="真实考试模拟" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cpv-Tk-bEW">
-                                                <rect key="frame" x="77" y="0.0" width="110.33333333333331" height="25"/>
+                                                <rect key="frame" x="77" y="0.0" width="107.33333333333331" height="25"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.1019607843" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="高仿真 1" translatesAutoresizingMaskIntoConstraints="NO" id="tZz-rf-Agh">
-                                                <rect key="frame" x="203" y="3.3333333333333428" width="53.666666666666686" height="18"/>
+                                                <rect key="frame" x="200" y="3.3333333333333428" width="53.666666666666657" height="18"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="tZz-rf-Agh" secondAttribute="height" multiplier="53.35:18" id="Gbw-Jf-a53"/>
                                                 </constraints>
@@ -241,7 +241,7 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="EWs-NC-Quf">
-                                        <rect key="frame" x="0.0" y="51.000000000000021" width="309.33333333333331" height="81.333333333333314"/>
+                                        <rect key="frame" x="0.0" y="51.000000000000021" width="306" height="81.333333333333314"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="aSQ-RF-GnY">
                                                 <rect key="frame" x="0.0" y="15.666666666666629" width="1" height="50"/>
@@ -257,25 +257,25 @@
                                                 </constraints>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Af5-uV-uO3">
-                                                <rect key="frame" x="178.66666666666669" y="12.333333333333311" width="130.66666666666669" height="56.666666666666657"/>
+                                                <rect key="frame" x="178.66666666666666" y="12.333333333333311" width="127.33333333333334" height="56.666666666666657"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="深度还原正式考试" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ae5-lM-XfE">
-                                                        <rect key="frame" x="0.0" y="0.0" width="130.66666666666666" height="19.333333333333332"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="127.33333333333333" height="19.333333333333332"/>
                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                                         <color key="textColor" red="0.039215686270000001" green="0.1019607843" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" alignment="top" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="mrC-52-Xbs">
-                                                        <rect key="frame" x="0.0" y="23.333333333333318" width="106.33333333333333" height="33.333333333333343"/>
+                                                        <rect key="frame" x="0.0" y="23.333333333333318" width="103.33333333333333" height="33.333333333333343"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提前熟悉电脑界面" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oxd-El-kfD">
-                                                                <rect key="frame" x="0.0" y="0.0" width="106.33333333333333" height="15.666666666666666"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="103.33333333333333" height="15.666666666666666"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                 <color key="textColor" red="0.54117647059999996" green="0.56470588239999997" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="深度还原考试规则" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BGv-RA-H0g">
-                                                                <rect key="frame" x="0.0" y="17.666666666666686" width="106.33333333333333" height="15.666666666666664"/>
+                                                                <rect key="frame" x="0.0" y="17.666666666666686" width="103.33333333333333" height="15.666666666666664"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                 <color key="textColor" red="0.54117647059999996" green="0.56470588239999997" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
@@ -327,7 +327,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Kmd-IX-GFr">
-                                <rect key="frame" x="0.0" y="301" width="288" height="150.66666666666663"/>
+                                <rect key="frame" x="0.0" y="301" width="285.33333333333331" height="150.66666666666663"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0PL-Wi-pqX">
                                         <rect key="frame" x="0.0" y="0.0" width="240" height="1"/>
@@ -337,7 +337,7 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalCentering" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="p0a-03-AI2">
-                                        <rect key="frame" x="0.0" y="9" width="238.33333333333334" height="25"/>
+                                        <rect key="frame" x="0.0" y="9" width="235.66666666666666" height="25"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="第三步" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="unV-N8-gPW">
                                                 <rect key="frame" x="0.0" y="0.0" width="69" height="25"/>
@@ -350,13 +350,13 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="冲刺考前卷" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2NI-vs-WFC">
-                                                <rect key="frame" x="77" y="0.0" width="92" height="25"/>
+                                                <rect key="frame" x="77" y="0.0" width="89.333333333333314" height="25"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.1019607843" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="提分快 1" translatesAutoresizingMaskIntoConstraints="NO" id="BbC-fW-szt">
-                                                <rect key="frame" x="184.66666666666666" y="3.6666666666666856" width="53.666666666666657" height="18"/>
+                                                <rect key="frame" x="182" y="3.6666666666666856" width="53.666666666666657" height="18"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="BbC-fW-szt" secondAttribute="height" multiplier="53.35:18" id="fKA-kd-2or"/>
                                                 </constraints>
@@ -375,7 +375,7 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="lsd-Ka-h6A">
-                                        <rect key="frame" x="0.0" y="51.000000000000007" width="288" height="90.666666666666686"/>
+                                        <rect key="frame" x="0.0" y="51.000000000000007" width="285.33333333333331" height="90.666666666666686"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="nAe-aI-nx4">
                                                 <rect key="frame" x="0.0" y="20.333333333333314" width="1" height="50"/>
@@ -391,25 +391,25 @@
                                                 </constraints>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="4yh-xF-zcg">
-                                                <rect key="frame" x="195" y="16.999999999999996" width="93" height="56.666666666666657"/>
+                                                <rect key="frame" x="195" y="16.999999999999996" width="90.333333333333314" height="56.666666666666657"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="冲刺考前卷" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bl9-Te-cX4">
-                                                        <rect key="frame" x="0.0" y="0.0" width="81.666666666666671" height="19.333333333333332"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="79.666666666666671" height="19.333333333333332"/>
                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                                         <color key="textColor" red="0.039215686270000001" green="0.1019607843" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" alignment="top" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="t5H-Es-IVm">
-                                                        <rect key="frame" x="0.0" y="23.333333333333318" width="93" height="33.333333333333343"/>
+                                                        <rect key="frame" x="0.0" y="23.333333333333318" width="90.333333333333329" height="33.333333333333343"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="直击考点" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nBh-cy-iZC">
-                                                                <rect key="frame" x="0.0" y="0.0" width="53.333333333333336" height="15.666666666666666"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="51.666666666666664" height="15.666666666666666"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                 <color key="textColor" red="0.54117647059999996" green="0.56470588239999997" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考前心里更有底" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="60V-TO-tEc">
-                                                                <rect key="frame" x="0.0" y="17.666666666666686" width="93" height="15.666666666666664"/>
+                                                                <rect key="frame" x="0.0" y="17.666666666666686" width="90.333333333333329" height="15.666666666666664"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                 <color key="textColor" red="0.54117647059999996" green="0.56470588239999997" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <nil key="highlightedColor"/>
@@ -460,6 +460,8 @@
             <connections>
                 <outlet property="bgImageView" destination="Z3F-QU-yqf" id="Huh-Ig-LQO"/>
                 <outlet property="headerBgImageView" destination="jFV-uc-BUT" id="LFg-Ga-yf7"/>
+                <outlet property="jx_titlelabel" destination="Pcl-0f-nR1" id="TWf-yL-Fgf"/>
+                <outlet property="jxbj_imageview" destination="bgR-BE-x42" id="VzE-DV-R1j"/>
                 <outlet property="mySubTitleLabel" destination="URd-hP-neO" id="1Ln-0E-a2J"/>
                 <outlet property="myTitleLabel" destination="2OU-7F-ZNM" id="TR2-3T-pdw"/>
                 <outlet property="oneStepLabel" destination="erj-UW-YyF" id="uDE-ex-jnw"/>

jiaPei/Modules/OtherModules/VIPModule/ViewModel/itemViewModel/会员权益/RQVipAuthorityNewItemViewModel.m

@@ -23,39 +23,39 @@
         CGFloat RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (145.f / 375.f) + 10;
         if ([chooseTypeModel.dictLabel containsString:@"科一专项VIP"]) {
             self.bgImageName = @"权益背景左";
-            self.authorityTitle = @"尊享科一所有付费权益";
+            self.authorityTitle = @"尊享科一专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (163.f / 363.f) + 10;
         } else if ([chooseTypeModel.dictLabel containsString:@"科二专项VIP"]) {
             self.bgImageName = @"权益背景左";
-            self.authorityTitle = @"尊享科二所有付费权益";
+            self.authorityTitle = @"尊享科二专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (163.f / 363.f) + 10;
         } else if ([chooseTypeModel.dictLabel containsString:@"科三专项VIP"]) {
             self.bgImageName = @"权益背景左大";
-            self.authorityTitle = @"尊享科三所有付费权益";
+            self.authorityTitle = @"尊享科三专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (163.f / 363.f) + 10;
         } else if ([chooseTypeModel.dictLabel containsString:@"科四专项VIP"]) {
             self.bgImageName = @"权益背景中";
-            self.authorityTitle = @"尊享科四所有付费权益";
+            self.authorityTitle = @"尊享科四专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (163.f / 363.f) + 10;
         } else if ([chooseTypeModel.dictLabel containsString:@"科一+科四VIP"]) {
             self.bgImageName = @"权益背景中";
-            self.authorityTitle = @"尊享科一科四所有付费权益";
+            self.authorityTitle = @"尊享科一科四专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (163.f / 363.f) + 10;
         } else if ([chooseTypeModel.dictLabel containsString:@"科二+科三VIP"]) {
             self.bgImageName = @"权益背景中";
-            self.authorityTitle = @"尊享科二科三所有付费权益";
+            self.authorityTitle = @"尊享科二科三专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (163.f / 363.f) + 10;
         } else if ([chooseTypeModel.dictLabel containsString:@"科三+科四VIP"]) {
             self.bgImageName = @"权益背景右大";
-            self.authorityTitle = @"尊享科三科四所有付费权益";
+            self.authorityTitle = @"尊享科三科四专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (340.f / 363.f) + 10;
         } else if ([chooseTypeModel.dictLabel containsString:@"科二+科三+科四"]) {
             self.bgImageName = @"权益背景右宽";
-            self.authorityTitle = @"尊享科二科三科四所有付费权益";
+            self.authorityTitle = @"尊享科二科三科四专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (340.f / 363.f) + 10;
         } else {
             self.bgImageName = @"权益背景右";
-            self.authorityTitle = @"尊享科目一二三四所有付费权益";
+            self.authorityTitle = @"尊享科目一二三四专项权益";
             RQVipAuthorityCellHeight = RQVipAuthorityCellWidth * (149.f / 363.f) + 10;
         }
         self.itemSize = CGSizeMake(RQVipAuthorityCellWidth, RQVipAuthorityCellHeight);

jiaPei/Modules/OtherModules/VideoModule/RQVideoModule.m

@@ -402,6 +402,9 @@ static id rq_VideoModule = nil;
 //        @weakify(self)
         WeakSelf(weakSelf)
         [_controlView.portraitControlView.backBtn setTapActionWithBlock:^(UITapGestureRecognizer *tap) {
+            if(weakSelf.livideoDetailViewController.tagTyp>0){//tbar 中的视频不用关闭
+                return;
+            }
             [RQNotificationCenter removeObserver:weakSelf.videoDetailViewController name:RQPlayVideoUrlNotification object:nil];
             [RQNotificationCenter removeObserver:weakSelf.failSpecialDetailViewController name:RQPlayVideoUrlNotification object:nil];
             [RQNotificationCenter removeObserver:weakSelf.livideoDetailViewController name:RQPlayVideoUrlNotification object:nil];

jiaPei/Modules/OtherModules/XLIModule/Controller/NYLIVideoDetailViewController.h

@@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NYLIVideoDetailViewController : RQCommonViewController
 
+@property (nonatomic,assign) int tagTyp;
+
 @end
 
 NS_ASSUME_NONNULL_END

jiaPei/Modules/OtherModules/XLIModule/Controller/NYLIVideoDetailViewController.m

@@ -10,7 +10,7 @@
 
 @interface NYLIVideoDetailViewController () <JXCategoryViewDelegate, JXPagerViewDelegate, JXPagerMainTableViewGestureDelegate>
 /// viewModel
-@property (nonatomic, readonly, strong) NYLIVideoDetailViewModel *viewModel;
+@property (nonatomic, readwrite, strong) NYLIVideoDetailViewModel *viewModel;
 @property (nonatomic, readwrite, strong) JXPagerView *pagerView;
 @property (nonatomic, readwrite, strong) JXCategoryTitleBackgroundView *categoryView;
 
@@ -80,8 +80,8 @@
 #pragma mark - PrivateMethods
 /// 初始化
 - (void)rq_setup {
-
-    
+    /// 播放
+    WeakSelf(weakSelf)
     if (!RQObjectIsNil(self.viewModel.placeVideoListModel)) {
         self.titles = @[@""];
         [self.pagerView setDefaultSelectedIndex:0];
@@ -89,10 +89,40 @@
         [self.categoryView reloadData];
         /// set up ...
         [self.view addSubview:self.pagerView];
+        RAC(self.lvheaderView.title_label, text) = [[RACObserve(self.viewModel.placeVideoListModel,examName) deliverOnMainThread] takeUntil:self.rac_willDeallocSignal];
+    }else{
+        self.lvheaderView.back_btn.hidden = YES;
+        RQHomePageSubjectType subType = RQHomePageSubjectType_SubjectOne_LI;
+        NSString *ftv = @"1";
+        NSString *examName = @"科一专项精品课";
+        [MBProgressHUD rq_showProgressHUD:@""];
+        [[RQ_HTTP_Service getFiveTeachingList:ftv] subscribeNext:^(NSArray *fiveModels) {
+            [MBProgressHUD rq_hideHUD];
+            RQPlaceVideoListModel *placeVideoListModel = [[RQPlaceVideoListModel alloc] init];
+            placeVideoListModel.examName = examName;
+            placeVideoListModel.items = fiveModels;
+            NSIndexPath *indexPath = [NSIndexPath indexPathWithIndex:0];
+            NYLIVideoDetailViewModel *videoDetailViewModel = [[NYLIVideoDetailViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+                        RQViewModelUtilKey      : placeVideoListModel,
+                        RQVideoItemIndexKey        : @(0),
+                        RQVideoItemIndexPathKey    : indexPath,
+                        RQHomePageSubjectTypeKey    : @(subType),
+                    }];
+            weakSelf.viewModel = videoDetailViewModel;
+            weakSelf.titles = @[@""];
+            [weakSelf.pagerView setDefaultSelectedIndex:0];
+            [weakSelf.categoryView setDefaultSelectedIndex:0];
+            [weakSelf.categoryView reloadData];
+            /// set up ...
+            [weakSelf.view addSubview:weakSelf.pagerView];
+            RAC(weakSelf.lvheaderView.title_label, text) = [[RACObserve(weakSelf.viewModel.placeVideoListModel,examName) deliverOnMainThread] takeUntil:weakSelf.rac_willDeallocSignal];
+        } error:^(NSError * _Nullable error) {
+            [MBProgressHUD rq_hideHUD];
+            [MBProgressHUD rq_showErrorTips:error];
+        }];
     }
     [RQNotificationCenter removeObserver:self name:RQPlayVideoUrlNotification object:nil];
-    /// 播放
-    WeakSelf(weakSelf)
+
     [RQ_Video_Module.playerController stop];
     RQ_Video_Module.livideoDetailViewController = self;
 
@@ -102,7 +132,7 @@
     
 //    RQPlaceVideoListModel
     
-    RAC(self.lvheaderView.title_label, text) = [[RACObserve(self.viewModel.placeVideoListModel,examName) deliverOnMainThread] takeUntil:self.rac_willDeallocSignal];
+
     [self.lvheaderView.back_btn addTarget:self action:@selector(backActiondo:) forControlEvents:UIControlEventTouchUpInside];
 }
 

jiaPei/Modules/OtherModules/XLIModule/NYXLIModule.h

@@ -27,7 +27,7 @@
 #import "NYLIVideoDetailSubGroupViewModel.h"
 #import "NYLIVideoDetailSubFooterViewModel.h"
 #import "NYLIHomePageSimulationExamItemViewModel.h"
-
+#import "NYLIHomePageVideoExamItemViewModel.h"
 
 #pragma mark - View
 #import "NYLIVipHeaderImageViewNewReusableView.h"
@@ -40,6 +40,7 @@
 #import "NYLIVideoDetailSubPageCell.h"
 #import "NYLIVideoDetailSubFooterCell.h"
 #import "NYLIHomePageSimulationExamCell.h"
+#import "NYLIHomePageVideoExamCell.h"
 
 #pragma mark - ViewController
 #import "NYLIVipCoachViewController.h"

jiaPei/Modules/OtherModules/XLIModule/View/NYLIHomePageVideoExamCell.h

@@ -0,0 +1,17 @@
+//
+//  NYLIHomePageVideoExamCell.h
+//  jiaPei
+//
+//  Created by Ning.ge on 2025/2/27.
+//  Copyright © 2025 JCZ. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NYLIHomePageVideoExamCell : RQCommonCollectionViewCell
+
+@end
+
+NS_ASSUME_NONNULL_END

jiaPei/Modules/OtherModules/XLIModule/View/NYLIHomePageVideoExamCell.m

@@ -0,0 +1,51 @@
+//
+//  NYLIHomePageVideoExamCell.m
+//  jiaPei
+//
+//  Created by Ning.ge on 2025/2/27.
+//  Copyright © 2025 JCZ. All rights reserved.
+//
+
+#import "NYLIHomePageVideoExamCell.h"
+
+@interface NYLIHomePageVideoExamCell ()
+
+@property (nonatomic, readwrite, strong) NYLIHomePageVideoExamItemViewModel *viewModel;
+
+@property (weak, nonatomic) IBOutlet UIButton *tryBtn;
+
+@property (weak, nonatomic) IBOutlet UILabel *title_label01;
+
+@property (weak, nonatomic) IBOutlet UILabel *title_label02;
+
+@end
+
+@implementation NYLIHomePageVideoExamCell
+
+#pragma mark - PublicMethods
++ (instancetype)cellWithCollectionView:(UICollectionView *)collectionView forIndexPath:(NSIndexPath *)indexPath {
+    static NSString *ID = @"NYLIHomePageVideoExamCell";
+    [collectionView registerNib:[UINib nibWithNibName:ID bundle:nil] forCellWithReuseIdentifier:ID];
+    NYLIHomePageVideoExamCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:ID forIndexPath:indexPath];
+    if (!cell) cell = [self rq_viewFromXib];
+    [cell.tryBtn setBackgroundImage:[UIImage imageWithGradualChangingColor:^(QQGradualChangingColor *graColor) {
+        graColor.fromColor = [UIColor qmui_colorWithHexString:@"#FF4D53"];
+        graColor.toColor = [UIColor qmui_colorWithHexString:@"#FF776D"];
+        graColor.type = QQGradualChangeTypeLeftToRight;
+    } size:cell.tryBtn.size cornerRadius:QQRadiusMakeSame(RQ_FIT_HORIZONTAL(30.f) / 2.f)] forState:UIControlStateNormal];
+    cell.tryBtn.layer.shadowColor = [UIColor qmui_colorWithHexString:@"#FF4D53"].CGColor;
+    return cell;
+}
+
+- (void)bindViewModel:(NYLIHomePageVideoExamItemViewModel *)viewModel {
+    _viewModel = viewModel;
+    _title_label01.text = (self.viewModel.homePageSubjectType == RQHomePageSubjectType_SubjectOne)? @"科一精选500" : @"科四精选300";
+}
+
+#pragma mark - SystemMethods
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+@end

jiaPei/Modules/OtherModules/XLIModule/View/NYLIHomePageVideoExamCell.xib

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="t7M-GW-xFi" customClass="NYLIHomePageVideoExamCell">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="188"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="188"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uG0-7V-fTp">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="188"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="小李精选" translatesAutoresizingMaskIntoConstraints="NO" id="D28-2G-oId">
+                                <rect key="frame" x="15" y="56" width="172" height="102"/>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="科一精选500 " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JLE-aW-e85">
+                                <rect key="frame" x="15" y="20" width="110" height="21"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="110" id="2US-Ka-R98"/>
+                                    <constraint firstAttribute="height" constant="21" id="OmC-kz-hJQ"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                <color key="textColor" red="0.039215686274509803" green="0.10196078431372549" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="车管所真题实战 7天通过率98%" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D9h-JA-8z6">
+                                <rect key="frame" x="133" y="22" width="250" height="18"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="18" id="F8f-5I-dfK"/>
+                                    <constraint firstAttribute="width" constant="250" id="b1D-q0-91J"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <color key="textColor" red="0.36078431372549019" green="0.37647058823529411" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="li_讲考点" translatesAutoresizingMaskIntoConstraints="NO" id="58U-6e-ibR">
+                                <rect key="frame" x="207" y="60" width="16" height="16"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="16" id="1yH-vA-0Zb"/>
+                                    <constraint firstAttribute="height" constant="16" id="4d1-if-ZIK"/>
+                                </constraints>
+                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="li_解新规" translatesAutoresizingMaskIntoConstraints="NO" id="eao-uQ-uua">
+                                <rect key="frame" x="208" y="85" width="16" height="16"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="16" id="FYu-ad-c85"/>
+                                    <constraint firstAttribute="height" constant="16" id="cZ4-O8-9hU"/>
+                                </constraints>
+                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="li_破难点" translatesAutoresizingMaskIntoConstraints="NO" id="b0M-du-cGC">
+                                <rect key="frame" x="287" y="84" width="16" height="16"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="16" id="XHg-vd-FAL"/>
+                                    <constraint firstAttribute="width" constant="16" id="rYm-zj-Gdz"/>
+                                </constraints>
+                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="li_学技巧" translatesAutoresizingMaskIntoConstraints="NO" id="tyS-OG-oIe">
+                                <rect key="frame" x="287" y="60" width="16" height="16"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="16" id="Lin-88-Uj5"/>
+                                    <constraint firstAttribute="height" constant="16" id="pOK-vV-ic8"/>
+                                </constraints>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="讲考点" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ABB-dK-knt">
+                                <rect key="frame" x="227" y="60" width="50" height="17"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="50" id="Ulq-bg-HFN"/>
+                                    <constraint firstAttribute="height" constant="17" id="aFq-d8-Zbe"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.56862745098039214" green="0.32941176470588235" blue="0.058823529411764705" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="学技巧" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="osY-eQ-25i">
+                                <rect key="frame" x="307" y="60" width="50" height="16"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="16" id="RZ9-5X-fmf"/>
+                                    <constraint firstAttribute="width" constant="50" id="bTV-c5-tl7"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="解新规" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Va-Gz-r7x">
+                                <rect key="frame" x="228" y="84" width="50" height="17"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="17" id="4AW-9C-hy1"/>
+                                    <constraint firstAttribute="width" constant="50" id="4yr-KH-XBL"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="破难点" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o5d-JM-UXW">
+                                <rect key="frame" x="307" y="84" width="50" height="16"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="50" id="O69-5s-Dg4"/>
+                                    <constraint firstAttribute="height" constant="16" id="VAP-Af-VsE"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.56862745100000001" green="0.3294117647" blue="0.058823529409999999" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aZ7-d9-7pg">
+                                <rect key="frame" x="187" y="69" width="1" height="50"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="1" id="6uU-bj-8VS"/>
+                                    <constraint firstAttribute="height" constant="50" id="OY7-Ti-f86"/>
+                                </constraints>
+                            </view>
+                            <button opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VTF-xD-Dfv">
+                                <rect key="frame" x="228" y="116" width="100" height="30"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="IQN-U8-U3l"/>
+                                    <constraint firstAttribute="width" constant="100" id="i9d-6I-ktQ"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                <state key="normal" title="进入学习"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius">
+                                        <integer key="value" value="3"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity">
+                                        <integer key="value" value="1"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset">
+                                        <size key="value" width="0.0" height="1"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="NO"/>
+                                </userDefinedRuntimeAttributes>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstItem="58U-6e-ibR" firstAttribute="top" secondItem="D9h-JA-8z6" secondAttribute="bottom" constant="20" id="6m9-Dd-dpc"/>
+                            <constraint firstItem="osY-eQ-25i" firstAttribute="leading" secondItem="tyS-OG-oIe" secondAttribute="trailing" constant="4" id="8fn-dP-kjT"/>
+                            <constraint firstItem="osY-eQ-25i" firstAttribute="top" secondItem="uG0-7V-fTp" secondAttribute="top" constant="60" id="Ae4-cp-Pb3"/>
+                            <constraint firstItem="b0M-du-cGC" firstAttribute="top" secondItem="tyS-OG-oIe" secondAttribute="bottom" constant="8" symbolic="YES" id="B7a-Kz-Vx8"/>
+                            <constraint firstItem="b0M-du-cGC" firstAttribute="leading" secondItem="3Va-Gz-r7x" secondAttribute="trailing" constant="9" id="BCi-Cb-iE0"/>
+                            <constraint firstItem="D9h-JA-8z6" firstAttribute="top" secondItem="uG0-7V-fTp" secondAttribute="top" constant="22" id="CFR-TP-bSh"/>
+                            <constraint firstItem="aZ7-d9-7pg" firstAttribute="leading" secondItem="D28-2G-oId" secondAttribute="trailing" id="Gfb-4f-xDB"/>
+                            <constraint firstItem="aZ7-d9-7pg" firstAttribute="centerX" secondItem="uG0-7V-fTp" secondAttribute="centerX" id="Kl2-KA-AHG"/>
+                            <constraint firstItem="VTF-xD-Dfv" firstAttribute="top" secondItem="b0M-du-cGC" secondAttribute="bottom" constant="16" id="PYJ-E9-LLM"/>
+                            <constraint firstItem="ABB-dK-knt" firstAttribute="leading" secondItem="58U-6e-ibR" secondAttribute="trailing" constant="4" id="Q29-Kl-iqI"/>
+                            <constraint firstItem="3Va-Gz-r7x" firstAttribute="top" secondItem="ABB-dK-knt" secondAttribute="bottom" constant="7" id="Qhi-WU-1eT"/>
+                            <constraint firstItem="aZ7-d9-7pg" firstAttribute="centerY" secondItem="uG0-7V-fTp" secondAttribute="centerY" id="XJM-8d-Hr9"/>
+                            <constraint firstItem="D9h-JA-8z6" firstAttribute="leading" secondItem="JLE-aW-e85" secondAttribute="trailing" constant="8" symbolic="YES" id="awe-dE-MJ6"/>
+                            <constraint firstItem="ABB-dK-knt" firstAttribute="top" secondItem="D9h-JA-8z6" secondAttribute="bottom" constant="20" id="cVw-LQ-3Lt"/>
+                            <constraint firstItem="o5d-JM-UXW" firstAttribute="leading" secondItem="b0M-du-cGC" secondAttribute="trailing" constant="4" id="dcC-SD-XUg"/>
+                            <constraint firstItem="tyS-OG-oIe" firstAttribute="top" secondItem="uG0-7V-fTp" secondAttribute="top" constant="60" id="ezk-sB-esZ"/>
+                            <constraint firstItem="VTF-xD-Dfv" firstAttribute="leading" secondItem="D28-2G-oId" secondAttribute="trailing" constant="41" id="gCT-zQ-xNk"/>
+                            <constraint firstItem="JLE-aW-e85" firstAttribute="top" secondItem="uG0-7V-fTp" secondAttribute="top" constant="20" id="ifG-uQ-8ld"/>
+                            <constraint firstItem="eao-uQ-uua" firstAttribute="top" secondItem="58U-6e-ibR" secondAttribute="bottom" constant="9" id="ljJ-oN-pdF"/>
+                            <constraint firstItem="D28-2G-oId" firstAttribute="top" secondItem="JLE-aW-e85" secondAttribute="bottom" constant="15" id="mvm-KB-ZyY"/>
+                            <constraint firstItem="JLE-aW-e85" firstAttribute="leading" secondItem="uG0-7V-fTp" secondAttribute="leading" constant="15" id="ps9-IL-NAS"/>
+                            <constraint firstItem="D28-2G-oId" firstAttribute="leading" secondItem="uG0-7V-fTp" secondAttribute="leading" constant="15" id="qZH-O1-d3u"/>
+                            <constraint firstItem="o5d-JM-UXW" firstAttribute="top" secondItem="osY-eQ-25i" secondAttribute="bottom" constant="8" symbolic="YES" id="qnq-US-lLU"/>
+                            <constraint firstItem="58U-6e-ibR" firstAttribute="leading" secondItem="D28-2G-oId" secondAttribute="trailing" constant="20" id="sHd-ld-9oP"/>
+                            <constraint firstItem="tyS-OG-oIe" firstAttribute="leading" secondItem="ABB-dK-knt" secondAttribute="trailing" constant="10" id="tdm-8c-AeI"/>
+                            <constraint firstItem="3Va-Gz-r7x" firstAttribute="leading" secondItem="eao-uQ-uua" secondAttribute="trailing" constant="4" id="to8-mt-am0"/>
+                            <constraint firstItem="eao-uQ-uua" firstAttribute="leading" secondItem="aZ7-d9-7pg" secondAttribute="trailing" constant="20" id="w2R-aw-P4n"/>
+                            <constraint firstAttribute="bottom" secondItem="D28-2G-oId" secondAttribute="bottom" constant="30" id="zKC-8k-Ntq"/>
+                        </constraints>
+                    </view>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="uG0-7V-fTp" secondAttribute="trailing" id="Gf7-hD-A9j"/>
+                <constraint firstItem="uG0-7V-fTp" firstAttribute="top" secondItem="t7M-GW-xFi" secondAttribute="top" id="Myx-fj-Rfy"/>
+                <constraint firstAttribute="bottom" secondItem="uG0-7V-fTp" secondAttribute="bottom" id="eTk-yN-fGQ"/>
+                <constraint firstItem="uG0-7V-fTp" firstAttribute="leading" secondItem="t7M-GW-xFi" secondAttribute="leading" id="xub-ku-48k"/>
+            </constraints>
+            <connections>
+                <outlet property="title_label01" destination="JLE-aW-e85" id="fJL-0V-XXe"/>
+                <outlet property="tryBtn" destination="VTF-xD-Dfv" id="iya-rz-wV1"/>
+            </connections>
+            <point key="canvasLocation" x="135.1145038167939" y="121.83098591549296"/>
+        </collectionViewCell>
+    </objects>
+    <resources>
+        <image name="li_学技巧" width="16" height="16"/>
+        <image name="li_破难点" width="16" height="16"/>
+        <image name="li_解新规" width="16" height="16"/>
+        <image name="li_讲考点" width="16" height="16"/>
+        <image name="小李精选" width="173" height="98"/>
+    </resources>
+</document>

jiaPei/Modules/OtherModules/XLIModule/ViewModel/NYLIHomePageSimulationExamItemViewModel.m

@@ -83,11 +83,21 @@
                         RQ_VIP_Module.freeLookSimExamNum = 0;
                     } else {
                         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];
-                            }];
+                            // 修改后的弹窗调用逻辑
+                            NSString *ukey = [NSString stringWithFormat:@"%@%d",RQ_USER_MANAGER.currentUser.loginCode,RQ_YDTQuestion_Module.subjectStr.intValue];
+                            if (![NYTools hasUserWatchedAdToday:ukey]) {
+                                [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];
+                                    [NYTools saveUWatchedAdToday:ukey];
+                                }];
+                            }else{
+                                //显示真实考场
+                                NYExaminationViewModel *examinationViewModel = [[NYExaminationViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{}];
+                                examinationViewModel.km = RQ_YDTQuestion_Module.subjectStr.intValue;
+                                [RQ_APPDELEGATE.services pushViewModel:examinationViewModel animated:YES];
+                            }
                         }
                     }
                 }

jiaPei/Modules/OtherModules/XLIModule/ViewModel/NYLIHomePageVideoExamItemViewModel.h

@@ -0,0 +1,22 @@
+//
+//  NYLIHomePageVideoExamItemViewModel.h
+//  jiaPei
+//
+//  Created by Ning.ge on 2025/2/27.
+//  Copyright © 2025 JCZ. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NYLIHomePageVideoExamItemViewModel : RQCommonCollectionItemViewModel
+@property (nonatomic, readonly, assign) RQHomePageCarType homePageCarType;
+@property (nonatomic, readonly, assign) RQHomePageSubjectType homePageSubjectType;
+
+
+/// init
+- (instancetype)initWithRQHomePageCarType:(RQHomePageCarType)homePageCarType homePageSubjectType:(RQHomePageSubjectType)homePageSubjectType;
+@end
+
+NS_ASSUME_NONNULL_END

jiaPei/Modules/OtherModules/XLIModule/ViewModel/NYLIHomePageVideoExamItemViewModel.m

@@ -0,0 +1,61 @@
+//
+//  NYLIHomePageVideoExamItemViewModel.m
+//  jiaPei
+//
+//  Created by Ning.ge on 2025/2/27.
+//  Copyright © 2025 JCZ. All rights reserved.
+//
+
+#import "NYLIHomePageVideoExamItemViewModel.h"
+
+@interface NYLIHomePageVideoExamItemViewModel ()
+@property (nonatomic, readwrite, assign) RQHomePageCarType homePageCarType;
+@property (nonatomic, readwrite, assign) RQHomePageSubjectType homePageSubjectType;
+@end
+
+@implementation NYLIHomePageVideoExamItemViewModel
+/// init
+- (instancetype)initWithRQHomePageCarType:(RQHomePageCarType)homePageCarType homePageSubjectType:(RQHomePageSubjectType)homePageSubjectType {
+    if (self = [super init]) {
+        @weakify(self)
+        self.homePageCarType = homePageCarType;
+        self.homePageSubjectType = homePageSubjectType;
+        self.itemSize = CGSizeMake(RQ_SCREEN_WIDTH, RQ_FIT_HORIZONTAL(188.f));
+        self.operation = ^{
+            RQHomePageSubjectType subType = RQHomePageSubjectType_SubjectOne_LI;
+            NSString *ftv = @"1";
+            NSString *examName = @"科一专项精品课";
+            if(homePageSubjectType == RQHomePageSubjectType_SubjectFour){
+                ftv = @"4";
+                examName = @"科四专项精品课";
+                subType = RQHomePageSubjectType_SubjectFour_LI;
+            }
+            [MBProgressHUD rq_showProgressHUD:@""];
+            [[RQ_HTTP_Service getFiveTeachingList:ftv] subscribeNext:^(NSArray *fiveModels) {
+                [MBProgressHUD rq_hideHUD];
+                @strongify(self)
+                RQPlaceVideoListModel *placeVideoListModel = [[RQPlaceVideoListModel alloc] init];
+                placeVideoListModel.examName = examName;
+                placeVideoListModel.items = fiveModels;
+                NSIndexPath *indexPath = [NSIndexPath indexPathWithIndex:0];
+                NYLIVideoDetailViewModel *videoDetailViewModel = [[NYLIVideoDetailViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+                            RQViewModelUtilKey      : placeVideoListModel,
+                            RQVideoItemIndexKey        : @(0),
+                            RQVideoItemIndexPathKey    : indexPath,
+                            RQHomePageSubjectTypeKey    : @(subType),
+                        }];
+                [RQ_APPDELEGATE.services pushViewModel:videoDetailViewModel animated:YES];
+            } error:^(NSError * _Nullable error) {
+                [MBProgressHUD rq_hideHUD];
+                [MBProgressHUD rq_showErrorTips:error];
+            }];
+        };
+    }
+    return self;
+}
+
+- (NSString *)itemClassName {
+    return @"NYLIHomePageVideoExamCell";
+}
+
+@end

jiaPei/OLD/Util/Tools/NYTools.h

@@ -35,6 +35,10 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)encryptAES:(NSString *)plainText;
 // AES解密方法
 + (NSString *)decryptAES:(id)cipherText;
+// 用户广告-判断
++ (BOOL)hasUserWatchedAdToday:(NSString*)keynum;
+// 用户广告-保存
++ (void)saveUWatchedAdToday:(NSString*)keynum;
 
 @end
 

jiaPei/OLD/Util/Tools/NYTools.m

@@ -38,7 +38,7 @@
     [value addObject:exer_dic];
     //根据key写入缓存value
     [yyCache setObject:value forKey:NYCocheNameKey withBlock:^{
-      NSLog(@"setObject sucess");
+        NSLog(@"setObject sucess");
     }];
     
 }
@@ -60,11 +60,11 @@
     YYCache  *yyCache = [YYCache cacheWithName:NYCocheName];
     NSString *NYCocheNameKey = [NSString stringWithFormat:@"NYExerciseKey_%zd_%zd_%zd",carType,subject,exerciseType];
     [yyCache removeObjectForKey:NYCocheNameKey];
-//    NSMutableArray *value = [NSMutableArray arrayWithArray:@[]];
-//    //根据key写入缓存value
-//    [yyCache setObject:value forKey:NYCocheNameKey withBlock:^{
-//      NSLog(@"setObject sucess");
-//    }];
+    //    NSMutableArray *value = [NSMutableArray arrayWithArray:@[]];
+    //    //根据key写入缓存value
+    //    [yyCache setObject:value forKey:NYCocheNameKey withBlock:^{
+    //      NSLog(@"setObject sucess");
+    //    }];
 }
 //删除-题目
 +(void)delateUserKey:(NSString*)userKey {
@@ -79,7 +79,7 @@
     YYCache  *yyCache = [YYCache cacheWithName:@"NYClassRoomID"];
     //根据key写入缓存value
     [yyCache setObject:classIdStr forKey:NYClassRoomID withBlock:^{
-      NSLog(@"setObject sucess");
+        NSLog(@"setObject sucess");
     }];
 }
 //读取课堂ID
@@ -114,4 +114,19 @@
     return decryptedText;
 }
 
+
++ (BOOL)hasUserWatchedAdToday:(NSString*)keynum {
+    NSString *kUserLastWatchAdDateKey = [NSString stringWithFormat:@"UserLastWatchAdDateKey%@",keynum];
+    NSDate *lastDate = [[NSUserDefaults standardUserDefaults] objectForKey:kUserLastWatchAdDateKey];
+    if (!lastDate) return NO;
+    
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    return [calendar isDateInToday:lastDate];
+}
+
++ (void)saveUWatchedAdToday:(NSString*)keynum {
+    NSString *kUserLastWatchAdDateKey = [NSString stringWithFormat:@"UserLastWatchAdDateKey%@",keynum];
+    // 记录广告观看时间（建议在广告播放成功的回调中执行）
+    [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:kUserLastWatchAdDateKey];
+}
 @end