3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
1
|
import 'package:flutter/cupertino.dart';
|
95edef4f
liangchengyou
feat:更新适配代码
|
2
|
import 'package:flutter/material.dart';
|
60e47f7c
liangchengyou
feat:课程选择功能
|
3
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
d35a4e87
liangchengyou
feat:磨耳朵功能UI
|
4
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
5
|
import 'package:nested_scroll_views/material.dart';
|
f5fc01c1
liangchengyou
feat:修复首页进入个人信息页闪退问题
|
6
|
import 'package:wow_english/common/core/user_util.dart';
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
7
|
import 'package:wow_english/common/utils/click_with_music_controller.dart';
|
2187c85f
吴启风
feat:课程结构调整
|
8
|
import 'package:wow_english/models/course_unit_entity.dart';
|
46675a89
吴启风
feat:过渡页-视频环节
|
9
|
import 'package:wow_english/pages/section/section_type.dart';
|
e620143b
吴启风
feat:单元&课程解锁状态蒙层ui
|
10
|
import 'package:wow_english/pages/section/widgets/section_item.dart';
|
2187c85f
吴启风
feat:课程结构调整
|
11
12
|
import 'package:wow_english/pages/section/widgets/section_bouns_item.dart';
import 'package:wow_english/pages/section/widgets/section_header_widget.dart';
|
60e47f7c
liangchengyou
feat:课程选择功能
|
13
|
import 'package:wow_english/route/route.dart';
|
025d8543
biao
首页gametime播放修改
|
14
|
import 'package:wow_english/utils/audio_player_util.dart';
|
c61b3c1a
Key
feat: toast_util....
|
15
|
import 'package:wow_english/utils/toast_util.dart';
|
95edef4f
liangchengyou
feat:更新适配代码
|
16
|
|
2187c85f
吴启风
feat:课程结构调整
|
17
|
import '../../models/course_section_entity.dart';
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
18
|
import '../../utils/log_util.dart';
|
2187c85f
吴启风
feat:课程结构调整
|
19
|
import 'bloc/section_bloc.dart';
|
68dd7ba8
liangchengyou
feat:首页主题颜色+已知问题修改
|
20
|
import 'courese_module_model.dart';
|
4b358e22
liangchengyou
feat:调整文件结构
|
21
|
|
2187c85f
吴启风
feat:课程结构调整
|
22
23
|
/// 环节列表页
class SectionPage extends StatelessWidget {
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
24
|
const SectionPage(
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
25
|
{super.key, required this.courseUnitEntity, required this.courseUnitId});
|
8988aa69
liangchengyou
feat:首页+课程列表数据获取
|
26
|
|
2187c85f
吴启风
feat:课程结构调整
|
27
28
29
|
final CourseUnitEntity courseUnitEntity;
/// unitId
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
30
|
final int courseUnitId;
|
95edef4f
liangchengyou
feat:更新适配代码
|
31
32
33
|
@override
Widget build(BuildContext context) {
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
34
35
36
|
int initialPage = courseUnitEntity.courseUnitVOList
?.indexWhere((element) => element.id == courseUnitId) ??
0;
|
60e47f7c
liangchengyou
feat:课程选择功能
|
37
|
return BlocProvider(
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
38
39
40
41
42
|
create: (context) => SectionBloc(
courseUnitEntity,
initialPage,
PageController(initialPage: initialPage),
ScrollController(),
|
5e2bbbd3
biao
添加音频
|
43
44
|
ScrollController())
..add(InitEvent()),
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
45
|
//为了触发指示器进入后计算位置
|
0cbdbb34
吴启风
feat:环节列表页返回单元列表页...
|
46
|
// ..add(CurrentUnitIndexChangeEvent(initialPage)),
|
2187c85f
吴启风
feat:课程结构调整
|
47
|
child: _SectionPageView(context),
|
60e47f7c
liangchengyou
feat:课程选择功能
|
48
49
50
51
|
);
}
}
|
2187c85f
吴启风
feat:课程结构调整
|
52
53
|
class _SectionPageView extends StatelessWidget {
const _SectionPageView(this.context);
|
454dc387
吴启风
feat:原阶段选择页(首页)增加...
|
54
55
56
|
final BuildContext context;
|
60e47f7c
liangchengyou
feat:课程选择功能
|
57
58
|
@override
Widget build(BuildContext context) {
|
2187c85f
吴启风
feat:课程结构调整
|
59
|
final bloc = BlocProvider.of<SectionBloc>(context);
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
60
|
final clickController = ClickWithMusicController.instance;
|
2187c85f
吴启风
feat:课程结构调整
|
61
|
return BlocListener<SectionBloc, SectionState>(
|
523864dd
吴启风
feat:音频播放单例增加声明周期感知
|
62
|
listener: (context, state) async {
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
63
|
if (state is RequestEnterClassState) {
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
64
65
66
67
68
69
70
|
final courseType = state.courseType;
final courseLessonId = state.courseLessonId;
if (courseType == SectionType.song.value ||
courseType == SectionType.video.value) {
final title =
courseType == SectionType.song.value ? 'song' : 'video';
final AudioPlayerUtilType audioType;
|
1e22b7d1
吴启风
feat:儿歌/视频环节接口请求时机优化
|
71
|
|
1e22b7d1
吴启风
feat:儿歌/视频环节接口请求时机优化
|
72
|
///儿歌/视频类型
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
73
|
if (courseType == SectionType.song.value) {
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
74
|
audioType = AudioPlayerUtilType.musicTime;
|
82c8633c
biao
音频添加 页面优化
|
75
|
} else {
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
76
|
audioType = AudioPlayerUtilType.videoTime;
|
82c8633c
biao
音频添加 页面优化
|
77
|
}
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
78
|
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
79
80
|
clickController.playMusicAndPerformAction(context, audioType,
() async {
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
81
|
///播放音乐->调进入课程接口->跳转课程页面
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
82
83
|
await bloc.requestEnterClass(courseLessonId, () {
Log.d("WQF request finish");
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
84
85
86
|
pushNamed(AppRouteName.lookVideo, arguments: {
'videoUrl': null,
'title': title,
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
87
|
'courseLessonId': courseLessonId,
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
88
89
90
91
92
93
94
95
96
97
98
99
100
|
'isTopic': true
}).then((value) {
if (value != null) {
Map<String, dynamic> dataMap =
value as Map<String, dynamic>;
bloc.add(RequestEndClassEvent(
dataMap['courseLessonId']!, dataMap['isCompleted'],
currentTime: dataMap['currentTime'],
autoNextSection: dataMap['nextSection']));
}
AudioPlayerUtil.getInstance()
.playAudio(AudioPlayerUtilType.countWithMe);
});
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
101
102
|
}, onRequestEnterFailed: (error) {
Log.d("WQF requestEnterClass failed $error");
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
103
|
});
|
1e22b7d1
吴启风
feat:儿歌/视频环节接口请求时机优化
|
104
|
});
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
105
106
107
|
return;
}
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
108
|
if (courseType == SectionType.pictureBook.value) {
|
523864dd
吴启风
feat:音频播放单例增加声明周期感知
|
109
|
//绘本
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
110
|
clickController.playMusicAndPerformAction(
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
111
|
context, AudioPlayerUtilType.readingTime, () async {
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
await bloc.requestEnterClass(courseLessonId, () {
pushNamed(AppRouteName.reading,
arguments: {'courseLessonId': courseLessonId})
.then((value) {
if (value != null) {
Map<String, dynamic> dataMap =
value as Map<String, dynamic>;
bloc.add(RequestEndClassEvent(
dataMap['courseLessonId']!,
dataMap['isCompleted'],
currentStep: dataMap['currentStep'],
autoNextSection: dataMap['nextSection'],
));
AudioPlayerUtil.getInstance()
.playAudio(AudioPlayerUtilType.countWithMe);
}
});
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
129
|
});
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
130
|
});
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
131
132
133
|
return;
}
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
134
|
if (courseType == SectionType.practice.value) {
|
2187c85f
吴启风
feat:课程结构调整
|
135
|
//练习
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
136
|
clickController.playMusicAndPerformAction(
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
137
|
context, AudioPlayerUtilType.quizTime, () async {
|
0493c104
吴启风
feat:带音乐点击防抖函数优化
|
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
await bloc.requestEnterClass(courseLessonId, () {
pushNamed(AppRouteName.topicPic,
arguments: {'courseLessonId': courseLessonId})
.then((value) {
if (value != null) {
Map<String, dynamic> dataMap =
value as Map<String, dynamic>;
bloc.add(RequestEndClassEvent(
dataMap['courseLessonId']!, dataMap['isCompleted'],
currentStep: dataMap['currentStep'],
autoNextSection: dataMap['nextSection']));
}
AudioPlayerUtil.getInstance()
.playAudio(AudioPlayerUtilType.countWithMe);
});
|
cd32eb01
吴启风
feat:播放音乐防抖处理(课程环节页)
|
153
|
});
|
934e2b47
liangchengyou
feat:权限调整+课程进度接口对接
|
154
|
});
|
3c1d5c64
liangchengyou
feat:练习功能完成
|
155
156
|
return;
}
|
3c1d5c64
liangchengyou
feat:练习功能完成
|
157
158
|
}
},
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
159
|
child: _sectionView(),
|
95edef4f
liangchengyou
feat:更新适配代码
|
160
161
|
);
}
|
d35a4e87
liangchengyou
feat:磨耳朵功能UI
|
162
|
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
163
|
Widget _sectionView() =>
|
2187c85f
吴启风
feat:课程结构调整
|
164
165
|
BlocBuilder<SectionBloc, SectionState>(builder: (context, state) {
final bloc = BlocProvider.of<SectionBloc>(context);
|
68dd7ba8
liangchengyou
feat:首页主题颜色+已知问题修改
|
166
167
168
169
170
171
172
|
return Scaffold(
body: Container(
color: Colors.white,
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
|
2187c85f
吴启风
feat:课程结构调整
|
173
|
SectionHeaderWidget(
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
174
|
title: bloc.getCourseUnitDetail().name,
|
0cbdbb34
吴启风
feat:环节列表页返回单元列表页...
|
175
176
177
178
179
180
|
courseModuleCode: bloc.courseUnitEntity.courseModuleCode,
onBack: () {
popPage(data: {
'needRefresh': bloc.courseUnitEntityChanged,
});
}),
|
68dd7ba8
liangchengyou
feat:首页主题颜色+已知问题修改
|
181
|
Expanded(
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
|
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),
child: NestedPageView.builder(
itemCount: bloc.unlockPageCount(),
controller: bloc.pageController,
onPageChanged: (int index) {
bloc.add(CurrentUnitIndexChangeEvent(index));
},
itemBuilder: (context, index) {
return ScrollConfiguration(
///去掉 Android 上默认的边缘拖拽效果
behavior: ScrollConfiguration.of(context)
.copyWith(overscroll: false),
child: _itemTransCard(
bloc.getCourseUnitDetail(pageIndex: index),
index,
context),
);
}),
)),
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
202
|
SafeArea(
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
|
child: SizedBox(
width: 210.w,
height: 40.h,
// child: OverflowBox(
// maxWidth: 300, // 允许内容超出容器宽度
child: ListView.builder(
controller: bloc.indicatorSrollController,
scrollDirection: Axis.horizontal,
itemCount: bloc.unlockPageCount(),
itemBuilder: (context, index) {
bool isSelected = index == bloc.currentPage;
// 计算透明度,使得当前页的指示器不透明,两侧逐渐透明
double opacity = 0.25 +
(1 - ((bloc.currentPage - index).abs() / 2)) *
0.5;
// 限制透明度在 0.5 到 1.0 之间
opacity = opacity.clamp(0.25, 1.0);
return GestureDetector(
onTap: () => bloc.pageController.animateToPage(
index,
duration: const Duration(milliseconds: 60),
curve: Curves.ease),
child: SizedBox(
width: 30.0.w,
height: 30.0.h,
child: Padding(
padding:
EdgeInsets.all(isSelected ? 0.w : 5.w),
child: Opacity(
opacity: opacity,
child: Container(
alignment: Alignment.center,
decoration: BoxDecoration(
color: isSelected
? Colors.blue
: Colors.grey,
shape: BoxShape.circle,
),
child: Text("${index + 1}",
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize:
isSelected ? 12.sp : 8.sp)),
),
),
),
),
);
})),
),
// )
|
68dd7ba8
liangchengyou
feat:首页主题颜色+已知问题修改
|
255
256
257
|
],
),
),
|
d35a4e87
liangchengyou
feat:磨耳朵功能UI
|
258
|
),
|
68dd7ba8
liangchengyou
feat:首页主题颜色+已知问题修改
|
259
260
|
);
});
|
056970d8
Key
feat: api
|
261
|
}
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
262
|
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
263
264
|
Widget _itemTransCard(
CourseUnitDetail courseUnitDetail, int pageIndex, BuildContext context) {
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
265
|
final bloc = BlocProvider.of<SectionBloc>(context);
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
|
List<CourseSectionEntity>? courseSectionEntities =
bloc.courseSectionDatasMap[courseUnitDetail.id];
if (courseSectionEntities == null) {
bloc.add(RequestDataEvent(courseUnitDetail.id!));
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Text(
'暂无数据',
style: TextStyle(fontSize: 24.0),
),
const SizedBox(height: 16.0),
// 间距
CircularProgressIndicator(
color: CourseModuleModel(
bloc.courseUnitEntity.courseModuleCode ?? 'Phase-1')
.color),
// 加载动画
],
),
);
} else {
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
|
return NestedListView.builder(
itemCount: bloc.courseSectionDatasMap[courseUnitDetail.id]?.length ?? 0,
scrollDirection: Axis.horizontal,
itemBuilder: (BuildContext context, int index) {
CourseSectionEntity sectionData = courseSectionEntities[index];
if (sectionData.courseType == SectionType.bouns.value) {
//彩蛋
return GestureDetector(
onTap: () {
if (!UserUtil.isLogined()) {
pushNamed(AppRouteName.login);
return;
}
if (sectionData.lock == true) {
showToast('当前课程暂未解锁');
return;
}
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
306
|
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
|
///进入课堂
bloc.add(RequestEnterClassEvent(
sectionData.id.toString(), sectionData.courseType));
},
child: SectionBoundsItem(
imageUrl: sectionData.coverUrl,
),
);
} else {
return GestureDetector(
onTap: () {
if (!UserUtil.isLogined()) {
pushNamed(AppRouteName.login);
return;
}
if (sectionData.lock == true) {
showToast('当前课程暂未解锁');
return;
}
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
326
|
|
8df5fbf9
吴启风
feat:单元列表页由于ios嵌套...
|
327
328
329
330
331
332
333
334
335
336
337
|
///进入课堂
bloc.add(RequestEnterClassEvent(
sectionData.id.toString(), sectionData.courseType));
},
child: SectionItem(
courseModuleId: bloc.courseUnitEntity.courseModuleCode,
lessons: sectionData,
),
);
}
});
|
66a7e3e7
吴启风
feat:退出课堂和结束课堂优化
|
338
|
}
|
3ba925a9
吴启风
feat:环节页增加翻页切换单元效果
|
339
|
}
|