ios/DolphinEnglishStudent.git

			@@ -262,7 +262,8 @@
			let nextPage = weakSelf.viewModel.currentPage.value + 1
			var asComplete:Bool = false
			switch weakSelf.viewModel.listenType.value {
			case .lesson1,.lesson2:asComplete = nextPage >= (weakSelf.data as! ListenNewModel).subjectList.count
			case .lesson1,.lesson2,.lesson3,.lesson4,.lesson5:asComplete = nextPage >= (weakSelf.data as! ListenNewModel).subjectList.count
			case .story1,.story2: asComplete = nextPage >= (weakSelf.data as! Listen1Model).storyList.count

			default:break
			}
			@@ -283,14 +284,16 @@
			return
			}

			if weakSelf.viewModel.listenType.value == .story2{
			weakSelf.btn_next.isHidden = (nextPage + 1) == weakSelf.viewModel.maxPage.value
			if weakSelf.btn_next.isHidden{
			weakSelf.btn_exit.setTitle("完成", for: .normal)
			}
			}


			//以下无效代码
			// if weakSelf.viewModel.listenType.value == .story2{
			// weakSelf.btn_next.isHidden = (nextPage + 1) == weakSelf.viewModel.maxPage.value
			// if weakSelf.btn_next.isHidden{
			// weakSelf.btn_exit.setTitle("完成", for: .normal)
			// }
			// }
			//
			//
			// //完成
			// if nextPage >= weakSelf.viewModel.maxPage.value{
			@@ -327,8 +330,11 @@

			private func setPages(){
			switch viewModel.listenType.value{
			case .lesson1,.lesson2,.lesson3:
			case .lesson1,.lesson2,.lesson3,.lesson5:
			label_pageNum.text = "已完成：\(viewModel.answerCount.value)/\((data as! ListenNewModel).subjectList.flatMap({$0}).count)"
			case .lesson4:
			//两题为一组：需要/2
			label_pageNum.text = "已完成：\(viewModel.answerCount.value)/\((data as! ListenNewModel).subjectList.flatMap({$0}).count / 2)"
			case .game1,.game2:
			btn_forward.isHidden = true
			label_pageNum.isHidden = true
			@@ -339,7 +345,7 @@
			case .story1,.story2:
			let count = (data as! Listen1Model).storyList.count
			viewModel.maxPage.accept(count)
			label_pageNum.text = "已完成：\(viewModel.currentPage.value + 1)/\(0)"
			label_pageNum.text = "已完成：\(viewModel.currentPage.value + 1)/\(count)"
			default:break
			}
			}
			@@ -352,7 +358,7 @@
			var ids:String = ""

			switch viewModel.listenType.value {
			case .lesson1,.lesson2:
			case .lesson1,.lesson2,.lesson3,.lesson4,.lesson5:
			let data = (data as! ListenNewModel).data
			ids = data?.id ?? ""
			toalIntegral = data?.integral ?? 0
			@@ -486,7 +492,9 @@
			func totalPagesOfpageViewController(_ pageViewConteoller: FFPageViewController) -> UInt {

			switch viewModel.listenType.value {
			case .lesson1,.lesson2,.lesson3:return UInt((data as! ListenNewModel).subjectList.count)
			case .lesson1,.lesson2,.lesson3,.lesson4,.lesson5:return UInt((data as! ListenNewModel).subjectList.count)
			case .story1,.story2:
			return UInt((data as! Listen1Model).storyList.count)
			default:break
			}

			@@ -494,10 +502,6 @@
			//超级听力，只有一页
			if viewModel.listenType.value == .game1 \|\| viewModel.listenType.value == .game2{
			return 1
			}

			if viewModel.listenType.value == .story1 \|\| viewModel.listenType.value == .story2{
			return UInt((data as! Listen1Model).storyList.count)
			}
			return UInt(viewModel.maxPage.value)
			}
			@@ -550,13 +554,13 @@
			}

			if viewModel.listenType.value == .lesson4{
			let vc = HomeListenFight_lesson_4_VC(page: page, listen4Model: data as! Listen4Model)
			let vc = HomeListenFight_lesson_4_VC(page: page, listenNewModel: data as! ListenNewModel)
			vc.rootViewModel = viewModel
			return vc
			}

			if viewModel.listenType.value == .lesson5{
			let vc = HomeListenFight_lesson_5_VC(page: page, listen1Model: data as! Listen1Model)
			let vc = HomeListenFight_lesson_5_VC(page: page, listenNewModel: data as! ListenNewModel)
			vc.rootViewModel = viewModel
			return vc
			}