ios 2.2.9 版本

jiaPei.xcodeproj/project.pbxproj

@@ -12230,7 +12230,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2292024112102;
+				CURRENT_PROJECT_VERSION = 2292025012203;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -12268,7 +12268,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.2.8;
+				MARKETING_VERSION = 2.2.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -12313,7 +12313,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2292024112102;
+				CURRENT_PROJECT_VERSION = 2292025012203;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -12351,7 +12351,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.2.8;
+				MARKETING_VERSION = 2.2.9;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/Images.xcassets/Modules/HomePageModule/精选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

@@ -126,20 +126,18 @@
 
 //VIP课程
 - (IBAction)btnVipAction:(UIButton *)sender {
-    if (RQ_USER_MANAGER.isShouldLogin) {
-        [RQ_VIP_Module isVipWithSubject:0 complete:^(BOOL isVip) {
-            if (RQ_VIP_Module.isVip) {
-                [RQ_VIP_Module gotoVipCenter];
-            } else {
-                [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
-            }
-        }];
-    }
+    [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
+        if (isVip) {
+            [RQ_VIP_Module gotoVipCenter];
+        } else {
+            [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+        }
+    }];
 }
 
 //真实考场
 - (IBAction)btnExaminationAction:(UIButton *)sender {
-    if (RQ_USER_MANAGER.isShouldLogin) {
+    
         [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
             if (isVip) {
 //                                        username subject headimg gs 替换-> model
@@ -184,7 +182,7 @@
                 }
             }
         }];
-    }
+
 }
 
 //分阶段练习
@@ -200,10 +198,10 @@
 //易错专项
 - (IBAction)btnFallibilityAction:(UIButton *)sender {
     if (RQ_USER_MANAGER.isShouldLogin) {
-        if(RQ_YDTQuestion_Module.carType != RQHomePageCarType_Car){
-            ShowMsg(@"只支持小车");
-            return;
-        }
+//        if(RQ_YDTQuestion_Module.carType != RQHomePageCarType_Car){
+//            ShowMsg(@"只支持小车");
+//            return;
+//        }
         NYFailSpecialExerciseViewModel *failSpecialExerciseViewModel = [[NYFailSpecialExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
             RQHomePageSubjectTypeKey : @(self.viewModel.homePageSubjectType),
         }];
@@ -213,7 +211,7 @@
 
 //500精选
 - (IBAction)btnWBAction:(UIButton *)sender {
-    if (RQ_USER_MANAGER.isShouldLogin) {
+    
         [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
             if (isVip) {
                 NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithSubject:RQ_YDTQuestion_Module.subject exerciseType:RQExerciseType_HandPick ].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
@@ -232,7 +230,7 @@
                 [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
             }
         }];
-    }
+    
 }
 
 //专项练习
@@ -245,7 +243,7 @@
 
 //电子资料
 - (IBAction)btnCorpuscleresAction:(UIButton *)sender {
-    NSLog(@"点击了-电子资料");
+    NSLog(@"点击了-电子资料-%@",RQ_COMMON_MANAGER.JSJP_XCX_PAGE);
     if (RQ_USER_MANAGER.isShouldLogin) {
         [RQ_SHARE_FUNCTION miniwithUserName:RQ_COMMON_MANAGER.JSJP_XCX_NAME path:RQ_COMMON_MANAGER.JSJP_XCX_PAGE];
     }

jiaPei/Modules/HomePageModule/View/HomeSubPage/易错专项/NYFailSpecialExerciseDetailsCell.m

@@ -57,19 +57,40 @@
 }
 
 - (IBAction)submit_clickdo:(UIButton *)sender {
-    NSString *questionIds = self.viewModel.dataModel.questionIds;
-    NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithExerciseType:RQExerciseType_Error_Special_List questionIds:questionIds].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
-        return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
-    }].toArray;
-    RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
-        RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
-        RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
-        RQHomeSubPageTypeKey        : @(RQHomeSubPageType_SequentialPractice),
-        RQViewModelIDKey            : @"标题",
-        RQExerciseTypeKey           : @(RQExerciseType_Error_Special_List),
-        RQViewModelUtilKey          : arr,
-    }];
-    [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
+    if([@"考点1" isEqualToString:self.viewModel.itemPointTitle]){
+        NSString *questionIds = self.viewModel.dataModel.questionIds;
+        NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithExerciseType:RQExerciseType_Error_Special_List questionIds:questionIds].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
+            return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
+        }].toArray;
+        RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+            RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
+            RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
+            RQHomeSubPageTypeKey        : @(RQHomeSubPageType_SequentialPractice),
+            RQViewModelIDKey            : @"标题",
+            RQExerciseTypeKey           : @(RQExerciseType_Error_Special_List),
+            RQViewModelUtilKey          : arr,
+        }];
+        [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
+        return;
+    }
+    if (RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne) {//判断是否 科一vip
+        NSString *questionIds = self.viewModel.dataModel.questionIds;
+        NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithExerciseType:RQExerciseType_Error_Special_List questionIds:questionIds].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
+            return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
+        }].toArray;
+        RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+            RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
+            RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
+            RQHomeSubPageTypeKey        : @(RQHomeSubPageType_SequentialPractice),
+            RQViewModelIDKey            : @"标题",
+            RQExerciseTypeKey           : @(RQExerciseType_Error_Special_List),
+            RQViewModelUtilKey          : arr,
+        }];
+        [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
+    }else{
+        //充值
+        [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+    }
 
 }
 

jiaPei/Modules/HomePageModule/View/HomeSubPage/易错专项/NYFailSpecialExerciseDetailsCell01.m

@@ -278,9 +278,14 @@
                 for (int z= 0; z<textItem.quesItem.count; z++) {
                     NSString *item_str = textItem.quesItem[z];
                     UILabel *label = [self.itop_view viewWithTag:59+z+fitop_bicc];
+                    label.numberOfLines = 0;
                     label.hidden = NO;
+                    CGSize itemstr_size = [item_str rq_sizeWithFont:label.font limitWidth:cellView.content_label.width];
+                    if(itemstr_size.height>ab_H){
+                        ab_H = itemstr_size.height + 10.f;
+                    }
                     label.attributedText = [self getAttributedString:item_str color:UIColorHex(0xFF6714)];
-                    label.frame = CGRectMake(10, fitop_yOffset, RQ_SCREEN_WIDTH-22*2, ab_H);
+                    label.frame = CGRectMake(10, fitop_yOffset, RQ_SCREEN_WIDTH-22*2-10, ab_H);
                     fitop_yOffset += ab_H;
                 }
                 fitop_bicc += textItem.quesItem.count;
@@ -441,19 +446,54 @@
 
 
 - (IBAction)submit_clickdo:(UIButton *)sender {
-    NSString *questionIds = self.viewModel.dataModel.questionIds;
-    NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithExerciseType:RQExerciseType_Error_Special_List questionIds:questionIds].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
-        return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
-    }].toArray;
-    RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
-        RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
-        RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
-        RQHomeSubPageTypeKey        : @(RQHomeSubPageType_SequentialPractice),
-        RQViewModelIDKey            : @"标题",
-        RQExerciseTypeKey           : @(RQExerciseType_Error_Special_List),
-        RQViewModelUtilKey          : arr,
-    }];
-    [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
+    if([@"考点1" isEqualToString:self.viewModel.itemPointTitle]){
+        NSString *questionIds = self.viewModel.dataModel.questionIds;
+        NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithExerciseType:RQExerciseType_Error_Special_List questionIds:questionIds].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
+            return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
+        }].toArray;
+        RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+            RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
+            RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
+            RQHomeSubPageTypeKey        : @(RQHomeSubPageType_SequentialPractice),
+            RQViewModelIDKey            : @"标题",
+            RQExerciseTypeKey           : @(RQExerciseType_Error_Special_List),
+            RQViewModelUtilKey          : arr,
+        }];
+        [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
+        return;
+    }
+    if (RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne) {//判断是否 科一vip
+        NSString *questionIds = self.viewModel.dataModel.questionIds;
+        NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithExerciseType:RQExerciseType_Error_Special_List questionIds:questionIds].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
+            return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
+        }].toArray;
+        RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+            RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
+            RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
+            RQHomeSubPageTypeKey        : @(RQHomeSubPageType_SequentialPractice),
+            RQViewModelIDKey            : @"标题",
+            RQExerciseTypeKey           : @(RQExerciseType_Error_Special_List),
+            RQViewModelUtilKey          : arr,
+        }];
+        [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
+    }else{
+        //充值
+        [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+    }
+    
+//    NSString *questionIds = self.viewModel.dataModel.questionIds;
+//    NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithExerciseType:RQExerciseType_Error_Special_List questionIds:questionIds].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
+//        return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
+//    }].toArray;
+//    RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+//        RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
+//        RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
+//        RQHomeSubPageTypeKey        : @(RQHomeSubPageType_SequentialPractice),
+//        RQViewModelIDKey            : @"标题",
+//        RQExerciseTypeKey           : @(RQExerciseType_Error_Special_List),
+//        RQViewModelUtilKey          : arr,
+//    }];
+//    [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
 
 }
 

jiaPei/Modules/HomePageModule/ViewController/HomeSubPage/易错专项/NYFailSpecialExerciseDetailsViewController.m

@@ -69,12 +69,12 @@
     
     
     [RQNotificationCenter removeObserver:self name:RQPlayVideoUrlNotification object:nil];
-    /// 播放
-    WeakSelf(weakSelf)
-    [RQ_Video_Module.playerController stop];
-    [[[[RQNotificationCenter rac_addObserverForName:RQPlayVideoUrlNotification object:nil] takeUntil:self.rac_willDeallocSignal] deliverOnMainThread] subscribeNext:^(NSNotification * note) {
-        [weakSelf myVideoUrlNotification:note];
-    }];
+//    /// 播放
+//    WeakSelf(weakSelf)
+//    [RQ_Video_Module.playerController stop];
+//    [[[[RQNotificationCenter rac_addObserverForName:RQPlayVideoUrlNotification object:nil] takeUntil:self.rac_willDeallocSignal] deliverOnMainThread] subscribeNext:^(NSNotification * note) {
+//        [weakSelf myVideoUrlNotification:note];
+//    }];
 }
 
 - (void)myVideoUrlNotification:(NSNotification *)note{

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

@@ -193,7 +193,11 @@
                 groupModel.footerHeight = 16.f;
                 groupModel.footerBgColor = RQ_MAIN_BACKGROUNDCOLOR;
             }];
-            _group0.itemViewModels = self.subjectOneSectionZeroArr;
+            if(RQ_YDTQuestion_Module.carType == RQHomePageCarType_Car){//小车科目一界面
+                _group0.itemViewModels = self.subjectOneSectionZeroArr;
+            }else{
+                _group0.itemViewModels = self.subjectOneOrFourSectionZeroArr;
+            }
         }
     }
     return _group0;
@@ -203,7 +207,11 @@
     if (!_group1) {
         _group1 = [RQHomePageSectionOneGroupViewModel groupViewModel];
         if (self.homePageSubjectType == RQHomePageSubjectType_SubjectOne){
-            _group1.itemViewModels = @[];
+            if(RQ_YDTQuestion_Module.carType == RQHomePageCarType_Car){//小车科目一界面
+                _group1.itemViewModels = @[];
+            }else{
+                _group1.itemViewModels = self.subjectOneOrFourSectionOneArr;
+            }
         }else{
             _group1.itemViewModels = self.subjectOneOrFourSectionOneArr;
         }
@@ -442,9 +450,11 @@
 //        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"真实考场" iconImgStr:@"真实考场"],
 //        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"错题收藏" iconImgStr:@"错题收藏"],
 //    ] :
+     
+     
      @[
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"VIP课程" iconImgStr:(self.homePageSubjectType == RQHomePageSubjectType_SubjectOne)? @"科一VIP" : @"科四VIP"],
-        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"精选500题" iconImgStr:@"精选500题"],
+        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:((RQ_YDTQuestion_Module.carType == RQHomePageCarType_Car&&self.homePageSubjectType == RQHomePageSubjectType_SubjectFour)?@"精选300题":@"精选500题") iconImgStr:((RQ_YDTQuestion_Module.carType == RQHomePageCarType_Car&&self.homePageSubjectType == RQHomePageSubjectType_SubjectFour)?@"精选300题":@"精选500题")],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"新规秘卷" iconImgStr:@"新规秘卷"],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"专项练习" iconImgStr:@"专项练习"],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"真实考场" iconImgStr:@"真实考场"],
@@ -458,6 +468,6 @@
 }
 
 - (NSArray *)rightTitleArr {
-    return @[@"顺序练习",@"精选500题",@"专项练习",@"错题收藏"];
+    return @[@"顺序练习",((RQ_YDTQuestion_Module.carType == RQHomePageCarType_Car&&self.homePageSubjectType == RQHomePageSubjectType_SubjectFour)?@"精选300题":@"精选500题"),@"专项练习",@"错题收藏"];
 }
 @end

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

@@ -26,12 +26,14 @@
         CGFloat height = RQ_FIT_HORIZONTAL(363.f);
         self.itemSize = CGSizeMake(width, height);
         
+        NSArray *readList = [NYTools readExerciseListUserKey:RQ_USER_MANAGER.currentUser.outId carType:RQ_YDTQuestion_Module.carType subject:RQ_YDTQuestion_Module.subject exerciseType:RQ_Exercise_Module.currentExerciseType];
         NSInteger allCount = [RQ_YDTQuestion_Module getQuestionNumWithWithSubject:self.homePageSubjectType exerciseType:RQExerciseType_Sequential];
-        self.sxlxtStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld/%ld",[RQ_YDT_USER_Question_Module getDoQuestionNum],allCount]];
+        self.sxlxtStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld/%ld",readList.count,allCount]];
         RAC(self, sxlxtStr) = [[RACSignal combineLatest:@[RACObserve(RQ_YDTQuestion_Module, subjectOneArr), RACObserve(RQ_YDTQuestion_Module, subjectFourArr)] reduce:^id (NSArray *subjectOneArr, NSArray *subjectFourArr) {
             @strongify(self)
+            NSArray *readList = [NYTools readExerciseListUserKey:RQ_USER_MANAGER.currentUser.outId carType:RQ_YDTQuestion_Module.carType subject:RQ_YDTQuestion_Module.subject exerciseType:RQ_Exercise_Module.currentExerciseType];
             NSInteger allCount = [RQ_YDTQuestion_Module getQuestionNumWithWithSubject:self.homePageSubjectType exerciseType:RQExerciseType_Sequential];
-            return [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld/%ld",[RQ_YDT_USER_Question_Module getDoQuestionNum],allCount]];
+            return [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld/%ld",readList.count,allCount]];
         }] takeUntil:self.rac_willDeallocSignal];
         
         

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

@@ -42,7 +42,8 @@
             RAC(self, leftStr) = [[RACSignal combineLatest:@[RACObserve(RQ_YDTQuestion_Module, carType), [RACObserve(RQ_YDTQuestion_Module, subject) filter:^BOOL(id  _Nullable value) {
                 return (RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour || RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne);
             }], RACObserve(RQ_YDT_USER_Question_Module, doNum)] reduce:^id (NSNumber *carType, NSNumber *subject, NSNumber *doNum) {
-                return [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld",[RQ_YDT_USER_Question_Module getDoQuestionNum]]];
+                NSArray *readList = [NYTools readExerciseListUserKey:RQ_USER_MANAGER.currentUser.outId carType:RQ_YDTQuestion_Module.carType subject:RQ_YDTQuestion_Module.subject exerciseType:RQ_Exercise_Module.currentExerciseType];
+                return [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld",readList.count]];
             }] takeUntil:self.rac_willDeallocSignal];
             
             self.operation = ^{

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

@@ -98,7 +98,7 @@
                 RQSpecialPractiseViewModel *specialPractiseViewModel = [[RQSpecialPractiseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:nil];
                 [RQ_APPDELEGATE.services pushViewModel:specialPractiseViewModel animated:YES];
             };
-        } else if ([self.title isEqualToString:@"精选500题"]) {
+        } else if ([self.title isEqualToString:@"精选500题"]||[self.title isEqualToString:@"精选300题"]) {
             self.operation = ^{
                 [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
                     if (isVip) {

jiaPei/Modules/HomePageModule/ViewModel/HomeSubPage/易错专项/NYFailSpecialExerciseDetailsViewModel.m

@@ -38,9 +38,9 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self rq_configureData];
     });
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self postVideoDate];
-    });
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//        [self postVideoDate];
+//    });
    
 }
 
@@ -72,21 +72,24 @@
         NSString *keyStr = self.titleDict[self.title];
         NYFailGroupPointDataModel *model = self.datakeyDicts[keyStr];
         group0.videoDate = model.videoDate;
-        if(model.videoDate.vipPublicityMediumUrl.length>0){
-            group0.headerHeight = RQ_FIT_HORIZONTAL(218);
-        }else{
-            group0.headerHeight = 0;
-        }
+//        if(model.videoDate.vipPublicityMediumUrl.length>0){
+//            group0.headerHeight = RQ_FIT_HORIZONTAL(218);
+//        }else{
+//            group0.headerHeight = 0;
+//        }
+        group0.headerHeight = 0;
         
         //[NYFailGroupPointDataModel modelWithDictionary:self.dataDicts[keyStr]];
         NSMutableArray *mt_array = @[].mutableCopy;//解析json 数据daocell
         if(model){
             int indx = 1;
             for (NYFailItemPointDataModel *item in model.pointData) {
-                NYFailSpecialExerciseDetailItemModel *itemModel = [[NYFailSpecialExerciseDetailItemModel alloc] initWithTitle:keyStr dataModel:item];
-                itemModel.itemPointTitle = [NSString stringWithFormat:@"考点%d",indx];
-                [mt_array addObject:itemModel];
-                indx++;
+                if(item.questionIds.length>0){//有题目才显示
+                    NYFailSpecialExerciseDetailItemModel *itemModel = [[NYFailSpecialExerciseDetailItemModel alloc] initWithTitle:keyStr dataModel:item];
+                    itemModel.itemPointTitle = [NSString stringWithFormat:@"考点%d",indx];
+                    [mt_array addObject:itemModel];
+                    indx++;
+                }
             }
         }
         group0.itemViewModels = mt_array;
@@ -171,7 +174,7 @@
                 }
                 
             }
-            if(item.tagquestions.count>0){//拘留
+            if(item.tagquestions.count>0){
                 CGFloat cellH = 0.f;
                 for (int i= 0; i<item.tagquestions.count; i++) {
                     NYFailItemPointDataQuestions *itemData = item.tagquestions[i];
@@ -217,7 +220,7 @@
                     });
                 }
             }
-            if(item.fquestions.count>0){//罚款//周期
+            if(item.fquestions.count>0){//罚款//周期//特殊天气
                 CGFloat cellH = 0.f;
                 for (int i= 0; i<item.fquestions.count; i++) {
                     NYFailItemPointDataQuesTexts *texts = item.fquestions[i];
@@ -229,7 +232,15 @@
                         cellH +=35.f;
                     }
                     if(texts.quesItem.count>0){
-                        cellH += 22.f*texts.quesItem.count;
+                        for (int z= 0; z<texts.quesItem.count; z++) {
+                            NSString *itemStr = texts.quesItem[z];
+                            CGSize itemstr_size = [itemStr rq_sizeWithFont:[UIFont systemFontOfSize:11.f] limitWidth:(RQ_SCREEN_WIDTH-22*2-10)];
+                            if(itemstr_size.height>20.f){
+                                cellH += itemstr_size.height + 10.f;
+                            }else{
+                                cellH +=22.f;
+                            }
+                        }
                     }
                 }
                 item.iviewH = cellH + 20.f;

jiaPei/Modules/OtherModules/ExerciseModule/Controller/RQExerciseSubViewController.m

@@ -104,13 +104,15 @@
             if (historyNum == 0) {
                 [self jumpQuestionWithIndex:0];
             } else {
-                [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_Default title:@"温馨提示" message:[NSString stringWithFormat:@"上次做题至%ld题，是否继续？",historyNum + 1] confirmTitle:@"是" cancelTitle:@"否" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                    @strongify(self)
-                    [self jumpQuestionWithIndex:historyNum];
-                } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-                    @strongify(self)
-                    [self jumpQuestionWithIndex:0];
-                }];
+                if(RQ_Exercise_Module.currentExerciseType != RQExerciseType_Error_Special_List){//易错题不记录跳转
+                    [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_Default title:@"温馨提示" message:[NSString stringWithFormat:@"上次做题至%ld题，是否继续？",historyNum + 1] confirmTitle:@"是" cancelTitle:@"否" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                        @strongify(self)
+                        [self jumpQuestionWithIndex:historyNum];
+                    } cancelAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                        @strongify(self)
+                        [self jumpQuestionWithIndex:0];
+                    }];
+                }
             }
         }
     }

jiaPei/Modules/OtherModules/VideoModule/View/RQDspVideoDetailCell.m

@@ -45,9 +45,9 @@
     _adView = adView;
     [self.contentView addSubview:adView];
     if(RQ_IS_IPHONE_IPhoneX_All){
-        adView.frame = CGRectMake(0, 60, RQ_SCREEN_WIDTH, RQ_SCREEN_HEIGHT-60);
+        adView.frame = CGRectMake(0, 60, RQ_SCREEN_WIDTH, RQ_SCREEN_HEIGHT-120);
     }else{
-        adView.frame = CGRectMake(0, 30, RQ_SCREEN_WIDTH, RQ_SCREEN_HEIGHT-30);
+        adView.frame = CGRectMake(0, 30, RQ_SCREEN_WIDTH, RQ_SCREEN_HEIGHT-60);
     }
 }
 

jiaPei/Modules/OtherModules/YDTQuestionModule/RQYDTQuestionModule.m

@@ -684,7 +684,9 @@ static id rq_ydtQuestionModule = nil;
 }
 
 - (void)saveHistoryQuestionNumWithQuestionId:(NSInteger)questionId {
-    
+    if(RQ_Exercise_Module.currentExerciseType == RQExerciseType_Error_Special_List){//易错题不记录
+        return;
+    }
     NSString *key = [NSString stringWithFormat:@"HistoryQuestionNum%ld-%ld-%ld-%@",self.subject,self.carType,RQ_Exercise_Module.currentExerciseType,RQStringIsNotEmpty(RQ_USER_MANAGER.currentUser.loginCode)? RQ_USER_MANAGER.currentUser.loginCode : @"0"];
     if ((RQ_Exercise_Module.currentExerciseType == RQExerciseType_Point || RQ_Exercise_Module.currentExerciseType == RQExerciseType_Chapter) && RQStringIsNotEmpty(RQ_Exercise_Module.otherStr)) {
         key = [NSString stringWithFormat:@"HistoryQuestionNum%ld-%ld-%ld-%@-%@",self.subject,self.carType,RQ_Exercise_Module.currentExerciseType,RQStringIsNotEmpty(RQ_USER_MANAGER.currentUser.loginCode)? RQ_USER_MANAGER.currentUser.loginCode : @"0", RQ_Exercise_Module.otherStr];