Commit b657173d authored by 哈南's avatar 哈南

no message

parent 7b6f0dd2
...@@ -351,10 +351,15 @@ ...@@ -351,10 +351,15 @@
PatrolExamCellViewModel *vm = self.viewModel.arrCellData[i]; PatrolExamCellViewModel *vm = self.viewModel.arrCellData[i];
if (photoType(vm.question.photoType) != PHOTO_TYPE_NO) { if (photoType(vm.question.photoType) != PHOTO_TYPE_NO) {
if ([questionArray containsObject:vm.question.uuid]) { if ([questionArray containsObject:vm.question.uuid]) {
ZJPatrolDetail_results_answers_details * detail = vm.answer.details.firstObject;
if ([vm.question.type intValue] == 8 && [detail.index intValue] == 3){
[questionArray removeObject:vm.question.uuid];
}else{
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0]; NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0];
[self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:(UITableViewScrollPositionMiddle) animated:YES]; [self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:(UITableViewScrollPositionMiddle) animated:YES];
break; break;
} }
}
}else { }else {
[questionArray removeObject:vm.question.uuid]; [questionArray removeObject:vm.question.uuid];
} }
...@@ -378,6 +383,10 @@ ...@@ -378,6 +383,10 @@
PatrolExamCellViewModel *vm = self.viewModel.arrCellData[i]; PatrolExamCellViewModel *vm = self.viewModel.arrCellData[i];
if ([questionArray containsObject:vm.question.uuid]) { if ([questionArray containsObject:vm.question.uuid]) {
if (photoType(vm.question.photoType) != PHOTO_TYPE_NO) { if (photoType(vm.question.photoType) != PHOTO_TYPE_NO) {
ZJPatrolDetail_results_answers_details * detail = vm.answer.details.firstObject;
if ([vm.question.type intValue] == 8 && [detail.index intValue] == 3){
}else{
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0]; NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0];
[self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:(UITableViewScrollPositionMiddle) animated:YES]; [self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:(UITableViewScrollPositionMiddle) animated:YES];
[IBTLoadingView showTextOnly:@"您有检查的项目未拍照"]; [IBTLoadingView showTextOnly:@"您有检查的项目未拍照"];
...@@ -386,6 +395,7 @@ ...@@ -386,6 +395,7 @@
} }
} }
} }
}
@weakify(self); @weakify(self);
NSMutableArray *answerArray = [NSMutableArray array]; NSMutableArray *answerArray = [NSMutableArray array];
for (id object in self.viewModel.dicAnswers.allValues) { for (id object in self.viewModel.dicAnswers.allValues) {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.4.1</string> <string>1.4.2</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment