22b7d4da
Key
feat: user, api path
|
1
|
import 'package:flutter/material.dart';
|
18699a34
Key
fixed: 客服手机,手机规则教研
|
2
|
import 'package:flutter/services.dart';
|
089ccd5c
Key
fixed: user util ...
|
3
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
e12dbc82
Key
user module
|
4
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
18699a34
Key
fixed: 客服手机,手机规则教研
|
5
|
import 'package:url_launcher/url_launcher.dart';
|
8d1f93b4
吴启风
feat:隐藏组件优化
|
6
|
import 'package:wow_english/common/core/app_config_helper.dart';
|
c61b3c1a
Key
feat: toast_util....
|
7
|
import 'package:wow_english/common/core/app_consts.dart';
|
e12dbc82
Key
user module
|
8
|
import 'package:wow_english/common/core/assets_const.dart';
|
aa4e28be
Key
removed: cache_bl...
|
9
|
import 'package:wow_english/common/core/user_util.dart';
|
bb0406fb
Key
feat: 账户注销
|
10
|
import 'package:wow_english/common/dialogs/show_dialog.dart';
|
4b358e22
liangchengyou
feat:调整文件结构
|
11
|
import 'package:wow_english/common/widgets/we_app_bar.dart';
|
089ccd5c
Key
fixed: user util ...
|
12
|
import 'package:wow_english/models/user_entity.dart';
|
e12dbc82
Key
user module
|
13
|
import 'package:wow_english/pages/user/bloc/user_bloc.dart';
|
c95453ce
Key
feat: User界面完善
|
14
|
import 'package:wow_english/route/route.dart';
|
c61b3c1a
Key
feat: toast_util....
|
15
|
import 'package:wow_english/utils/image_util.dart';
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
16
|
import 'package:wow_english/utils/toast_util.dart';
|
22b7d4da
Key
feat: user, api path
|
17
18
19
20
21
22
|
class UserPage extends StatelessWidget {
const UserPage({super.key});
@override
Widget build(BuildContext context) {
|
c948a9ea
liangchengyou
feat:个人信息更改模块功能
|
23
|
return _UserView();
|
e12dbc82
Key
user module
|
24
25
26
27
|
}
}
class _UserView extends StatelessWidget {
|
49e626e9
Key
feat: log_util.dart
|
28
29
|
final String bannerUrl = '';
|
8b5ef002
xiaoyu
添加打开游戏的测试代码
|
30
|
/// 方法
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
31
32
|
final MethodChannel methodChannel =
const MethodChannel('wow_english/game_method_channel');
|
8b5ef002
xiaoyu
添加打开游戏的测试代码
|
33
|
|
e12dbc82
Key
user module
|
34
35
|
@override
Widget build(BuildContext context) {
|
c61b3c1a
Key
feat: toast_util....
|
36
37
|
return _pageWidget();
}
|
c95453ce
Key
feat: User界面完善
|
38
|
|
c61b3c1a
Key
feat: toast_util....
|
39
|
Widget _pageWidget() => BlocBuilder<UserBloc, UserState>(
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
40
41
42
|
builder: (context, state) {
UserEntity user = UserUtil.getUser()!;
final userBloc = BlocProvider.of<UserBloc>(context);
|
c95453ce
Key
feat: User界面完善
|
43
|
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
44
45
46
47
48
49
|
// 常规按钮的字体样式
final textStyle21sp = TextStyle(
//fontWeight: FontWeight.w600,
color: const Color(0xFF333333),
fontSize: 21.sp,
);
|
c61b3c1a
Key
feat: toast_util....
|
50
|
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
51
52
53
54
55
56
57
58
59
|
// 常规按钮的样式
var normalButtonStyle = ButtonStyle(
side: MaterialStateProperty.all(
BorderSide(color: const Color(0xFF140C10), width: 1.5.w)),
shape: MaterialStateProperty.all(RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15.r))),
minimumSize: MaterialStateProperty.all(Size(double.infinity, 58.h)),
backgroundColor: MaterialStateProperty.all(Colors.white),
);
|
c61b3c1a
Key
feat: toast_util....
|
60
|
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
return Scaffold(
appBar: WEAppBar(
onBack: () {
popPage(data: {'exchange': userBloc.exchangeResult});
},
),
body: SingleChildScrollView(
padding: EdgeInsets.only(
left: 17.w, right: 17.w, top: 10.h, bottom: 22.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
// todo banner,暂时没有接口获取banner URL
/*Offstage(
|
c9df43c8
Key
feat: 修改个人信息、接口
|
75
76
77
78
79
80
81
|
child: Column(
children: [
Container(child: Image.asset(bannerUrl), constraints: BoxConstraints(maxHeight: 196.h)),
30.verticalSpace,
],
),
),*/
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
82
83
84
85
86
87
88
89
90
91
92
93
94
|
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
CircleAvatar(
radius: 40.r,
backgroundColor: const Color(0xFF140C10),
child: CircleAvatar(
radius: 38.5.r,
backgroundImage:
ImageUtil.getImageProviderOnDefault(
user.avatarUrl),
),
/*child: ClipOval(
|
c61b3c1a
Key
feat: toast_util....
|
95
96
|
child: OwImageWidget(name: user.avatarUrl ?? AssetsConst.wowLogo, fit: BoxFit.contain,),
)*/
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
97
98
99
100
|
),
32.horizontalSpace,
Expanded(
child: Column(
|
c61b3c1a
Key
feat: toast_util....
|
101
102
|
children: [
Row(
|
c95453ce
Key
feat: User界面完善
|
103
|
children: [
|
c61b3c1a
Key
feat: toast_util....
|
104
105
106
107
108
109
110
111
112
113
|
LimitedBox(
maxWidth: 220.w,
child: Text(
user.name,
//'1231231231312312312312312312312312312312312312312',
style: textStyle21sp,
overflow: TextOverflow.ellipsis,
),
),
14.horizontalSpace,
|
c95453ce
Key
feat: User界面完善
|
114
|
Text(
|
c61b3c1a
Key
feat: toast_util....
|
115
116
117
118
119
|
user.getGenderString(),
style: textStyle21sp,
),
14.horizontalSpace,
Offstage(
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
120
121
|
offstage: user.effectiveDate == null ||
AppConfigHelper.shouldHidePay(),
|
c61b3c1a
Key
feat: toast_util....
|
122
123
124
|
child: Image.asset(
AssetsConst.icVip,
height: 18.h,
|
c95453ce
Key
feat: User界面完善
|
125
126
127
128
|
),
)
],
),
|
c61b3c1a
Key
feat: toast_util....
|
129
|
Offstage(
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
130
131
|
offstage: user.effectiveDate == null ||
AppConfigHelper.shouldHidePay(),
|
c61b3c1a
Key
feat: toast_util....
|
132
133
134
|
child: Row(
children: [
Text(
|
7d417b04
吴启风
feat:fix用户vip到期日问题
|
135
|
"${user.getEffectiveDate()} 到期",
|
c61b3c1a
Key
feat: toast_util....
|
136
137
138
139
140
141
142
143
144
145
|
style: TextStyle(
color: const Color(0xFFE11212),
fontSize: 17.sp,
),
)
],
),
)
],
)),
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
|
TextButton(
child: Text(
"修改个人信息>",
style: textStyle21sp,
),
onPressed: () {
pushNamed(AppRouteName.userInformation);
},
)
],
),
30.verticalSpace,
// 打开游戏界面 供审核用
((UserUtil.getUser()?.phoneNum == '17730280759' ||
UserUtil.getUser()?.phoneNum == '17718485544')
? OutlinedButton(
onPressed: () {
methodChannel
.invokeMethod('openGamePage', {"gameId": 1});
},
style: normalButtonStyle,
child: Text(
"进入游戏",
style: textStyle21sp,
),
)
: 1.verticalSpace),
((UserUtil.getUser()?.phoneNum == '17730280759' ||
UserUtil.getUser()?.phoneNum == '17718485544')
? 12.verticalSpace
: 1.verticalSpace),
|
82c8633c
biao
音频添加 页面优化
|
177
|
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
Offstage(
offstage: AppConfigHelper.shouldHidePay(),
child: OutlinedButton(
onPressed: () =>
pushNamed(AppRouteName.exLesson).then((value) => {
if (value != null)
{
userBloc.exchangeResult =
value['exchange']
}
}),
style: normalButtonStyle,
child: Text(
"兑换课程",
style: textStyle21sp,
)),
),
|
dae2a16e
吴启风
feat:我的页面间距修改
|
195
196
197
198
|
Offstage(
offstage: AppConfigHelper.shouldHidePay(),
child: 12.verticalSpace,
),
|
82c8633c
biao
音频添加 页面优化
|
199
|
OutlinedButton(
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
200
201
202
203
204
205
206
207
208
209
|
onPressed: () {
_showCustomerServiceDialog(context);
},
style: normalButtonStyle,
child: Text(
"联系客服",
style: textStyle21sp,
)),
12.verticalSpace,
OutlinedButton(
|
82c8633c
biao
音频添加 页面优化
|
210
211
212
213
214
215
216
|
onPressed: () => pushNamed(AppRouteName.fogPwd),
style: normalButtonStyle,
child: Text(
"修改密码",
style: textStyle21sp,
),
),
|
dae2a16e
吴启风
feat:我的页面间距修改
|
217
|
12.verticalSpace,
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
218
219
220
221
|
OutlinedButton(
onPressed: () {
pushNamed(AppRouteName.webView, arguments: {
'urlStr': AppConsts.userPrivacyPolicyUrl,
|
bdd7ee99
Key
隐私协议文案及新入口
|
222
|
'webViewTitle': '用户协议'
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
223
224
225
226
|
});
},
style: normalButtonStyle,
child: Text(
|
bdd7ee99
Key
隐私协议文案及新入口
|
227
228
229
230
231
232
233
234
235
236
237
238
239
240
|
"用户协议",
style: textStyle21sp,
)),
12.verticalSpace,
OutlinedButton(
onPressed: () {
pushNamed(AppRouteName.webView, arguments: {
'urlStr': AppConsts.childrenPrivacyPolicyUrl,
'webViewTitle': '儿童隐私政策'
});
},
style: normalButtonStyle,
child: Text(
"儿童隐私政策",
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
241
242
243
244
245
|
style: textStyle21sp,
)),
12.verticalSpace,
OutlinedButton(
onPressed: () {
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
|
pushNamed(AppRouteName.setting);
},
style: normalButtonStyle,
child: Text(
"设置",
style: textStyle21sp,
)),
30.verticalSpace,
OutlinedButton(
onPressed: () {
showTwoActionDialog(
barrierDismissible: false,
'提示',
'取消',
'确认',
'您确认要退出Wow English吗?', leftTap: () {
popPage();
}, rightTap: () {
popPage();
userBloc.add(UserLogout());
});
},
style: ButtonStyle(
side: MaterialStateProperty.all(const BorderSide(
color: Color(0xFF140C10), width: 1.5)),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15.r))),
minimumSize:
MaterialStateProperty.all(Size(295.w, 40.h)),
backgroundColor: MaterialStateProperty.all(
const Color(0xFFFBB621)),
),
child: Text(
"退出登录",
style: TextStyle(
//fontWeight: FontWeight.w600,
color: Colors.white,
fontSize: 17.sp,
),
)),
// 30.verticalSpace,
// TextButton(
// onPressed: () {
// //userBloc.add(UserDelete())
// showTwoActionDialog('注销账号', '取消', '注销', '请谨慎操作!\n注销后不可恢复哦!', () {
// popPage();
// }, () {
// userBloc.add(UserDelete());
// popPage();
// });
// },
// child: Text(
// "注销账号",
// style: TextStyle(
// //fontWeight: FontWeight.w600,
// color: Colors.red,
// fontSize: 15.sp,
// ),
// )),
|
c61b3c1a
Key
feat: toast_util....
|
306
307
|
],
),
|
e6a08b82
biao
修复兑换之后回到首页不刷新问题;修...
|
308
309
310
|
));
},
);
|
dfd4d15d
xiaoyu
添加联系客服功能
|
311
|
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
|
Future<void> _showCustomerServiceDialog(BuildContext context) async {
try {
final config = await AppConfigHelper.getAppConfig();
if (!context.mounted) {
return;
}
final mobileList = config?.customerMobileList
.map((mobile) => mobile.trim())
.where((mobile) => mobile.isNotEmpty)
.toSet()
.toList() ??
[];
if (mobileList.isEmpty) {
showToast('暂无客服联系方式');
return;
}
_showMobileSelectionDialog(context, mobileList);
} catch (_) {
if (context.mounted) {
showToast('客服联系方式获取失败,请稍后重试');
}
}
}
void _showMobileSelectionDialog(
BuildContext context, List<String> mobileList) {
|
85a4efde
吴启风
feat: 修改客服电话2个展示
|
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
|
showModalBottomSheet(
context: context,
backgroundColor: Colors.white,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
isScrollControlled: true,
builder: (BuildContext context) {
return SafeArea(
child: Container(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 12),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// 拖拽指示器
Container(
width: 40,
height: 4,
margin: const EdgeInsets.only(bottom: 6),
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: BorderRadius.circular(2),
),
),
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
363
|
// 客服手机号列表
|
85a4efde
吴启风
feat: 修改客服电话2个展示
|
364
365
366
367
|
Flexible(
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
368
369
370
371
372
373
374
375
376
|
children:
List.generate(mobileList.length * 2 - 1, (index) {
if (index.isOdd) {
return const Divider(height: 1);
}
final mobile = mobileList[index ~/ 2];
return ListTile(
contentPadding: const EdgeInsets.symmetric(
horizontal: 8, vertical: 4),
|
85a4efde
吴启风
feat: 修改客服电话2个展示
|
377
|
title: Text(
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
378
|
mobile,
|
85a4efde
吴启风
feat: 修改客服电话2个展示
|
379
380
381
382
383
384
|
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.w600,
color: Colors.black87,
),
),
|
85a4efde
吴启风
feat: 修改客服电话2个展示
|
385
386
387
388
389
390
391
|
trailing: Icon(
Icons.phone,
color: Colors.green[600],
size: 18,
),
onTap: () {
Navigator.pop(context);
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
392
|
_launchPhone(mobile);
|
85a4efde
吴启风
feat: 修改客服电话2个展示
|
393
|
},
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
394
395
|
);
}),
|
85a4efde
吴启风
feat: 修改客服电话2个展示
|
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
|
),
),
),
const SizedBox(height: 6),
// 取消按钮
SizedBox(
width: double.infinity,
child: OutlinedButton(
onPressed: () {
Navigator.pop(context);
},
style: OutlinedButton.styleFrom(
padding: const EdgeInsets.symmetric(vertical: 6),
side: BorderSide(color: Colors.grey[300]!),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
),
child: Text(
'取消',
style: TextStyle(
fontSize: 14.sp,
color: Colors.grey[600],
),
),
),
),
],
),
),
);
},
);
}
|
dfd4d15d
xiaoyu
添加联系客服功能
|
431
|
void _launchPhone(String phone) async {
|
6770c637
吴启风
feat: 动态配置客服联系方式
|
432
433
434
|
final phoneUri = Uri(scheme: 'tel', path: phone);
if (await canLaunchUrl(phoneUri)) {
await launchUrl(phoneUri);
|
dfd4d15d
xiaoyu
添加联系客服功能
|
435
436
437
438
|
} else {
throw 'Could not phone $phone';
}
}
|
22b7d4da
Key
feat: user, api path
|
439
|
}
|