ios/DolphinEnglishStudent.git

			@@ -7,6 +7,8 @@

			import UIKit

			let Refresh_ListenSchedule_Noti = Notification.Name.init("Refresh_ListenSchedule")

			class HomeListenSubVC: BaseVC {

			private var page:Int!
			@@ -29,10 +31,7 @@
			override func viewDidLoad() {
			super.viewDidLoad()
			navigationItem.titleView = UIView()
			Services.studySchedule(week: week, day: page + 1).subscribe(onNext: {data in
			self.studyScheduleModel = data.data
			self.tableView.reloadData()
			}).disposed(by: disposeBag)
			getData()
			}

			override func setUI() {
			@@ -49,6 +48,19 @@
			make.edges.equalToSuperview()
			}
			}

			override func setRx() {
			NotificationCenter.default.rx.notification(Refresh_ListenSchedule_Noti).take(until: self.rx.deallocated).subscribe(onNext: {_ in
			self.getData()
			}).disposed(by: disposeBag)
			}

			private func getData(){
			Services.studySchedule(week: week, day: page + 1).subscribe(onNext: {data in
			self.studyScheduleModel = data.data
			self.tableView.reloadData()
			}).disposed(by: disposeBag)
			}
			}

			extension HomeListenSubVC:UITableViewDelegate{
			@@ -59,11 +71,13 @@
			if page <= 4{
			if indexPath.row == 0{
			//听音选图
			Services.listenSelectPicture(day:day, quarter: quarter, week: week).subscribe(onNext: {result in
			Services.listenSelectPicture(day:day, quarter: quarter, week: week).subscribe(onNext: {[weak self] result in
			guard let weakSelf = self else { return }
			if let data = result.data{
			let fightVC = HomeListenFightVC(listenType: .lesson1)
			let fightVC = HomeListenFightVC(listenType: .lesson1,quarter:weakSelf.quarter,week: weakSelf.week,day:day)
			fightVC.title = ListenType.lesson1.rawTitle
			fightVC.data = data
			fightVC.studyScheduleModel = self?.studyScheduleModel
			JQ_currentViewController().jq_push(vc:fightVC)
			}
			}).disposed(by: disposeBag)
			@@ -71,11 +85,13 @@

			if indexPath.row == 1{
			//看图选音
			Services.pictureSelectVoice(day: day, quarter: quarter, week: week).subscribe(onNext: {result in
			Services.pictureSelectVoice(day: day, quarter: quarter, week: week).subscribe(onNext: {[weak self] result in
			guard let weakSelf = self else { return }
			if let data = result.data{
			let fightVC = HomeListenFightVC(listenType: .lesson2)
			let fightVC = HomeListenFightVC(listenType: .lesson2,quarter:weakSelf.quarter,week: weakSelf.week,day:day)
			fightVC.title = ListenType.lesson2.rawTitle
			fightVC.data = data
			fightVC.studyScheduleModel = self?.studyScheduleModel
			JQ_currentViewController().jq_push(vc:fightVC)
			}
			}).disposed(by: disposeBag)
			@@ -84,11 +100,13 @@

			if indexPath.row == 2{
			//归纳排除
			Services.induceExclude(day: day, quarter: quarter, week: week).subscribe(onNext: {result in
			Services.induceExclude(day: day, quarter: quarter, week: week).subscribe(onNext: {[weak self] result in
			guard let weakSelf = self else { return }
			if let data = result.data{
			let fightVC = HomeListenFightVC(listenType: .lesson3)
			let fightVC = HomeListenFightVC(listenType: .lesson3,quarter:weakSelf.quarter,week: weakSelf.week,day:day)
			fightVC.title = ListenType.lesson3.rawTitle
			fightVC.data = data
			fightVC.studyScheduleModel = self?.studyScheduleModel
			JQ_currentViewController().jq_push(vc: fightVC)
			}
			}).disposed(by: disposeBag)
			@@ -96,11 +114,13 @@

			if indexPath.row == 3{
			//有问有答
			Services.questionsAndAnswers(day: day, quarter: quarter, week: week).subscribe(onNext: {result in
			Services.questionsAndAnswers(day: day, quarter: quarter, week: week).subscribe(onNext: {[weak self] result in
			guard let weakSelf = self else { return }
			if let data = result.data{
			let fightVC = HomeListenFightVC(listenType: .lesson4)
			let fightVC = HomeListenFightVC(listenType: .lesson4,quarter:weakSelf.quarter,week: weakSelf.week,day:day)
			fightVC.title = ListenType.lesson4.rawTitle
			fightVC.data = data
			fightVC.studyScheduleModel = self?.studyScheduleModel
			JQ_currentViewController().jq_push(vc: fightVC)
			}
			}).disposed(by: disposeBag)
			@@ -108,11 +128,13 @@

			if indexPath.row == 4{
			//音图相配
			Services.pictureMateVoice(day: day, quarter: quarter, week: week).subscribe(onNext: {result in
			Services.pictureMateVoice(day: day, quarter: quarter, week: week).subscribe(onNext: {[weak self] result in
			guard let weakSelf = self else { return }
			if let data = result.data{
			let fightVC = HomeListenFightVC(listenType: .lesson5)
			let fightVC = HomeListenFightVC(listenType: .lesson5,quarter:weakSelf.quarter,week: weakSelf.week,day:day)
			fightVC.title = ListenType.lesson5.rawTitle
			fightVC.data = data
			fightVC.studyScheduleModel = self?.studyScheduleModel
			JQ_currentViewController().jq_push(vc: fightVC)
			}
			}).disposed(by: disposeBag)
			@@ -122,14 +144,15 @@
			//自主游戏
			if page == 5{
			if indexPath.row == 0{
			let fightVC = HomeListenFightVC(listenType: .game1,quarter: quarter,week: week)
			let fightVC = HomeListenFightVC(listenType: .game1,quarter: quarter,week: week,day: day)
			fightVC.title = ListenType.game1.rawTitle
			JQ_currentViewController().jq_push(vc:fightVC)
			}
			if indexPath.row == 1{
			Services.gameMemory(quarter: quarter, week: week).subscribe(onNext: {result in
			Services.gameMemory(quarter: quarter, week: week).subscribe(onNext: {[weak self]result in
			guard let weakSelf = self else { return }
			if let data = result.data{
			let fightVC = HomeListenFightVC(listenType: .game2)
			let fightVC = HomeListenFightVC(listenType: .game2,quarter: weakSelf.quarter,week: weakSelf.week,day: day)
			fightVC.title = ListenType.game2.rawTitle
			fightVC.data = data
			JQ_currentViewController().jq_push(vc: fightVC)
			@@ -141,9 +164,10 @@
			//听故事
			if page == 6{
			if indexPath.row == 0{
			Services.lookpictureDbu(quarter: quarter, week: week).subscribe(onNext: {result in
			Services.lookpictureDbu(quarter: quarter, week: week).subscribe(onNext: {[weak self]result in
			guard let weakSelf = self else { return }
			if let data = result.data{
			let fightVC = HomeListenFightVC(listenType: .story1)
			let fightVC = HomeListenFightVC(listenType: .story1,quarter: weakSelf.quarter,week: weakSelf.week,day: day)
			fightVC.title = ListenType.story1.rawTitle
			fightVC.data = data
			JQ_currentViewController().jq_push(vc: fightVC)
			@@ -151,9 +175,10 @@
			}).disposed(by: disposeBag)
			}
			if indexPath.row == 1{
			Services.frameworkMemory(quarter: quarter, week: week).subscribe(onNext: {result in
			Services.frameworkMemory(quarter: quarter, week: week).subscribe(onNext: {[weak self]result in
			guard let weakSelf = self else { return }
			if let data = result.data{
			let fightVC = HomeListenFightVC(listenType: .story2)
			let fightVC = HomeListenFightVC(listenType: .story2,quarter: weakSelf.quarter,week: weakSelf.week,day: day)
			fightVC.title = ListenType.story2.rawTitle
			fightVC.data = data
			JQ_currentViewController().jq_push(vc: fightVC)
			@@ -220,6 +245,7 @@

			if page == 5{
			cell.view_bg2.isHidden = true
			cell.view_state.isHidden = true
			switch indexPath.row {
			case 0:
			cell.label_title.text = "自主游戏1-超级听力"
			@@ -233,6 +259,7 @@

			if page == 6{
			cell.view_bg2.isHidden = true
			cell.view_state.isHidden = true
			switch indexPath.row {
			case 0:
			cell.label_title.text = "自主故事1-看图配音"