ios/DolphinEnglishStudent.git

			@@ -220,48 +220,48 @@


			if let teamSchedule = teamScheduleModel{
			viewModel.correctNum = viewModel.correctNum + teamSchedule.correctNumber
			viewModel.errorNum = teamSchedule.answerNumber - teamSchedule.correctNumber
			viewModel.correctNum = viewModel.correctNum + teamSchedule.correctNumber
			viewModel.errorNum = teamSchedule.answerNumber - teamSchedule.correctNumber
			maxPage = teamSchedule.schedule
			let ids = (data as! ListenNewModel).data!.id.components(separatedBy: ",")
			switch viewModel.listenType.value {
			case .lesson1:
			let nextPage = floor(Double(maxPage) / 5.0)
			pageVC.scroll(toPage: Int(nextPage), animation: false)
			viewModel.answerCount.accept(maxPage)
			let ids = (data as! ListenNewModel).data!.id.components(separatedBy: ",")
			switch viewModel.listenType.value {
			case .lesson1:
			let nextPage = floor(Double(maxPage) / 5.0)
			pageVC.scroll(toPage: Int(nextPage), animation: false)
			viewModel.answerCount.accept(maxPage)
			setPages()

			case .lesson2:
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			viewModel.currentPage.accept(page)
			pageVC.scroll(toPage: page, animation: false)
			setPages()
			}

			case .lesson2:
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			viewModel.currentPage.accept(page)
			pageVC.scroll(toPage: page, animation: false)
			setPages()
			}

			case .lesson4:
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			viewModel.currentPage.accept(page)
			pageVC.scroll(toPage: page, animation: false)
			setPages()
			}
			case .lesson4:
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			viewModel.currentPage.accept(page)
			pageVC.scroll(toPage: page, animation: false)
			setPages()
			}


			case .lesson3,.lesson5:
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			viewModel.currentPage.accept(page)
			pageVC.scroll(toPage: page, animation: false)
			setPages()
			}
			case .lesson3,.lesson5:
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			viewModel.currentPage.accept(page)
			pageVC.scroll(toPage: page, animation: false)
			setPages()
			}


			default:break
			}
			default:break
			}
			}
			}

			@@ -397,18 +397,21 @@
			switch viewModel.listenType.value{
			case .lesson1:
			label_pageNum.text = "已完成：\(viewModel.answerCount.value)/\((data as! ListenNewModel).subjectList.flatMap({$0}).count)"
			maxPage = max(viewModel.answerCount.value,maxPage)
			// maxPage = max(viewModel.answerCount.value,maxPage)
			maxPage = viewModel.answerCount.value
			btn_forward.isHidden = viewModel.answerCount.value == 1
			case .lesson2,.lesson3,.lesson5:
			label_pageNum.text = "已完成：\(viewModel.currentPage.value + 1)/\((data as! ListenNewModel).subjectList.count)"
			btn_forward.isHidden = viewModel.currentPage.value == 0
			let page = viewModel.currentPage.value + 1
			maxPage = max(page,maxPage)
			// maxPage = max(page,maxPage)
			maxPage = page
			case .lesson4:
			//两题为一组：需要/2
			label_pageNum.text = "已完成：\(viewModel.currentPage.value + 1)/\((data as! ListenNewModel).subjectList.count)"
			let page = viewModel.currentPage.value + 1
			maxPage = max(page,maxPage)
			// maxPage = max(page,maxPage)
			maxPage = page
			case .game1,.game2:
			btn_forward.isHidden = true
			label_pageNum.isHidden = true
			@@ -564,12 +567,12 @@

			switch weakSelf.viewModel.listenType.value{
			case .lesson1,.lesson2,.lesson3,.lesson4,.lesson5:
			let totalNum = weakSelf.viewModel.correctNum + weakSelf.viewModel.errorNum
			Services.exitLearning(type:weakSelf.viewModel.listenType.value.rawValue,quarter: weakSelf.viewModel.quarter.value!,week: weakSelf.viewModel.week.value!, day: weakSelf.viewModel.day.value!, teamIds: temIds, topicIds: topicIds,answerNumber: totalNum,correctNumber:weakSelf.viewModel.correctNum,studyTime:weakSelf.viewModel.times,schedule: weakSelf.maxPage).subscribe(onNext: { data in
			let totalNum = weakSelf.viewModel.correctNum + weakSelf.viewModel.errorNum
			Services.exitLearning(type:weakSelf.viewModel.listenType.value.rawValue,quarter: weakSelf.viewModel.quarter.value!,week: weakSelf.viewModel.week.value!, day: weakSelf.viewModel.day.value!, teamIds: temIds, topicIds: topicIds,answerNumber: totalNum,correctNumber:weakSelf.viewModel.correctNum,studyTime:weakSelf.viewModel.times,schedule: weakSelf.maxPage).subscribe(onNext: { data in

			NotificationCenter.default.post(name: MeUserInfoUpdate_Noti, object: nil)
			NotificationCenter.default.post(name: MeUserInfoUpdate_Noti, object: nil)

			}).disposed(by: weakSelf.disposeBag)
			}).disposed(by: weakSelf.disposeBag)
			case .game1,.game2,.story1,.story2:
			Services.exitGameOrStory(studyTime: weakSelf.viewModel.times).subscribe(onNext: { _ in

			@@ -642,9 +645,9 @@

			if viewModel.listenType.value == .lesson1{
			let currentVC = pageVC.currentController as! HomeListenFight_lesson_1_VC
			// if (viewModel.answerCount.value - 1 ) % 4 != 0 \|\| viewModel.answerCount.value <= 4{
			currentVC.tobefore();return
			// }
			// if (viewModel.answerCount.value - 1 ) % 4 != 0 \|\| viewModel.answerCount.value <= 4{
			currentVC.tobefore();return
			// }
			}

			if viewModel.listenType.value == .lesson3{