feat:头像上传功能完善逻辑

liangchengyou
1 parent 9efff6ae
Showing 7 changed files with 54 additions and 31 deletions
lib/pages/user/bloc/user_bloc.dart
lib/pages/user/information/user_information_page.dart
lib/pages/user/modify/modify_user_avatar_page.dart
lib/pages/user/modify/user_avatar_bloc/user_avatar_bloc.dart
lib/pages/user/modify/user_avatar_bloc/user_avatar_event.dart
lib/pages/user/modify/user_avatar_bloc/user_avatar_state.dart
lib/utils/aliyun_oss_util.dart
@@ -37,6 +37,15 @@ class UserBloc extends Bloc&lt;UserEvent, UserState&gt; {
     UserEntity user = UserUtil.getUser()!;
     switch (event.type) {
       case ModifyUserInformationType.avatar:
+        String avatarUrl = event.content;
+        try {
+          await UserDao.updateUserInfoField(avatarUrl: avatarUrl);
+          // 修改成功，更新本地缓存及UI
+          user.avatarUrl = avatarUrl;
+          emitter(UserInfoUpdated());
+        } catch (e) {
+          Log.e('_updateUser avatarUrl, e: $e');
+        }
         break;
       case ModifyUserInformationType.name:
         String name = event.content;
@@ -54,7 +54,7 @@ class _UserInformationContentView extends StatelessWidget {
                     backgroundImage: ImageUtil.getImageProviderOnDefault(user.avatarUrl),
                   ),
                 ),
-              onTap: () => pushNamed(AppRouteName.userAvatar)
+              onTap: () => pushNamed(AppRouteName.userAvatar,arguments: {'pageType':'1'})
             ),
             11.verticalSpace,
             _buildContentRow(
@@ -8,8 +8,11 @@ import &#39;package:wow_english/common/widgets/ow_image_widget.dart&#39;;
 import 'package:wow_english/common/widgets/we_app_bar.dart';
 import 'package:wow_english/pages/user/bloc/user_bloc.dart';
 import 'package:wow_english/pages/user/modify/user_avatar_bloc/user_avatar_bloc.dart';
+import 'package:wow_english/route/route.dart';
 import 'package:wow_english/utils/toast_util.dart';
  
+import 'modify_user_information_page.dart';
+
 class ModifyUserAvatarPage extends StatelessWidget {
   const ModifyUserAvatarPage({super.key, required this.pageType});
  
@@ -36,13 +39,18 @@ class _ModifyUserAvatarPage extends StatelessWidget {
         BlocListener<UserBloc,UserState>(
             listener: (context, state){
               if (state is UserInfoUpdated) {
-                showToast('修改成功');
+                if (pageType == 1) {
+                  showToast('修改成功');
+                  popPage();
+                } else {
+                  context.read<UserAvatarBloc>().add(ChangeUserEnterAppStateEvent());
+                }
               }
             }),
         BlocListener<UserAvatarBloc,UserAvatarState>(
           listener: (context,state){
             if (state is ChangeImageState) {
-              showToast('上传图片');
+              context.read<UserBloc>().add(UserUpdate(ModifyUserInformationType.avatar,state.imageUrl));
             }
           },)
       ],
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:wow_english/common/core/assets_const.dart';
@@ -12,7 +13,7 @@ part &#39;user_avatar_event.dart&#39;;
 part 'user_avatar_state.dart';
  
 class UserAvatarBloc extends Bloc<UserAvatarEvent, UserAvatarState> {
-  String _imageUrl = UserUtil.getUser()!.avatarUrl ?? AssetsConst.wowLogo;
+  final String _imageUrl = UserUtil.getUser()!.avatarUrl ?? AssetsConst.wowLogo;
  
   String get imageUrl => _imageUrl;
  
@@ -27,27 +28,18 @@ class UserAvatarBloc extends Bloc&lt;UserAvatarEvent, UserAvatarState&gt; {
   final ImagePicker picker = ImagePicker();
  
   UserAvatarBloc() : super(UserAvatarInitial()) {
-    on<ChangeImageEvent>(_changeImage);
     on<GetImageFromPhotoEvent>(_getImageFromPhoto);
     on<GetImageFromCameraEvent>(_getImageFromCamera);
+    on<ChangeUserEnterAppStateEvent>(_changeUserEnterAppState);
   }
  
-  Future<void> _uploadAvatar(String imagePath) async {
+  Future<String> _uploadAvatar(String imagePath) async {
     // todo 加个loading UI
     String avatarUrl = await AliyunOssUtil.uploadFile(imagePath);
+    debugPrint('>>>>>>>>>>阿里云图片地址$avatarUrl');
     // 上传服务器
-    await UserDao.updateUserInfoField(avatarUrl: avatarUrl);
-    _imageUrl = avatarUrl;
-  }
-
-  void _changeImage(ChangeImageEvent event, Emitter<UserAvatarState> emitter) async {
-    //_imageUrl = event.imagePath;
-    try {
-      await _uploadAvatar(event.imagePath);
-      emitter(ChangeImageState());
-    } catch (e) {
-      Log.e('上传头像失败：$e');
-    }
+    // await UserDao.updateUserInfoField(avatarUrl: avatarUrl);
+    return avatarUrl;
   }
  
   void _getImageFromPhoto(GetImageFromPhotoEvent event, Emitter<UserAvatarState> emitter) async {
@@ -58,12 +50,11 @@ class UserAvatarBloc extends Bloc&lt;UserAvatarEvent, UserAvatarState&gt; {
       }
       _file = await picker.pickImage(source: ImageSource.gallery);
       try {
-        await _uploadAvatar(_file!.path);
-        emitter(ChangeImageState());
+        final urlStr = await _uploadAvatar(_file!.path);
+        emitter(ChangeImageState(urlStr));
       } catch (e) {
         Log.e('上传头像失败：$e');
       }
-      //emitter(ChangeImageState());
     });
   }
  
@@ -75,8 +66,8 @@ class UserAvatarBloc extends Bloc&lt;UserAvatarEvent, UserAvatarState&gt; {
       }
       _file = await picker.pickImage(source: ImageSource.camera);
       try {
-        await _uploadAvatar(_file!.path);
-        emitter(ChangeImageState());
+        final urlStr = await _uploadAvatar(_file!.path);
+        emitter(ChangeImageState(urlStr));
       } catch (e) {
         Log.e('上传头像失败：$e');
       }
@@ -84,6 +75,11 @@ class UserAvatarBloc extends Bloc&lt;UserAvatarEvent, UserAvatarState&gt; {
     });
   }
  
+  void _changeUserEnterAppState(ChangeUserEnterAppStateEvent event,Emitter<UserAvatarState> emitter) async {
+    _canInsertApp = true;
+    emitter(ChangeUserEnterAppState());
+  }
+
   ///获取相机权限
   Future<bool> getCameraPermissionStatus() async {
     Permission permission = Permission.camera;
@@ -7,7 +7,5 @@ class GetImageFromPhotoEvent extends UserAvatarEvent {}
  
 class GetImageFromCameraEvent extends UserAvatarEvent {}
  
-class ChangeImageEvent extends UserAvatarEvent {
-  final String imagePath;
-  ChangeImageEvent(this.imagePath);
-}
+class ChangeUserEnterAppStateEvent extends UserAvatarEvent {}
+
@@ -5,4 +5,9 @@ abstract class UserAvatarState {}
  
 class UserAvatarInitial extends UserAvatarState {}
  
-class ChangeImageState extends UserAvatarState {}
+class ChangeImageState extends UserAvatarState {
+  final String imageUrl;
+  ChangeImageState(this.imageUrl);
+}
+
+class ChangeUserEnterAppState extends UserAvatarState{}
 \ No newline at end of file
 import 'package:dio/dio.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter_oss_aliyun/flutter_oss_aliyun.dart';
 import 'package:wow_english/common/request/request_client.dart';
 import 'package:wow_english/models/aliyun_oss_upload_sts_entity.dart';
@@ -12,7 +13,12 @@ class AliyunOssUtil {
     String fileName = filePath.substring(filePath.lastIndexOf("/") + 1, filePath.length);
     Log.d("待上传文件fileName: $fileName");
     // 获取鉴权信息
-    AliyunOssUploadStsEntity stsEntity = await _getSts(fileName);
+    AliyunOssUploadStsEntity? stsEntity = await _getSts(fileName);
+    if(stsEntity == null) {
+      // todo 为空的情况抛出错误
+      return '';
+    }
+    debugPrint('鉴权信息$stsEntity');
     // 鉴权
     Client.init(
       ossEndpoint: stsEntity.endpoint,
@@ -43,8 +49,9 @@ class AliyunOssUtil {
   }
  
   /// 获取鉴权信息
-  static Future<AliyunOssUploadStsEntity> _getSts(String fileName) async {
-    var result = await requestClient.get(Apis.aliyunOssSts, queryParameters: {'fileName': fileName});
+  static Future<AliyunOssUploadStsEntity?> _getSts(String fileName) async {
+    var result = await requestClient.get<AliyunOssUploadStsEntity>(Apis.aliyunOssSts, queryParameters: {'fileName': fileName});
+    debugPrint('鉴权结果$result');
     return result;
   }
 }