ios/DolphinEnglishStudent.git

			@@ -231,23 +231,7 @@
			viewModel.answerCount.accept(maxPage)
			setPages()


			// for (index,v) in ids.enumerated(){
			// if v == String(teamSchedule.teamIds.last!){
			// let maxCount = (data as! ListenNewModel).subjectList.count
			// //下一页页码
			// let page = min(index, maxCount)
			// if pageVC.currentPage != page{
			// pageVC.scroll(toPage: page, animation: false)
			// setPages()
			// }
			// viewModel.answerCount.accept(teamSchedule.topicIds.count + 1)
			// }
			// }

			case .lesson2:

			// let nextPage = (teamSchedule.teamIds.count) - 1
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			@@ -257,8 +241,6 @@
			}

			case .lesson4:

			// let nextPage = (teamSchedule.teamIds.count) - 1
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			@@ -269,7 +251,6 @@


			case .lesson3,.lesson5:
			// let nextPage = (teamSchedule.teamIds.count) - 1
			let maxCount = (data as! ListenNewModel).subjectList.count
			let page = min((maxPage - 1),maxCount)
			if pageVC.currentPage != page{
			@@ -535,7 +516,9 @@
			guard let weakSelf = self else { return }
			for vc in weakSelf.navigationController?.viewControllers ?? []{
			if vc.isKind(of: HomeListenVC.self){
			weakSelf.navigationController?.popToViewController(vc, animated: true);break
			weakSelf.navigationController?.popToViewController(vc, animated: true)
			NotificationCenter.default.post(name: Refresh_ListenSchedule_Noti, object: nil)
			break
			}
			}
			}
			@@ -557,7 +540,9 @@
			guard let weakSelf = self else { return }
			for vc in weakSelf.navigationController?.viewControllers ?? []{
			if vc.isKind(of: HomeListenVC.self){
			weakSelf.navigationController?.popToViewController(vc, animated: true);break
			weakSelf.navigationController?.popToViewController(vc, animated: true)
			NotificationCenter.default.post(name: Refresh_ListenSchedule_Noti, object: nil)
			break
			}
			}
			}
			@@ -573,37 +558,18 @@
			CommonAlertView.show(content: "未完成全部答题，确认退出吗？") {[weak self] () in
			guard let weakSelf = self else { return }

			// let temIds = weakSelf.viewModel.answerItems_1.keys.sorted()
			// let topicIds = weakSelf.viewModel.answerItems_1.values.flatMap({$0}).map({"\($0)"})

			let temIds = [String]()
			let topicIds = [String]()

			// var schedule:Int = 0

			// if let page = weakSelf.label_pageNum.text?.components(separatedBy: "：").last?.components(separatedBy: "/").first?.int{
			// schedule = max((page - 1),1)
			// }


			// switch weakSelf.viewModel.listenType.value{
			// case .lesson1:schedule = max(weakSelf.viewModel.answerCount.value - 1,1)
			// case .lesson2,.lesson3:schedule = max(weakSelf.viewModel.currentPage.value,1)
			// case .lesson4:schedule = max(weakSelf.viewModel.currentPage.value,1)
			// case .lesson5:schedule = max(weakSelf.viewModel.currentPage.value,1)
			// default:break
			// }

			switch weakSelf.viewModel.listenType.value{
			case .lesson1,.lesson2,.lesson3,.lesson4,.lesson5:
			// if temIds.count > 0 && topicIds.count > 0{
			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)

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

			@@ -611,7 +577,9 @@
			}
			for vc in weakSelf.navigationController?.viewControllers ?? []{
			if vc.isKind(of: HomeListenVC.self){
			weakSelf.navigationController?.popToViewController(vc, animated: true);break
			weakSelf.navigationController?.popToViewController(vc, animated: true)
			NotificationCenter.default.post(name: Refresh_ListenSchedule_Noti, object: nil)
			break
			}
			}
			}