From 59bd9f792891efa0d0d69f256e1a146c44c944db Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期三, 24 七月 2024 09:45:41 +0800
Subject: [PATCH] fix bug
---
DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenGame_1_VC.swift | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenGame_1_VC.swift b/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenGame_1_VC.swift
index abeba3e..a43cc66 100644
--- a/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenGame_1_VC.swift
+++ b/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenGame_1_VC.swift
@@ -251,8 +251,27 @@
UIView.animate(withDuration: 0.5) {
copyView.frame = CGRect(x: x, y: y, width: layout.itemSize.width - 10, height: 40)
} completion: { _ in
- DispatchQueue.main.asyncAfter(deadline: .now()+0.5) {
- self.voicePlayer.playerAt(url: self.currentAnswer?.correct)
+// DispatchQueue.main.asyncAfter(deadline: .now()+0.5) {
+// self.voicePlayer.playerAt(url: self.currentAnswer?.correct)
+// }
+
+ if self.viewModel.answerType.value == .success{
+ self.timer?.fireDate = .distantFuture
+ DispatchQueue.main.asyncAfter(deadline: .now()+1) {
+ self.times = (self.listen1Model?.data?.time ?? 10) + 1
+ self.totalCount += 1
+ self.rootViewModel.correctNum += 1
+ self.label_class.text = "\(self.totalCount)"
+
+ if let currentA = self.currentAnswer{
+ self.answerSet.remove(currentA)
+ }
+
+ self.currentAnswer = self.answerSet.randomElement()
+ self.viewModel.answerType.accept(.none)
+ print("--->下一题：\(self.currentAnswer?.id ?? 0) 剩余\(self.answerSet.count) 计数：\(self.totalCount)")
+ self.timer?.fireDate = .distantPast
+ }
}
}
}
@@ -269,7 +288,7 @@
answerSet.remove(c)
}
collectionView.reloadData()
- DispatchQueue.main.asyncAfter(deadline: .now()+3) {
+ DispatchQueue.main.asyncAfter(deadline: .now()+1) {
self.timer?.fireDate = .distantPast
self.times = (self.listen1Model?.data?.time ?? 10) + 1
self.currentAnswer = self.answerSet.randomElement()
@@ -339,24 +358,24 @@
self.label_hint.text = "准备听题"
- if viewModel.answerType.value == .success{
- timer?.fireDate = .distantFuture
- DispatchQueue.main.asyncAfter(deadline: .now()+3) {
- self.times = (self.listen1Model?.data?.time ?? 10) + 1
- self.totalCount += 1
- self.rootViewModel.correctNum += 1
- self.label_class.text = "\(self.totalCount)"
-
- if let currentA = self.currentAnswer{
- self.answerSet.remove(currentA)
- }
-
- self.currentAnswer = self.answerSet.randomElement()
- self.viewModel.answerType.accept(.none)
- print("--->下一题：\(self.currentAnswer?.id ?? 0) 剩余\(self.answerSet.count) 计数：\(self.totalCount)")
- self.timer?.fireDate = .distantPast
- }
- }
+// if viewModel.answerType.value == .success{
+// timer?.fireDate = .distantFuture
+// DispatchQueue.main.asyncAfter(deadline: .now()+1) {
+// self.times = (self.listen1Model?.data?.time ?? 10) + 1
+// self.totalCount += 1
+// self.rootViewModel.correctNum += 1
+// self.label_class.text = "\(self.totalCount)"
+//
+// if let currentA = self.currentAnswer{
+// self.answerSet.remove(currentA)
+// }
+//
+// self.currentAnswer = self.answerSet.randomElement()
+// self.viewModel.answerType.accept(.none)
+// print("--->下一题：\(self.currentAnswer?.id ?? 0) 剩余\(self.answerSet.count) 计数：\(self.totalCount)")
+// self.timer?.fireDate = .distantPast
+// }
+// }
//答题完成
--
Gitblit v1.7.1