ios/DolphinEnglishStudent.git

			@@ -154,6 +154,7 @@
			let fightVC = HomeListenFightVC(listenType: .game2,quarter: weakSelf.quarter,week: weakSelf.week,day: day)
			fightVC.title = ListenType.game2.rawTitle
			fightVC.data = data
			fightVC.studyScheduleModel = self?.studyScheduleModel
			JQ_currentViewController().jq_push(vc: fightVC)
			}
			}).disposed(by: disposeBag)
			@@ -169,6 +170,7 @@
			let fightVC = HomeListenFightVC(listenType: .story1,quarter: weakSelf.quarter,week: weakSelf.week,day: day)
			fightVC.title = ListenType.story1.rawTitle
			fightVC.data = data
			fightVC.studyScheduleModel = self?.studyScheduleModel
			JQ_currentViewController().jq_push(vc: fightVC)
			}
			}).disposed(by: disposeBag)
			@@ -180,6 +182,7 @@
			let fightVC = HomeListenFightVC(listenType: .story2,quarter: weakSelf.quarter,week: weakSelf.week,day: day)
			fightVC.title = ListenType.story2.rawTitle
			fightVC.data = data
			fightVC.studyScheduleModel = self?.studyScheduleModel
			JQ_currentViewController().jq_push(vc: fightVC)
			}
			}).disposed(by: disposeBag)
			@@ -222,43 +225,59 @@
			case 0:
			cell.label_title.text = "自主学习1-听音选图"
			cell.view_bg2.backgroundColor = UIColor(hexString: "#6EC3FF")
			if (studyScheduleModel?.day ?? 0) > (page + 1){

			if studyScheduleModel?.day == (page + 1){
			cell.setProgress(progress: studyScheduleModel?.listen ?? 0)
			}else if (studyScheduleModel?.day ?? 0) > (page+1){
			cell.setProgress(progress: 100)
			}else{
			cell.setProgress(progress: studyScheduleModel?.listen ?? 0)
			cell.setProgress(progress: 0)
			}

			case 1:
			cell.label_title.text = "自主学习2-看图选音"
			cell.view_bg2.backgroundColor = UIColor(hexString: "#FF9A85")
			if (studyScheduleModel?.day ?? 0) > (page + 1){

			if studyScheduleModel?.day == (page + 1){
			cell.setProgress(progress: studyScheduleModel?.look ?? 0)
			}else if (studyScheduleModel?.day ?? 0) > (page+1){
			cell.setProgress(progress: 100)
			}else{
			cell.setProgress(progress: studyScheduleModel?.look ?? 0)
			cell.setProgress(progress: 0)
			}
			case 2:
			cell.label_title.text = "自主学习3-归纳排除"
			cell.view_bg2.backgroundColor = UIColor(hexString: "#28C8C5")
			if (studyScheduleModel?.day ?? 0) > (page + 1){


			if studyScheduleModel?.day == (page + 1){
			cell.setProgress(progress: studyScheduleModel?.induction ?? 0)
			}else if (studyScheduleModel?.day ?? 0) > (page+1){
			cell.setProgress(progress: 100)
			}else{
			cell.setProgress(progress: studyScheduleModel?.induction ?? 0)
			cell.setProgress(progress: 0)
			}
			case 3:
			cell.label_title.text = "自主学习4-有问有答"
			cell.view_bg2.backgroundColor = UIColor(hexString: "#F8A169")
			if (studyScheduleModel?.day ?? 0) > (page + 1){


			if studyScheduleModel?.day == (page + 1){
			cell.setProgress(progress: studyScheduleModel?.answer ?? 0)
			}else if (studyScheduleModel?.day ?? 0) > (page+1){
			cell.setProgress(progress: 100)
			}else{
			cell.setProgress(progress: studyScheduleModel?.answer ?? 0)
			cell.setProgress(progress: 0)
			}
			case 4:
			cell.label_title.text = "自主学习5-音图相配"
			cell.view_bg2.backgroundColor = UIColor(hexString: "#92CADB")
			if (studyScheduleModel?.day ?? 0) > (page + 1){

			if studyScheduleModel?.day == (page + 1){
			cell.setProgress(progress: studyScheduleModel?.pair ?? 0)
			}else if (studyScheduleModel?.day ?? 0) > (page+1){
			cell.setProgress(progress: 100)
			}else{
			cell.setProgress(progress: studyScheduleModel?.pair ?? 0)
			cell.setProgress(progress: 0)
			}
			default:break
			}