Merge branch 'mcy_new' into new_main

making_school_asignment_app/android/app/src/main/AndroidManifest.xml

@@ -32,6 +32,28 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <!-- 访问电话状态 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> 
+    <!-- 允许全部网络访问 -->
+    <uses-permission android:name="android.permission.INTERNET" /> 
+    <!-- 获取网络信息状态 -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 
+    <!-- 获取当前WiFi接入的状态以及WLAN热点的信息 -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> 
+    <!-- 获取当前设备存储权限 -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACTION_MANAGE_UNKNOWN_APP_SOURCES"/>
+    <!-- 这个权限用于app安装 -->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <!-- 屏幕常亮权限 -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <!-- Permissions options for the `access notification policy` group -->
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
+    <!-- Permissions options for the `notification` group -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.

making_school_asignment_app/lib/common/request/rest_dio.dart

@@ -10,6 +10,8 @@ import 'package:making_school_asignment_app/common/store/user_store.dart';
 import 'package:making_school_asignment_app/common/utils/toast_utils.dart';
 import 'package:making_school_asignment_app/routes/app_pages.dart';
 
+import '../job/user_info_detail.dart';
+
 class RequestTool {
   static late Dio _dio;
   // 初始化请求配置
@@ -130,11 +132,10 @@ class ResponseHandle extends Interceptor {
 }
 
 class TheError extends Interceptor {
+  late getx.Rx<UserInfoDetail?> userInfo = UserStore.to.userDetailInfo;
+
   @override
   void onError(DioException error, ErrorInterceptorHandler handler) {
-    print('----------------');
-    print(error);
-    print('*************');
     var message = '请求错误，请重试';
     switch (error.type) {
       case DioExceptionType.connectionTimeout:
@@ -166,6 +167,7 @@ class TheError extends Interceptor {
                 switch (statusCode) {
                   case 401:
                     message = '用户登录失效，请重新登录';
+
                     Future.delayed(const Duration(seconds: 2), () => getx.Get.offAllNamed(Routes.login));
                     break;
                   case 404:
@@ -188,6 +190,9 @@ class TheError extends Interceptor {
       default:
         message = '请求错误';
     }
+    if (message == '用户登录失效，请重新登录' && userInfo.value?.id == null) {
+      return handler.next(error);
+    }
     ToastUtils.showError(message);
     return handler.next(error);
   }

making_school_asignment_app/lib/page/home_page/children/my_info.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:making_school_asignment_app/common/job/user_info.dart';
 import 'package:making_school_asignment_app/common/job/user_info_detail.dart';
 import 'package:making_school_asignment_app/common/store/app_storage_key.dart';
 import 'package:making_school_asignment_app/common/store/user_store.dart';