feat: user_information_page.dart

fixed: appbar style

feat: user_information_page.dart
fixed: appbar style
Key
1 parent b90a1518
Showing 22 changed files with 257 additions and 42 deletions
assets/images/bg_user_information_text.png
assets/images/ic_next.png
lib/app/app.dart
lib/common/blocs/cachebloc/cache_bloc.dart
lib/common/blocs/cachebloc/cache_event.dart
lib/common/blocs/cachebloc/cache_state.dart
lib/common/core/assets_const.dart
lib/common/request/apis.dart
lib/common/request/dao/user_dao.dart
lib/common/widgets/we_app_bar.dart
lib/models/user_entity.dart
lib/pages/home/widgets/home_tab_header_widget.dart
lib/pages/login/forgetpwd/forget_password_home_page.dart
lib/pages/login/setpwd/bloc/set_pwd_bloc.dart
lib/pages/login/setpwd/set_pwd_page.dart
lib/pages/practice/topic_picture_page.dart
lib/pages/user/information/user_information_bloc.dart
lib/pages/user/information/user_information_event.dart
lib/pages/user/information/user_information_page.dart
lib/pages/user/information/user_information_state.dart
@@ -4,6 +4,7 @@ import &#39;package:flutter_easyloading/flutter_easyloading.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:responsive_framework/breakpoint.dart';
 import 'package:responsive_framework/responsive_breakpoints.dart';
+import 'package:wow_english/common/blocs/cachebloc/cache_bloc.dart';
 import 'package:wow_english/common/widgets/hide_keyboard_widget.dart';
 import 'package:wow_english/pages/tab/blocs/tab_bloc.dart';
 import 'package:wow_english/route/route.dart';
@@ -18,6 +19,7 @@ class App extends StatelessWidget {
       builder: (_, __) => MultiBlocProvider(
           providers: [
             BlocProvider<TabBloc>(create: (_) => TabBloc()),
+            BlocProvider<CacheBloc>(create: (_) => CacheBloc()),
           ],
           child: HideKeyboard(
             child: MaterialApp(
@@ -4,5 +4,6 @@ part &#39;cache_event.dart&#39;;
 part 'cache_state.dart';
 class CacheBloc extends Bloc<CacheEvent, CacheState> {
+  /// app配置信息
   CacheBloc() : super(CacheInitial());
 }
 part of 'cache_bloc.dart';
 sealed class CacheEvent {}
+
+class CacheUserInfoUpdate extends CacheEvent {}
@@ -3,3 +3,5 @@ part of &#39;cache_bloc.dart&#39;;
 sealed class CacheState {}
 class CacheInitial extends CacheState {}
+
+class CacheUserInfoUpdated extends CacheState {}
@@ -2,5 +2,7 @@ class AssetsConst {
   static const String _assetImagePrefix = 'assets/images/';
   static const String wowLogo = '${_assetImagePrefix}wow_logo.png';
   static const String icVip = '${_assetImagePrefix}ic_vip.png';
+  static const String icNext = '${_assetImagePrefix}ic_next.png';
+  static const String bgUserInformationText = '${_assetImagePrefix}bg_user_information_text.png';
 //static String get icVip2 =>'ic_vip.png'.assetImg;
 }
@@ -25,11 +25,14 @@ class Apis {
   static const String initPassword = 'student/init/password';
   /// 修改密码
-  static const String changePassword = 'student/init/password';
+  static const String changePassword = 'student/change/password';
   /// 忘记密码
   static const String resetPassword = 'student/change/password';
+  /// 校验验证码，用于修改密码或忘记密码，验证码有效期2分钟
+  static const String checkSmsCode = 'student/check/code';
+
   /// 课程模块
   //  GET /home/courseModule
   //  接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897663
@@ -3,6 +3,8 @@ import &#39;package:wow_english/models/user_entity.dart&#39;;
 import '../request_client.dart';
+enum SmsType { login, change_passWord, stdDestroy }
+
 class UserDao {
   /// 登录
   static Future<UserEntity?> login(phoneNumber, type, checkKey, checkNumber) async {
@@ -26,6 +28,7 @@ class UserDao {
   }
   /// 发送验证码
+  /// [msgType] 消息类型 登录:login, 更改密码:change_passWord, 账号注销:stdDestroy
   static Future sendCode(phoneNumber, {smsType = 'login'}) async {
     final params = {'phoneNum': phoneNumber, 'smsType': smsType};
     await requestClient.post(Apis.sendSmsCode, data: params);
@@ -39,19 +42,30 @@ class UserDao {
   }
   /// 修改密码
+  /// [phoneNum] 手机号
   /// [password] 密码
-  static Future changePassword(String password) async {
-    final params = {'password': password};
+  /// [smsCode] 短信验证码
+  static Future changePassword(String phoneNum, String password, String smsCode) async {
+    final params = {'phoneNum': phoneNum, 'password': password, 'code': smsCode};
     await requestClient.post(Apis.changePassword, data: params);
   }
   /// 忘记密码
+  /// [phoneNum] 手机号
   /// [password] 密码
+  /// [smsCode] 短信验证码
   static Future resetPassword(String phoneNum, String password, String smsCode) async {
     final params = {'phoneNum': phoneNum, 'password': password, 'code': smsCode};
     await requestClient.post(Apis.resetPassword, data: params);
   }
+  /// 验证短信验证码
+  /// [msgType] 消息类型 登录:login, 更改密码:change_passWord, 账号注销:stdDestroy
+  static Future checkSmsCode(String phoneNum, String smsCode, String msgType) async {
+    final params = {'phoneNum': phoneNum, 'code': smsCode, 'msgType': msgType};
+    await requestClient.post(Apis.checkSmsCode, data: params);
+  }
+
   /// 获取用户信息
   static Future<UserEntity?> getUserInfo() async {
     return await requestClient.post(Apis.getUserInfo);
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 class WEAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -9,41 +10,49 @@ class WEAppBar extends StatelessWidget implements PreferredSizeWidget {
   final PreferredSizeWidget? bottom;
   final Widget? leading;
   final List<Widget>? actions;
-  const WEAppBar({
-    this.titleText,
-    this.centerTitle = true,
-    this.onBack,
-    this.backgroundColor,
-    this.bottom,
-    this.leading,
-    this.actions,
-    super.key});
+
+  const WEAppBar(
+      {this.titleText,
+      this.centerTitle = true,
+      this.onBack,
+      this.backgroundColor,
+      this.bottom,
+      this.leading,
+      this.actions,
+      super.key});
   @override
   Widget build(BuildContext context) {
     return AppBar(
       centerTitle: centerTitle,
-      title: Text(titleText??''),
-      leading: leading??GestureDetector(
-        onTap: () {
-          Navigator.pop(context);
-        },
-        child: Container(
-          alignment: Alignment.center,
-          child: Image.asset(
-            'back_around'.assetPng,
-            height: 40,
-            width: 40,
-          ),
+      title: Text(
+        titleText ?? '',
+        style: TextStyle(
+          fontSize: 25.sp,
+          color: const Color(0xFF333333),
+          fontWeight: FontWeight.w700,
         ),
       ),
-      backgroundColor: backgroundColor??Colors.white,
-      actions: actions??[],
+      leading: leading ??
+          GestureDetector(
+            onTap: () {
+              Navigator.pop(context);
+            },
+            child: Container(
+              alignment: Alignment.center,
+              child: Image.asset(
+                'back_around'.assetPng,
+                height: 40.h,
+                width: 40.w,
+              ),
+            ),
+          ),
+      backgroundColor: backgroundColor ?? Colors.white,
+      actions: actions ?? [],
     );
   }
   @override
   // TODO: implement preferredSize
-  Size get preferredSize => Size.fromHeight(
-      kToolbarHeight + (bottom == null ? 0.0 : bottom!.preferredSize.height));
-}
 \ No newline at end of file
+  Size get preferredSize => Size.fromHeight(kToolbarHeight + (bottom == null ? 0.0 : bottom!.preferredSize.height));
+}
@@ -18,7 +18,7 @@ class UserEntity {
   /// 性别：0, 1
   int? gender;
   String? avatarUrl;
-  String? phoneNum;
+  late String phoneNum;
   /// 用户信息是否填写 0.未填写 1.已经填写
   int? fillUserInfo;
@@ -63,7 +63,7 @@ class HomeTabHeaderWidget extends StatelessWidget {
                 border: Border.all(width: 1.0, color: const Color(0xFF140C10), style: BorderStyle.solid),
               ),
               child: Text(
-                UserUtil.getUser()?.name ?? '姓名丢了',
+                UserUtil.getUser()?.name ?? '未登录',
                 style: TextStyle(color: const Color(0xFF333333), fontSize: 16.sp),
               ),
             ),
@@ -39,7 +39,8 @@ class _ForgetPasswordHomePageView extends StatelessWidget {
             return;
           }
           // todo 后续需要改成在当前页面，验证过验证码后，再跳转到设置密码页面
-          SetPassWordPage.push(context, SetPwdPageType.changePwd, phoneNum: phoneNum, smsCode: smsCode);
+          // change_passWord
+          SetPassWordPage.push(context, SetPwdPageType.resetPwd, phoneNum: phoneNum, smsCode: smsCode);
         }
       },
       child: _buildForgetPwdView(),
@@ -131,12 +131,13 @@ class SetPwdBloc extends Bloc&lt;SetPwdEvent, SetPwdState&gt; {
     try {
       await loading(() async {
         switch (pageType) {
-          case SetPwdPageType.changePwd:
-            await UserDao.changePassword(passwordText);
-            break;
           case SetPwdPageType.initPwd:
             await UserDao.initPassword(passwordText);
             break;
+          case SetPwdPageType.changePwd:
+            // 现在走同一个流程和接口
+            /*await UserDao.changePassword(passwordText);
+            break;*/
           case SetPwdPageType.resetPwd:
             if (phoneNumber == null || phoneNumber!.isEmpty) {
               throw ApiException(ApiException.customErrorCode, '手机号为空');
@@ -15,7 +15,7 @@ enum SetPwdPageType {
   /// 忘记重设密码，必传手机号和验证码
   resetPwd,
-  /// 修改密码
+  /// 修改密码，必传手机号和验证码，现在和忘记密码走一样的流程
   changePwd,
 }
@@ -67,7 +67,7 @@ class _SetPassWordPageView extends StatelessWidget {
   }
   String _getTipsText() {
-    String text = '';
+    String text = '接下来请设置一下您的新密码吧！';
     switch (bloc.pageType) {
       case SetPwdPageType.initPwd:
@@ -458,4 +458,4 @@ class _TopicPicturePage extends StatelessWidget {
           ],
         );
       });
-}
 \ No newline at end of file
+}
+import 'package:bloc/bloc.dart';
+import 'package:meta/meta.dart';
+
+part 'user_information_event.dart';
+part 'user_information_state.dart';
+
+class UserInformationBloc extends Bloc<UserInformationEvent, UserInformationState> {
+  UserInformationBloc() : super(UserInformationInitial()) {
+    on<UserInformationEvent>((event, emit) {
+      // TODO: implement event handler
+    });
+  }
+}
+part of 'user_information_bloc.dart';
+
+@immutable
+abstract class UserInformationEvent {}
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/common/core/assets_const.dart';
+import 'package:wow_english/common/core/user_util.dart';
+import 'package:wow_english/common/widgets/we_app_bar.dart';
+import 'package:wow_english/models/user_entity.dart';
+import 'package:wow_english/utils/image_util.dart';
+
+import 'user_information_bloc.dart';
+
+class UserInformationPage extends StatelessWidget {
+  const UserInformationPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => UserInformationBloc(),
+      child: const _UserInformationView(),
+    );
+  }
+}
+
+class _UserInformationView extends StatelessWidget {
+  const _UserInformationView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocListener<UserInformationBloc, UserInformationState>(
+      listener: (context, state) {},
+      child: BlocBuilder<UserInformationBloc, UserInformationState>(builder: (context, state) {
+        return const _UserInformationContentView();
+      }),
+    );
+  }
+}
+
+class _UserInformationContentView extends StatelessWidget {
+  const _UserInformationContentView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    UserEntity user = UserUtil.getUser()!;
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: const WEAppBar(titleText: "个人信息",),
+      body: SingleChildScrollView(
+        padding: EdgeInsets.only(left: 17.w, right: 17.w, top: 10.h, bottom: 22.h),
+        child: Column(
+          children: [
+            buildContentRow(
+                '头像',
+                CircleAvatar(
+                  radius: 22.5.r,
+                  backgroundColor: Color(0xFF140C10),
+                  child: CircleAvatar(
+                    radius: 21.r,
+                    backgroundImage: ImageUtil.getImageProviderOnDefault(user.avatarUrl),
+                  ),
+                  /*child: ClipOval(
+                        child: OwImageWidget(name: user.avatarUrl ?? AssetsConst.wowLogo, fit: BoxFit.contain,),
+                      )*/
+                )),
+            11.verticalSpace,
+            buildContentRow(
+                '名字',
+                Text(
+                  user.name,
+                  style: TextStyle(
+                    fontWeight: FontWeight.w500,
+                    color: const Color(0xFF333333),
+                    fontSize: 21.sp,
+                  ),
+                )),
+            11.verticalSpace,
+            buildContentRow(
+                '年龄',
+                Text(
+                  user.age.toString(),
+                  style: TextStyle(
+                    fontWeight: FontWeight.w500,
+                    color: const Color(0xFF333333),
+                    fontSize: 21.sp,
+                  ),
+                )),
+            11.verticalSpace,
+            buildContentRow(
+                '性别',
+                Text(
+                  user.getGenderString(),
+                  style: TextStyle(
+                    fontWeight: FontWeight.w500,
+                    color: const Color(0xFF333333),
+                    fontSize: 21.sp,
+                  ),
+                )),
+            11.verticalSpace,
+            buildContentRow(
+              '账号',
+              Text(
+                user.phoneNum,
+                style: TextStyle(
+                  fontWeight: FontWeight.w500,
+                  color: const Color(0xFF999999),
+                  fontSize: 21.sp,
+                ),
+              ),
+              isHideEndIcon: true,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget buildContentRow(String filedName, Widget contentWidget, {bool isHideEndIcon = false, Function()? onTap}) {
+    return GestureDetector(
+        onTap: onTap,
+        child: Container(
+          padding: EdgeInsets.only(left: 16.w, right: 16.w, top: 18.h, bottom: 18.h),
+          decoration: BoxDecoration(
+              image: DecorationImage(
+                  image: ImageUtil.getImageProviderOnDefault(AssetsConst.bgUserInformationText), fit: BoxFit.fill)),
+          child: Row(children: [
+            Text(
+              filedName,
+              style: TextStyle(
+                fontWeight: FontWeight.w700,
+                color: const Color(0xFF999999),
+                fontSize: 21.sp,
+              ),
+            ),
+            32.horizontalSpace,
+            Expanded(
+                child: Container(
+              alignment: Alignment.centerLeft,
+              child: contentWidget,
+            )),
+            Offstage(
+              offstage: isHideEndIcon,
+              child: Image.asset(AssetsConst.icNext, width: 20.w, height: 25.h),
+            )
+          ]),
+        ));
+  }
+}
+part of 'user_information_bloc.dart';
+
+@immutable
+abstract class UserInformationState {}
+
+class UserInformationInitial extends UserInformationState {}
@@ -6,7 +6,6 @@ import &#39;package:wow_english/common/core/assets_const.dart&#39;;
 import 'package:wow_english/common/core/user_util.dart';
 import 'package:wow_english/common/widgets/we_app_bar.dart';
 import 'package:wow_english/models/user_entity.dart';
-import 'package:wow_english/pages/login/setpwd/set_pwd_page.dart';
 import 'package:wow_english/pages/user/bloc/user_bloc.dart';
 import 'package:wow_english/route/route.dart';
 import 'package:wow_english/utils/image_util.dart';
@@ -55,7 +54,7 @@ class _UserView extends StatelessWidget {
           );
           return Scaffold(
-              backgroundColor: Colors.white,
+              //backgroundColor: Colors.white,
               appBar: const WEAppBar(),
               body: SingleChildScrollView(
                 padding: EdgeInsets.only(left: 17.w, right: 17.w, top: 10.h, bottom: 22.h),
@@ -130,13 +129,15 @@ class _UserView extends StatelessWidget {
                             "修改个人信息>",
                             style: textStyle21sp,
                           ),
-                          onPressed: () {},
+                          onPressed: () {
+                            Navigator.of(AppRouter.context).pushNamed(AppRouteName.userInformation);
+                          },
                         )
                       ],
                     ),
                     30.verticalSpace,
                     OutlinedButton(
-                      onPressed: () => SetPassWordPage.push(context, SetPwdPageType.changePwd),
+                      onPressed: () => Navigator.of(context).pushNamed(AppRouteName.fogPwd),
                       style: normalButtonStyle,
                       child: Text(
                         "修改密码",
@@ -14,6 +14,7 @@ import &#39;package:wow_english/pages/shop/exchane/exchange_lesson_page.dart&#39;;
 import 'package:wow_english/pages/shop/exchangelist/exchange_lesson_list_page.dart';
 import 'package:wow_english/pages/shop/home/shop_home_page.dart';
 import 'package:wow_english/pages/tab/tab_page.dart';
+import 'package:wow_english/pages/user/information/user_information_page.dart';
 import 'package:wow_english/pages/user/user_page.dart';
 import 'package:wow_english/pages/video/lookvideo/look_video_page.dart';
@@ -39,7 +40,12 @@ class AppRouteName {
   static const String voicePic = 'voicePic';
   static const String voiceWord = 'voiceWord';
   static const String voiceAnswer = 'voiceAnswer';
+
+  /// 用户个人主页
   static const String user = 'user';
+
+  /// 用户详细信息页
+  static const String userInformation = 'userInformation';
   static const String lookVideo = 'lookVideo';
   static const String reading = 'reading';
@@ -88,6 +94,8 @@ class AppRouter {
         return CupertinoPageRoute(builder: (_) => const RepeatAfterPage());
       case AppRouteName.user:
         return CupertinoPageRoute(builder: (_) => const UserPage());
+      case AppRouteName.userInformation:
+        return CupertinoPageRoute(builder: (_) => const UserInformationPage());
       case AppRouteName.topicPic:
         return CupertinoPageRoute(builder: (_) => const TopicPicturePage());
       case AppRouteName.lookVideo: