d35a4e87
liangchengyou
feat:磨耳朵功能UI
|
1
|
import 'package:flutter/cupertino.dart';
|
8988aa69
liangchengyou
feat:首页+课程列表数据获取
|
2
|
import 'package:flutter/foundation.dart';
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
3
|
import 'package:flutter/material.dart';
|
d35a4e87
liangchengyou
feat:磨耳朵功能UI
|
4
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
5
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
2187c85f
吴启风
feat:课程结构调整
|
6
|
import 'package:wow_english/common/request/dao/lesson_dao.dart';
|
13e6d11d
liangchengyou
feat:首页课程模块接口
|
7
|
import 'package:wow_english/common/request/exception.dart';
|
3c1d5c64
liangchengyou
feat:练习功能完成
|
8
|
import 'package:wow_english/common/request/dao/listen_dao.dart';
|
025d8543
biao
首页gametime播放修改
|
9
|
import 'package:wow_english/utils/audio_player_util.dart';
|
13e6d11d
liangchengyou
feat:首页课程模块接口
|
10
|
import 'package:wow_english/utils/loading.dart';
|
c61b3c1a
Key
feat: toast_util....
|
11
|
import 'package:wow_english/utils/toast_util.dart';
|
60e47f7c
liangchengyou
feat:课程选择功能
|
12
|
|
2187c85f
吴启风
feat:课程结构调整
|
13
14
|
import '../../../models/course_section_entity.dart';
import '../../../models/course_unit_entity.dart';
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
15
|
import '../../../utils/list_ext.dart';
|
26982eea
吴启风
feat:环节页点击节流优化
|
16
|
import '../../../utils/log_util.dart';
|
60e47f7c
liangchengyou
feat:课程选择功能
|
17
|
|
2187c85f
吴启风
feat:课程结构调整
|
18
|
part 'section_event.dart';
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
19
|
|
2187c85f
吴启风
feat:课程结构调整
|
20
|
part 'section_state.dart';
|
8988aa69
liangchengyou
feat:首页+课程列表数据获取
|
21
|
|
2187c85f
吴启风
feat:课程结构调整
|
22
|
class SectionBloc extends Bloc<SectionEvent, SectionState> {
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
23
24
25
26
27
28
29
30
31
32
33
34
35
|
PageController _pageController;
PageController get pageController => _pageController;
///当前页索引
int _currentPage = 0;
int get currentPage => _currentPage;
ScrollController _listController;
ScrollController get listController => _listController;
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
36
37
38
39
|
ScrollController _indicatorSrollController;
ScrollController get indicatorSrollController => _indicatorSrollController;
|
2187c85f
吴启风
feat:课程结构调整
|
40
41
42
43
|
CourseUnitEntity _courseUnitEntity;
CourseUnitEntity get courseUnitEntity => _courseUnitEntity;
|
0cbdbb34
吴启风
feat:环节列表页返回单元列表页...
|
44
45
46
|
///单元列表是否有刷新,有的话返回上一页时通知其刷新接口数据
bool courseUnitEntityChanged = false;
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
47
48
|
///courseUnitId与课程环节列表的映射
final Map<int, List<CourseSectionEntity>?> _courseSectionDatasMap = {};
|
2187c85f
吴启风
feat:课程结构调整
|
49
|
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
50
51
|
Map<int, List<CourseSectionEntity>?> get courseSectionDatasMap =>
_courseSectionDatasMap;
|
8988aa69
liangchengyou
feat:首页+课程列表数据获取
|
52
|
|
26982eea
吴启风
feat:环节页点击节流优化
|
53
54
55
|
///点击环节后先请求数据再进入,标志位避免频繁点击多次请求(以及多次进入)
bool _isRequesting = false;
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
56
|
SectionBloc(this._courseUnitEntity, this._currentPage, this._pageController,
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
57
|
this._listController, this._indicatorSrollController)
|
22f36232
吴启风
feat:过渡页-练习环节
|
58
|
: super(LessonInitial()) {
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
59
|
on<RequestDataEvent>(_requestSectionsData);
|
46675a89
吴启风
feat:过渡页-视频环节
|
60
|
on<RequestEndClassEvent>(_requestEndClass);
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
61
|
on<RequestEnterClassEvent>(_requestEnterClass);
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
62
|
on<CurrentUnitIndexChangeEvent>(_pageControllerChange);
|
2d1ead53
吴启风
feat:背景音播放优化
|
63
64
|
on<InitEvent>((event, emit) async {
await AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.countWithMe);
|
5e2bbbd3
biao
添加音频
|
65
66
|
});
}
|
5e2bbbd3
biao
添加音频
|
67
|
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
68
|
void _requestSectionsData(
|
22f36232
吴启风
feat:过渡页-练习环节
|
69
|
RequestDataEvent event, Emitter<SectionState> emitter) async {
|
993c1a04
liangchengyou
feat:添加数据模型
|
70
71
|
try {
await loading(() async {
|
5e2bbbd3
biao
添加音频
|
72
73
|
List<CourseSectionEntity>? courseSectionEntities =
await LessonDao.courseSection(courseUnitId: event.courseUnitId);
|
42cf5d28
吴启风
feat:环节数据接口请求优化,解...
|
74
75
|
if (courseSectionEntities != null) {
_courseSectionDatasMap[event.courseUnitId] =
|
5e2bbbd3
biao
添加音频
|
76
|
await LessonDao.courseSection(courseUnitId: event.courseUnitId);
|
42cf5d28
吴启风
feat:环节数据接口请求优化,解...
|
77
78
|
emitter(LessonDataLoadState());
}
|
993c1a04
liangchengyou
feat:添加数据模型
|
79
80
81
|
});
} catch (e) {
if (e is ApiException) {
|
c61b3c1a
Key
feat: toast_util....
|
82
|
showToast(e.message.toString());
|
13e6d11d
liangchengyou
feat:首页课程模块接口
|
83
84
85
|
}
}
}
|
3c1d5c64
liangchengyou
feat:练习功能完成
|
86
|
|
22f36232
吴启风
feat:过渡页-练习环节
|
87
88
|
void _requestEnterClass(
RequestEnterClassEvent event, Emitter<SectionState> emitter) async {
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
89
|
try {
|
26982eea
吴启风
feat:环节页点击节流优化
|
90
91
92
93
94
|
Log.d("WQF _requestVideoLesson _isRequesting=$_isRequesting");
if (_isRequesting) {
return;
}
_isRequesting = true;
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
95
|
await loading(() async {
|
22f36232
吴启风
feat:过渡页-练习环节
|
96
97
|
await ListenDao.enterClass(event.courseLessonId);
emitter(RequestEnterClassState(event.courseLessonId, event.courseType));
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
98
99
100
|
});
} catch (e) {
if (e is ApiException) {
|
22f36232
吴启风
feat:过渡页-练习环节
|
101
|
showToast(e.message ?? '请求失败,请检查网络连接');
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
102
|
}
|
1e22b7d1
吴启风
feat:儿歌/视频环节接口请求时机优化
|
103
104
|
} finally {
_isRequesting = false;
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
105
106
107
|
}
}
|
22f36232
吴启风
feat:过渡页-练习环节
|
108
109
|
void _requestEndClass(
RequestEndClassEvent event, Emitter<SectionState> emitter) async {
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
110
111
|
if (event.isCompleted) {
await await ListenDao.endClass(event.courseLessonId,
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
112
|
currentStep: event.currentStep, currentTime: event.currentTime);
|
22f36232
吴启风
feat:过渡页-练习环节
|
113
|
} else {
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
114
|
await await ListenDao.exitClass(event.courseLessonId,
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
115
|
currentStep: event.currentStep, currentTime: event.currentTime);
|
22f36232
吴启风
feat:过渡页-练习环节
|
116
|
}
|
46675a89
吴启风
feat:过渡页-视频环节
|
117
|
if (event.autoNextSection) {
|
22f36232
吴启风
feat:过渡页-练习环节
|
118
|
final nextCourseSection =
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
119
|
await getNextCourseSection(int.parse(event.courseLessonId), emitter);
|
336074ab
吴启风
feat:过渡页-绘本环节跨单元处理
|
120
121
|
if (nextCourseSection != null) {
///进入课堂
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
122
123
|
add(RequestEnterClassEvent(
nextCourseSection.id.toString(), nextCourseSection.courseType));
|
336074ab
吴启风
feat:过渡页-绘本环节跨单元处理
|
124
|
}
|
46675a89
吴启风
feat:过渡页-视频环节
|
125
|
}
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
126
|
}
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
127
|
|
22f36232
吴启风
feat:过渡页-练习环节
|
128
129
|
void _pageControllerChange(
CurrentUnitIndexChangeEvent event, Emitter<SectionState> emitter) async {
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
130
|
_currentPage = event.unitIndex;
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
double indicatorWidth = 30.0.w; // 指示器宽度
// 计算选中项的偏移量
double offset = _currentPage * indicatorWidth -
(_indicatorSrollController.position.viewportDimension -
indicatorWidth) /
2;
// 确保偏移量在合理范围内
if (offset < 0) {
offset = 0;
} else if (offset >
unlockPageCount() * indicatorWidth -
_indicatorSrollController.position.viewportDimension) {
offset = unlockPageCount() * indicatorWidth -
_indicatorSrollController.position.viewportDimension;
}
_indicatorSrollController.animateTo(
offset,
duration: const Duration(milliseconds: 250),
curve: Curves.easeInOut,
);
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
153
154
155
|
emitter(CurrentPageIndexState());
}
|
336074ab
吴启风
feat:过渡页-绘本环节跨单元处理
|
156
|
///未锁定的页(单元)数
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
157
|
int unlockPageCount() {
|
0cbdbb34
吴启风
feat:环节列表页返回单元列表页...
|
158
159
160
161
162
|
// return _courseUnitEntity.courseUnitVOList
// ?.indexWhereOrNull((element) => element.lock == true) ??
// _courseUnitEntity.courseUnitVOList?.length ??
// 0;
return _courseUnitEntity.courseUnitVOList?.length ?? 0;
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
163
|
}
|
46675a89
吴启风
feat:过渡页-视频环节
|
164
|
|
336074ab
吴启风
feat:过渡页-绘本环节跨单元处理
|
165
|
///当前页的课程详情
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
|
CourseUnitDetail getCourseUnitDetail({int? pageIndex}) {
return _courseUnitEntity.courseUnitVOList![pageIndex ?? _currentPage];
}
///根据courseLessonId查找对应的courseSection
CourseSectionEntity? findCourseSectionById(int courseLessonId) {
for (var entry in courseSectionDatasMap.entries) {
var sectionList = entry.value;
if (sectionList != null) {
for (var section in sectionList) {
if (section.id == courseLessonId) {
return section;
}
}
}
}
return null;
}
///根据sortOrder查找对应的courseSection
CourseSectionEntity? findCourseSectionBySort(int sortOrder) {
for (var entry in courseSectionDatasMap.entries) {
var sectionList = entry.value;
if (sectionList != null) {
for (var section in sectionList) {
if (section.sortOrder == sortOrder) {
return section;
}
}
}
}
return null;
}
///根据courseLessonId查找对应的CourseUnitDetail
CourseUnitDetail? findCourseUnitDetailById(int courseLessonId) {
final curCourseSectionEntity = findCourseSectionById(courseLessonId);
if (curCourseSectionEntity != null) {
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
204
|
final curCourseUnitDetail = _courseUnitEntity.courseUnitVOList
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
205
|
?.firstWhereOrNull(
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
206
|
(element) => element.id == curCourseSectionEntity.courseUnitId);
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
207
208
209
210
211
|
return curCourseUnitDetail;
}
return null;
}
|
336074ab
吴启风
feat:过渡页-绘本环节跨单元处理
|
212
|
///根据courseLessonId查找下一个courseSection
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
213
214
|
Future<CourseSectionEntity?> getNextCourseSection(
int courseLessonId, Emitter<SectionState> emitter) async {
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
215
216
|
final curCourseSectionEntity = findCourseSectionById(courseLessonId);
final curSectionSort = curCourseSectionEntity?.sortOrder ?? 0;
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
217
|
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
218
219
220
221
|
try {
///查找当前unit的下一个section
CourseSectionEntity? nextCourseSectionEntity =
findCourseSectionBySort(curSectionSort + 1);
|
5e2bbbd3
biao
添加音频
|
222
223
|
return checkCourseSectionLocked(
courseLessonId, nextCourseSectionEntity, emitter);
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
224
225
226
227
228
229
230
231
232
|
} catch (e) {
if (e is ApiException) {
showToast(e.message.toString());
}
return null;
}
}
///检查section是否锁定
|
5e2bbbd3
biao
添加音频
|
233
234
235
|
Future<CourseSectionEntity?> checkCourseSectionLocked(
int courseLessonId,
CourseSectionEntity? courseSectionEntity,
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
236
237
238
239
240
241
242
243
|
Emitter<SectionState> emitter) async {
if (courseSectionEntity != null) {
if (courseSectionEntity.lock == false) {
///如果section没锁,直接返回
return courseSectionEntity;
} else {
///如果section锁了,请求当前unit下的section数据,查询解锁状态
int courseUnitId = courseSectionEntity.courseUnitId;
|
5e2bbbd3
biao
添加音频
|
244
|
CourseSectionEntity? result = await loading(() async {
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
245
|
List<CourseSectionEntity>? tempSectionEntities =
|
5e2bbbd3
biao
添加音频
|
246
|
await LessonDao.courseSection(courseUnitId: courseUnitId);
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
247
248
249
250
251
|
if (tempSectionEntities != null) {
_courseSectionDatasMap[courseUnitId] = tempSectionEntities;
emitter(LessonDataLoadState());
}
courseSectionEntity = tempSectionEntities?.firstWhereOrNull(
|
5e2bbbd3
biao
添加音频
|
252
|
(element) => element.id == courseSectionEntity?.id);
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
253
254
255
256
257
258
259
260
261
|
if (courseSectionEntity?.lock == false) {
///刷新后的数据如果解锁了,直接返回
return courseSectionEntity;
} else {
///请求失败或者锁定状态没变(没变就感觉状态异常了,理论上不应该进入这条分支),返回null
showToast('下个课程还没解锁哦');
return null;
}
});
|
9e085b2a
吴启风
feat:异步返回优化
|
262
|
return result;
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
263
|
}
|
46675a89
吴启风
feat:过渡页-视频环节
|
264
|
} else {
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
265
|
///section为空说明当前unit学完了,找下一个unit。(跨unit选section)
|
1ebed821
吴启风
feat:修复所有unit解锁态下...
|
266
|
///先根据courseLessonId找出当前的unit
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
267
|
final curCourseUnitDetail = findCourseUnitDetailById(courseLessonId);
|
46675a89
吴启风
feat:过渡页-视频环节
|
268
|
if (curCourseUnitDetail != null) {
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
269
270
|
///再根据当前unit的sortOrder找出下一个unit
CourseUnitDetail? nextCourseUnitDetail =
|
5e2bbbd3
biao
添加音频
|
271
272
|
_courseUnitEntity.courseUnitVOList?.firstWhereOrNull((element) =>
element.sortOrder == (curCourseUnitDetail.sortOrder! + 1));
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
273
|
|
46675a89
吴启风
feat:过渡页-视频环节
|
274
|
if (nextCourseUnitDetail != null) {
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
275
276
|
if (nextCourseUnitDetail.lock == true) {
///如果下一个unit是锁定状态,请求数据刷新查询解锁状态
|
9e085b2a
吴启风
feat:异步返回优化
|
277
|
CourseSectionEntity? result = await loading(() async {
|
5e2bbbd3
biao
添加音频
|
278
279
280
|
CourseUnitEntity? newCourseUnitEntity =
await LessonDao.courseUnit(
_courseUnitEntity.nowCourseModuleId);
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
281
282
|
///拿到重新获取到的unit后,再次判断是否解锁
|
5e2bbbd3
biao
添加音频
|
283
284
|
nextCourseUnitDetail = newCourseUnitEntity?.courseUnitVOList
?.firstWhereOrNull(
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
285
286
287
288
|
(element) => element.id == nextCourseUnitDetail?.id);
if (nextCourseUnitDetail?.lock == false) {
///解锁状态从锁定到解锁,覆盖原unit数据并刷新ui
_courseUnitEntity = newCourseUnitEntity!;
|
0cbdbb34
吴启风
feat:环节列表页返回单元列表页...
|
289
|
courseUnitEntityChanged = true;
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
290
291
|
emitter(LessonDataLoadState());
|
5e2bbbd3
biao
添加音频
|
292
293
|
return checkCourseSectionLockedOfNextUnit(
courseLessonId, nextCourseUnitDetail!.id!, emitter);
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
294
295
296
297
298
299
|
} else {
showToast('下个单元课程还没解锁哦');
///如果还是锁定状态,返回null
return null;
}
|
336074ab
吴启风
feat:过渡页-绘本环节跨单元处理
|
300
|
});
|
9e085b2a
吴启风
feat:异步返回优化
|
301
|
return result;
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
302
|
} else {
|
5e2bbbd3
biao
添加音频
|
303
304
|
return checkCourseSectionLockedOfNextUnit(
courseLessonId, nextCourseUnitDetail.id!, emitter);
|
336074ab
吴启风
feat:过渡页-绘本环节跨单元处理
|
305
|
}
|
46675a89
吴启风
feat:过渡页-视频环节
|
306
|
} else {
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
307
|
showToast("恭喜你,本阶段学到顶啦");
|
5e2bbbd3
biao
添加音频
|
308
|
|
46675a89
吴启风
feat:过渡页-视频环节
|
309
310
311
312
313
314
315
316
|
///最后一个unit了
return null;
}
} else {
///找不到对应的unitDetail,理论上不可能
return null;
}
}
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
317
318
319
|
}
///检查下一个unit的(第一个)section
|
5e2bbbd3
biao
添加音频
|
320
321
322
|
Future<CourseSectionEntity?> checkCourseSectionLockedOfNextUnit(
int courseLessonId,
int nextCourseUnitDetailId,
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
323
|
Emitter<SectionState> emitter) async {
|
5e2bbbd3
biao
添加音频
|
324
325
|
CourseSectionEntity? firstSectionNextUnit =
await getFirstSectionByUnitId(nextCourseUnitDetailId, emitter);
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
326
327
|
if (firstSectionNextUnit != null) {
///下个unit的第一个section如果不为空,再次检查是否锁定
|
5e2bbbd3
biao
添加音频
|
328
329
|
CourseSectionEntity? courseSectionEntity = await checkCourseSectionLocked(
courseLessonId, firstSectionNextUnit, emitter);
|
009cf00d
吴启风
feat:环节&单元解锁逻辑
|
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
|
if (courseSectionEntity != null) {
///只有是下一unit的第一个section并且解锁了,才跳转
_pageController.nextPage(
duration: const Duration(milliseconds: 250),
curve: Curves.ease,
);
}
return courseSectionEntity;
} else {
///下个unit的第一个section如果为空,返回null
showToast('下个课程暂未找到');
return null;
}
}
///根据unitId获取当前unit的第一个section
Future<CourseSectionEntity?> getFirstSectionByUnitId(
int courseUnitId, Emitter<SectionState> emitter) async {
List<CourseSectionEntity>? courseSectionEntity =
_courseSectionDatasMap[courseUnitId];
if (courseSectionEntity == null) {
///如果没下载过,请求数据
await loading(() async {
_courseSectionDatasMap[courseUnitId] =
await LessonDao.courseSection(courseUnitId: courseUnitId);
emitter(LessonDataLoadState());
});
}
return _courseSectionDatasMap[courseUnitId]?.first;
|
46675a89
吴启风
feat:过渡页-视频环节
|
359
|
}
|
60e47f7c
liangchengyou
feat:课程选择功能
|
360
|
}
|