ios/DolphinEnglishStudent.git

			@@ -31,17 +31,17 @@
			return sta
			}()

			private var listen1Model:Listen1Model!
			private var listenNewModel:ListenNewModel!
			private var page:Int!
			private var answterCount:Int = 0 //回答计数，用于确定角标
			var rootViewModel:HomeListenFightViewModel!
			private var voicePlayer = VoicePlayer.share()

			required init(page:Int,listen1Model:Listen1Model){
			required init(page:Int,listenNewModel:ListenNewModel){
			super.init(nibName: nil, bundle: nil)
			self.page = page
			self.listen1Model = listen1Model
			self.listen1Model.subjectList.shuffle()
			self.listenNewModel = listenNewModel
			// self.listen1Model.subjectList.shuffle()
			}

			required init?(coder: NSCoder) {
			@@ -124,9 +124,9 @@

			var tempImageArray = [String]()

			tempImageArray.append(listen1Model.subjectList[2].img)
			tempImageArray.append(listen1Model.subjectList[4].img)
			tempImageArray.append(listen1Model.subjectList[5].img)
			tempImageArray.append(listenNewModel.subjectList[page][2].img)
			tempImageArray.append(listenNewModel.subjectList[page][4].img)
			tempImageArray.append(listenNewModel.subjectList[page][5].img)
			// tempImageArray.shuffle()

			view.addSubview(stackView)
			@@ -179,7 +179,7 @@
			valueIndex = viewModel.selectIndex.value!.row + 3
			}

			if subV?.imageUrl == listen1Model.subjectList[valueIndex].img{
			if subV?.imageUrl == listenNewModel.subjectList[page][valueIndex].img{
			answerType = .success
			}else{
			answerType = .fail
			@@ -220,11 +220,13 @@
			copyView?.frame = newFrame
			} completion: { _ in
			self.answterCount += 1
			self.voicePlayer.playerAt(url: self.listen1Model.subjectList[valueIndex].correct)
			self.voicePlayer.playerAt(url: self.listenNewModel.subjectList[self.page][valueIndex].correct)

			DispatchQueue.main.asyncAfter(deadline: .now()+1.0) {
			self.setAnswerStackView()
			self.viewModel.selectIndex.accept(nil)
			let v = self.rootViewModel.answerCount.value + 1
			self.rootViewModel.answerCount.accept(v)
			}
			}
			}
			@@ -281,7 +283,7 @@
			}

			if indexPath.section == 0{
			let model = listen1Model.subjectList[indexPath.row]
			let model = listenNewModel.subjectList[page][indexPath.row]
			if indexPath.row != 2{
			cell.img_cover.sd_setImage(with: URL(string: model.img))
			}else{
			@@ -291,7 +293,7 @@
			}

			if indexPath.section == 1{
			let model = listen1Model.subjectList[indexPath.row + 3]
			let model = listenNewModel.subjectList[page][indexPath.row + 3]
			if indexPath.row == 0{
			cell.img_cover.sd_setImage(with: URL(string: model.img))
			}else{
			@@ -322,7 +324,7 @@
			collectionView.reloadData()

			if self.answterCount == 3{
			self.rootViewModel.answerItems[self.page] = self.listen1Model
			self.rootViewModel.answerItems[self.page] = self.listenNewModel.subjectList[self.page]
			NotificationCenter.default.post(name: NextLession_Noti, object: nil)
			VoicePlayer.share().playerEnd()
			return