暂时关闭修改个人信息

Key
1 parent e6a4e63c
Showing 6 changed files with 46 additions and 12 deletions
lib/common/request/config.dart
lib/common/request/dao/user_dao.dart
lib/pages/user/bloc/user_bloc.dart
lib/pages/user/bloc/user_event.dart
lib/pages/user/information/user_information_page.dart
lib/pages/user/modify/modify_user_information_page.dart
+import 'package:flutter/foundation.dart';
+
 ///request config
 class RequestConfig {
-  static String baseUrl = 'http://wow-app.dev.kouyuxingqiu.com/';
+  static String baseUrlDev = 'http://wow-app.dev.kouyuxingqiu.com/';
+  static String baseUrlProd = 'http://app-api.pro.kouyuxingqiu.com/';
+  static String baseUrl = kDebugMode ? baseUrlDev : baseUrlProd;
+
   static const connectTimeout = Duration(seconds: 15);
   static const successCode = 200;
 }
@@ -78,7 +78,9 @@ class UserDao {
     return await requestClient.put(Apis.setUserInfo, data: userEntity.toUpdateJson());
   }
  
-  static Future updateUserInfoField({name, age, gender, avatarUrl}) async {
+  /// 更新用户信息指定字段
+  static Future updateUserInfoField({String? name, int? age, int? gender, String? avatarUrl}) async {
+    Log.d('name=$name, age=$age, gender=$gender, avatarUrl=$avatarUrl');
     final Map<String, dynamic> data = <String, dynamic>{};
     if (name != null) {
       data['name'] = name;
@@ -11,16 +11,22 @@ part &#39;user_state.dart&#39;;
  
 class UserBloc extends Bloc<UserEvent, UserState> {
   final TextEditingController modifyTextController = TextEditingController();
+  int tempGender = 0;
  
   UserBloc() : super(UserInitial()) {
     on<UserLogout>(_logout);
     on<UserUpdate>(_updateUser);
+    on<UserUIUpdate>(_updateUIUser);
   }
  
   void _logout(UserLogout event, Emitter<UserState> emitter) async {
     await UserDao.logout();
   }
  
+  void _updateUIUser(UserUIUpdate event, Emitter<UserState> emitter) async {
+    emitter(UserInfoUpdated());
+  }
+
   void _updateUser(UserUpdate event, Emitter<UserState> emitter) async {
     Log.d('_updateUser, event: ${event.type}, emitter.isDone: ${emitter.isDone}, text=${modifyTextController.text}');
     UserEntity user = UserUtil.getUser()!;
@@ -40,8 +46,14 @@ class UserBloc extends Bloc&lt;UserEvent, UserState&gt; {
         break;
       case ModifyUserInformationType.age:
         // todo 校验格式
-        int age = modifyTextController.text as int;
         try {
+          int age;
+          try {
+            age = modifyTextController.text as int;
+          } catch (e) {
+            Log.w(e.toString());
+            throw '年龄格式错误';
+          }
           await UserDao.updateUserInfoField(age: age);
           // 修改成功，更新本地缓存及UI
           user.age = age;
@@ -52,10 +64,11 @@ class UserBloc extends Bloc&lt;UserEvent, UserState&gt; {
         break;
       case ModifyUserInformationType.gender:
         try {
-          await UserDao.updateUserInfoField(gender: user.gender);
+          await UserDao.updateUserInfoField(gender: tempGender);
+          user.gender = tempGender;
           emitter(UserInfoUpdated());
         } catch (e) {
-          Log.e('_updateUser age, e: $e');
+          Log.e('_updateUser gender, e: $e');
         }
         break;
     }
@@ -11,3 +11,9 @@ class UserUpdate extends UserEvent {
  
   UserUpdate(this.type);
 }
+
+class UserUIUpdate extends UserEvent {
+  final ModifyUserInformationType type;
+
+  UserUIUpdate(this.type);
+}
@@ -44,7 +44,8 @@ class _UserInformationContentView extends StatelessWidget {
  
   void _openModifyPage(BuildContext context, ModifyUserInformationType type) {
     Log.d('_openModifyPage($type)');
-    ModifyUserInformationPage.push(context, type);
+    // 暂时关闭修改，修复后打开
+    //ModifyUserInformationPage.push(context, type);
   }
  
   @override
@@ -115,6 +115,7 @@ class ModifyUserInformationPage extends StatelessWidget {
   Widget _buildTextFieldWidget(BuildContext context) {
     var userBloc = context.read<UserBloc>();
     var user = UserUtil.getUser()!;
+    userBloc.tempGender = user.gender ?? 0;
     Log.d('user = $user');
     if (type == ModifyUserInformationType.gender) {
       return Row(
@@ -133,16 +134,19 @@ class ModifyUserInformationPage extends StatelessWidget {
               activeColor: const Color(0xFF0E89BA),
               value: 0,
               //selected: user.gender == 0,
-              groupValue: user.gender,
+              groupValue: userBloc.tempGender,
               onChanged: (value) {
                 Log.d('男value = $value');
-                user.gender = value as int;
+                if (value != null) {
+                  userBloc.tempGender = value;
+                }
+                userBloc.add(UserUIUpdate(type));
               },
             ),
           ),
           SizedBox(
             width: 100.w,
-            child: RadioListTile(
+            child: RadioListTile<int>(
               //selected: user.gender == 1,
               title: Text(
                 '女',
@@ -154,10 +158,13 @@ class ModifyUserInformationPage extends StatelessWidget {
               ),
               activeColor: const Color(0xFF0E89BA),
               value: 1,
-              groupValue: user.gender,
-              onChanged: (value) {
+              groupValue: userBloc.tempGender,
+              onChanged: (int? value) {
                 Log.d('女value = $value');
-                user.gender = value as int;
+                if (value != null) {
+                  userBloc.tempGender = value;
+                }
+                userBloc.add(UserUIUpdate(type));
               },
             ),
           ),