测试 优化 1.1.3 版本

SDJK.xcodeproj/project.pbxproj

@@ -5272,7 +5272,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.1.3;
+				MARKETING_VERSION = 1.1.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -5311,7 +5311,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.1.3;
+				MARKETING_VERSION = 1.1.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

SDJK/Modules/OtherModule/ExerciseModule/Controller/RQExerciseSubViewController.m

@@ -247,7 +247,7 @@
                     [RQ_Exercise_Module rq_showSkillExplanationAlertWithMessage:exerciseModel.explain_jq skillkeyword:exerciseModel.skillkeyword explainGifUrl:exerciseModel.explain_gif mp3Url:exerciseModel.explain_mp3 completeBlock:nil];
                 }
                 RQWrongModel *wrongModel = [[RQWrongModel alloc] init];
-                wrongModel.questionId = exerciseModel._id;
+                wrongModel.questionId = exerciseModel._id==0?exerciseModel.idYdt:exerciseModel._id;
                 wrongModel.km = RQ_COMMON_MANAGER.subjectStr;
                 wrongModel.createTime = [NSDate rq_currentTimeSSSInterval];
                 wrongModel.userId = RQ_USER_MANAGER.currentUserId;
@@ -515,6 +515,7 @@
         return;
     }
     self.number += 1;
+    NSLog(@"$$$-下一页:%zd",self.number);
     [self.coverVC setController:[self creatSubVC] animated:YES isAbove:NO];
     if (self.viewModel.exerciseType != RQExerciseType_Test && self.viewModel.exerciseType != RQExerciseType_Exam) {
         if (self.viewModel.homeSubEditListType == RQHomeSubEditListType_WrongTopic) {
@@ -528,10 +529,12 @@
 }
 
 - (void)jumpLastQuestion{
+    
     if (self.number == 0) {
         return;
     }
     self.number -= 1;
+    NSLog(@"$$$-上一页:%zd",self.number);
     [self.coverVC setController:[self creatSubVC] animated:YES isAbove:YES];
     if (self.viewModel.exerciseType != RQExerciseType_Test && self.viewModel.exerciseType != RQExerciseType_Exam) {
         if (self.viewModel.homeSubEditListType == RQHomeSubEditListType_WrongTopic) {
@@ -678,11 +681,20 @@
 
         [_exerciseToolBarView.lastQuestionView setTapActionWithBlock:^(UITapGestureRecognizer *tap) {
             @strongify(self)
+            _exerciseToolBarView.lastQuestionView.userInteractionEnabled = NO;
             [self jumpLastQuestion];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.6f *NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                _exerciseToolBarView.lastQuestionView.userInteractionEnabled = YES;
+            });
+            
         }];
         [_exerciseToolBarView.nextQuestionView setTapActionWithBlock:^(UITapGestureRecognizer *tap) {
             @strongify(self)
+            _exerciseToolBarView.nextQuestionView.userInteractionEnabled = NO;
             [self jumpNextQuestion];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.6f *NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                _exerciseToolBarView.nextQuestionView.userInteractionEnabled = YES;
+            });
         }];
         [_exerciseToolBarView.totalNumberOfQuestionsView setTapActionWithBlock:^(UITapGestureRecognizer *tap) {
             @strongify(self)
@@ -820,12 +832,20 @@
         
         [_handInThePaperView.lastQuestionBtn setTapActionWithBlock:^(UITapGestureRecognizer *tap) {
             @strongify(self)
+            _handInThePaperView.lastQuestionBtn.enabled = NO;
             [self jumpLastQuestion];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.6f *NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                _handInThePaperView.lastQuestionBtn.enabled = YES;
+            });
         }];
         
         [_handInThePaperView.nextQuestionBtn setTapActionWithBlock:^(UITapGestureRecognizer *tap) {
             @strongify(self)
+            _handInThePaperView.nextQuestionBtn.enabled = NO;
             [self jumpNextQuestion];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.6f *NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                _handInThePaperView.nextQuestionBtn.enabled = YES;
+            });
         }];
         
         [_handInThePaperView.totalNumberOfQuestionsBtn setTapActionWithBlock:^(UITapGestureRecognizer *tap) {

SDJK/Modules/OtherModule/ExerciseModule/View/RQExerciseExamToolBarCell.m

@@ -31,7 +31,7 @@
 - (void)bindViewModel:(RQExerciseExamToolBarItemViewModel *)viewModel {
     _viewModel = viewModel;
     RQCollectionModel *collectionModel = [[RQCollectionModel alloc] init];
-    collectionModel.questionId = viewModel.exerciseModel._id;
+    collectionModel.questionId = viewModel.exerciseModel._id==0?viewModel.exerciseModel.idYdt:viewModel.exerciseModel._id;
     collectionModel.km = RQ_COMMON_MANAGER.subjectStr;
     collectionModel.createTime = [NSDate rq_currentTimeSSSInterval];
     collectionModel.userId = RQ_USER_MANAGER.currentUserId;

SDJK/Modules/OtherModule/ExerciseModule/View/RQExerciseToolBarCell.m

@@ -27,7 +27,7 @@
     @weakify(self)
     _viewModel = viewModel;
     RQCollectionModel *collectionModel = [[RQCollectionModel alloc] init];
-    collectionModel.questionId = viewModel.exerciseModel._id;
+    collectionModel.questionId = viewModel.exerciseModel._id==0?viewModel.exerciseModel.idYdt:viewModel.exerciseModel._id;
     collectionModel.km = RQ_COMMON_MANAGER.subjectStr;
     collectionModel.createTime = [NSDate rq_currentTimeSSSInterval];
     collectionModel.userId = RQ_USER_MANAGER.currentUserId;

SDJK/Utils/Manager/QuestionDBManager/RQQuestionDBManager.m

@@ -110,8 +110,10 @@ static id rq_questionDBManager = nil;
             querySubjectTypeStr = [NSString stringWithFormat:@"subject = '%@'",querySubjectTypeStr];
             break;
         case RQHomeSubPageType_LocalTopics: /// 地方专题
-            pageTypeStr = @"place_issue_name";
-            pageTypeByOrderStr = @"place_issue";
+            pageTypeStr = @"title,column_id";
+            pageTypeByOrderStr = @"sort";
+            querySubjectTypeStr = [NSString stringWithFormat:@"%@_4",querySubjectTypeStr];
+            querySubjectTypeStr = [NSString stringWithFormat:@"subject = '%@'",querySubjectTypeStr];
             break;
         case RQHomeSubPageType_ClassificationExercise:/// 分类练习
             pageTypeStr = @"title,column_id";
@@ -708,7 +710,7 @@ static id rq_questionDBManager = nil;
 - (RQExerciseModel *)getQuestionWithDataBase:(FMDatabase *)dataBase questionId:(NSInteger )questionId {
     RQExerciseModel *exerciseModel;
     FMResultSet *resultSet;
-    resultSet = [dataBase executeQuery:[NSString stringWithFormat:@"select * from question_info where id = %ld", questionId]];
+    resultSet = [dataBase executeQuery:[NSString stringWithFormat:@"select * from question_info where id = %ld or id_ydt = %ld", questionId, questionId]];
     while ([resultSet next]) {
         exerciseModel = [RQExerciseModel exerciseModelWithFMResultSet:resultSet];
     }