From f2e891eecfac25bf6aed38c8eadfdf05704b16b6 Mon Sep 17 00:00:00 2001 From: 无故事王国 <841720330@qq.com> Date: 星期四, 20 六月 2024 18:48:39 +0800 Subject: [PATCH] fix --- DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenFight_lesson_3_VC.swift | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenFight_lesson_3_VC.swift b/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenFight_lesson_3_VC.swift index e8e54e7..defdd6f 100644 --- a/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenFight_lesson_3_VC.swift +++ b/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenFight_lesson_3_VC.swift @@ -103,6 +103,18 @@ } + override func viewDidLayoutSubviews() { + super.viewDidLayoutSubviews() + let flowLayout = collectionView.collectionViewLayout as! UICollectionViewFlowLayout + + let w = (collectionView.size.width - flowLayout.minimumLineSpacing) / 3.1 + let h = (collectionView.size.height - flowLayout.minimumInteritemSpacing) / 2 - 40 + if flowLayout.itemSize.width != w || flowLayout.itemSize.height != h{ + flowLayout.itemSize = CGSize(width: w, height: h) + collectionView.reloadData() + } + } + private func setAnswerStackView(force:Bool = false){ @@ -153,7 +165,7 @@ @objc private func chooseAnswerAction(btn:UIButton){ - guard viewModel.selectIndex != nil else {return} + guard viewModel.selectIndex.value != nil else {return} if !islisten{ alertError(msg: "请先听题");return @@ -240,6 +252,11 @@ } completion: { _ in self.answterCount += 1 self.voicePlayer.playerAt(url: self.listenNewModel.subjectList[self.page][valueIndex].correct) + + let teamId = self.listenNewModel.data?.id.components(separatedBy: ",")[self.page] + let answerId = self.listenNewModel.subjectList[self.page][valueIndex].id + self.rootViewModel.insertCorrectAnswer(teamId: teamId, answerId: answerId) + DispatchQueue.main.asyncAfter(deadline: .now()+1.0) { self.setAnswerStackView() let v = self.rootViewModel.answerCount.value + 1 @@ -395,7 +412,6 @@ if self.answterCount == 3{ - self.rootViewModel.answerItems[self.page] = self.listenNewModel.subjectList[self.page] NotificationCenter.default.post(name: NextLession_Noti, object: nil) return } -- Gitblit v1.7.1