feat: 登录时账户有效性校验

Key
1 parent fc75f209
Showing 14 changed files with 86 additions and 25 deletions
android/app/src/main/AndroidManifest.xml
android/app/src/main/res/mipmap-hdpi/ic_launcher.png
android/app/src/main/res/mipmap-mdpi/ic_launcher.png
android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
lib/app/splash_page.dart
lib/common/core/user_util.dart
lib/common/request/apis.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/user_page.dart
lib/utils/log_util.dart
 <manifest xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="wow_english"
+        android:label="Wow English"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">
 import 'dart:async';
 import 'dart:io';
+import 'dart:math';
  
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:limiting_direction_csx/limiting_direction_csx.dart';
 import 'package:wow_english/common/core/user_util.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/common/request/config.dart';
+import 'package:wow_english/common/request/dao/user_dao.dart';
 import 'package:wow_english/models/user_entity.dart';
 import 'package:wow_english/route/route.dart';
+import 'package:wow_english/utils/log_util.dart';
 import 'package:wow_english/utils/sp_util.dart';
-import 'package:flutter/services.dart';
-import 'package:limiting_direction_csx/limiting_direction_csx.dart';
  
 class SplashPage extends StatelessWidget {
   const SplashPage({super.key});
@@ -33,12 +37,27 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
   Future startTime() async {
     // 判断是否登录
     UserEntity? userEntity = UserUtil.getUser();
+    Log.d('当前模式：kDebugMode=$kDebugMode, kProfileMode=$kProfileMode, kReleaseMode=$kReleaseMode');
+    Log.d('当前API地址：${RequestConfig.baseUrl}');
     if (kDebugMode) {
-      print('Splash读本地userEntity: $userEntity');
+      Log.d('Splash读本地userEntity: $userEntity');
+    }
+    int apartInMilliseconds = 0;
+    // 调一下接口判断一下有效性再往下
+    if (userEntity != null) {
+      DateTime startTime = DateTime.now();
+      try {
+        userEntity = await UserDao.getUserInfo();
+        UserUtil.saveUser(userEntity);
+      } catch (e) {
+        e.logE();
+      }
+      apartInMilliseconds = DateTime.now().difference(startTime).inMilliseconds;
     }
-    Timer(const Duration(seconds: 2), () {
+    Log.d('Splash getUserInfo 耗时：${apartInMilliseconds}ms');
+    int duration = max(2000 - apartInMilliseconds, 0);
+    Timer(Duration(milliseconds: duration), () {
       if (userEntity != null) {
-        // todo 调一下接口判断一下有效性再往下
         pushNamedAndRemoveUntil(AppRouteName.home, (route) => false);
       } else {
         pushNamedAndRemoveUntil(AppRouteName.login, (route) => false);
@@ -64,7 +83,7 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
     if (Platform.isIOS) {
       await LimitingDirectionCsx.setScreenDirection(DeviceDirectionMask.Landscape);
     } else {
-      await SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft,DeviceOrientation.landscapeRight]);
+      await SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
     }
   }
  
@@ -12,7 +12,11 @@ class UserUtil {
  
   static String get token => _userEntity?.token ?? '';
  
-  static void saveUser(UserEntity user) {
+  static void saveUser(UserEntity? user) {
+    if (user == null) {
+      _clearUserData();
+      return;
+    }
     _userEntity = user;
     _saveUserJson(user.toString());
   }
@@ -2,8 +2,8 @@ part of &#39;request_client.dart&#39;;
  
 class Apis {
   /// app初始化配置信息
-  //   GET /system/app/config
-  //   接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897678
+  ///   GET /system/app/config
+  ///   接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897678
   static const String appConfig = 'system/app/config';
  
   /// 登录
@@ -12,7 +12,11 @@ class Apis {
   /// 登出
   static const String logout = 'logout';
  
+  /// 注销账号
+  static const String deleteAccount = 'logout';
+
   /// 获取用户信息
+  /// get
   static const String getUserInfo = 'student/info';
  
   /// 更新用户信息
@@ -62,4 +66,8 @@ class Apis {
   /// 获取课程内容
   /// GET
   static const String process = '/course/process';
+
+  /// 首页弹窗
+  /// get
+  static const String homePopup = 'home/popup';
 }
@@ -23,7 +23,13 @@ class UserDao {
   /// 登出
   static Future logout() async {
     var result = await requestClient.post(Apis.logout);
-    print('logout result=$result');
+    UserUtil.logout();
+    return result;
+  }
+
+  /// 注销账号
+  static Future deleteAccount() async {
+    var result = await requestClient.post(Apis.deleteAccount);
     UserUtil.logout();
     return result;
   }
@@ -69,7 +75,7 @@ class UserDao {
  
   /// 获取用户信息
   static Future<UserEntity?> getUserInfo() async {
-    return await requestClient.post(Apis.getUserInfo);
+    return await requestClient.get(Apis.getUserInfo);
   }
  
   /// 更新用户信息，返回即成功，无body
@@ -15,6 +15,7 @@ class UserBloc extends Bloc&lt;UserEvent, UserState&gt; {
  
   UserBloc() : super(UserInitial()) {
     on<UserLogout>(_logout);
+    on<UserDelete>(_deleteAccount);
     on<UserUpdate>(_updateUser);
     on<UserUIUpdate>(_updateUIUser);
   }
@@ -23,6 +24,10 @@ class UserBloc extends Bloc&lt;UserEvent, UserState&gt; {
     await UserDao.logout();
   }
  
+  void _deleteAccount(UserDelete event, Emitter<UserState> emitter) async {
+    await UserDao.deleteAccount();
+  }
+
   void _updateUIUser(UserUIUpdate event, Emitter<UserState> emitter) async {
     emitter(UserInfoUpdated());
   }
@@ -4,8 +4,12 @@ sealed class UserEvent {}
  
 class UserStarted extends UserEvent {}
  
+/// 退出账号
 class UserLogout extends UserEvent {}
  
+/// 注销账号
+class UserDelete extends UserEvent {}
+
 class UserUpdate extends UserEvent {
   final ModifyUserInformationType type;
  
@@ -189,6 +189,17 @@ class _UserView extends StatelessWidget {
                             fontSize: 17.sp,
                           ),
                         )),
+                    30.verticalSpace,
+                    TextButton(
+                        onPressed: () => userBloc.add(UserDelete()),
+                        child: Text(
+                          "注销账号",
+                          style: TextStyle(
+                            //fontWeight: FontWeight.w600,
+                            color: Colors.red,
+                            fontSize: 15.sp,
+                          ),
+                        )),
                   ],
                 ),
               ));
@@ -4,51 +4,55 @@ class Log {
   static LogLevel level = LogLevel.debug;
  
   /// debug
-  static void d(String message) {
+  static void d(Object? object) {
     if (level.index <= LogLevel.debug.index) {
-      print(message);
+      String line = "$object";
+      print(line);
     }
   }
  
   /// info
-  static void i(String message) {
+  static void i(Object? object) {
     if (level.index <= LogLevel.info.index) {
-      print(message);
+      String line = "$object";
+      print(line);
     }
   }
  
   /// warning
-  static void w(String message) {
+  static void w(Object? object) {
     if (level.index <= LogLevel.warning.index) {
-      print(message);
+      String line = "$object";
+      print(line);
     }
   }
  
   /// error
-  static void e(String message) {
+  static void e(Object? object) {
     if (level.index <= LogLevel.error.index) {
-      print(message);
+      String line = "$object";
+      print(line);
     }
   }
 }
  
-extension LogExtension on String {
-  String logD() {
+extension LogExtension on Object? {
+  Object? logD() {
     Log.d(this);
     return this;
   }
  
-  String logI() {
+  Object? logI() {
     Log.i(this);
     return this;
   }
  
-  String logW() {
+  Object? logW() {
     Log.w(this);
     return this;
   }
  
-  String logE() {
+  Object? logE() {
     Log.e(this);
     return this;
   }