兼容非json response header接口

Key
1 parent 993c1a04
Showing 3 changed files with 25 additions and 10 deletions
lib/common/core/user_util.dart
lib/common/request/request_client.dart
lib/pages/login/loginpage/bloc/login_bloc.dart
@@ -45,6 +45,6 @@ class UserUtil {
   static void logout() {
     clearUserSp();
-    Navigator.of(AppRouter.context).push(AppRouteName.login as Route<Object?>);
+    Navigator.of(AppRouter.context).pushNamedAndRemoveUntil(AppRouteName.login, (route) => false);
   }
 }
 import 'dart:convert';
 import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
 import 'package:pretty_dio_logger/pretty_dio_logger.dart';
 import '../core/user_util.dart';
@@ -18,7 +19,10 @@ class RequestClient {
   RequestClient() {
     _dio = Dio(BaseOptions(baseUrl: RequestConfig.baseUrl, connectTimeout: RequestConfig.connectTimeout));
     _dio.interceptors.add(TokenInterceptor());
-    _dio.interceptors.add(PrettyDioLogger(requestHeader: true, requestBody: true));
+    if (kDebugMode) {
+      _dio.interceptors
+          .add(PrettyDioLogger(requestHeader: true, requestBody: true, responseHeader: true, maxWidth: 120));
+    }
   }
   Future<T?> request<T>(
@@ -38,10 +42,11 @@ class RequestClient {
       data = _convertRequestData(data);
       Response response = await _dio.request(url, queryParameters: queryParameters, data: data, options: options);
-
+      print("response.body type=${response.data.runtimeType}");
       return _handleResponse<T>(response, onResponse);
     } catch (e) {
-      if ((e as ApiException?)?.code == 405) {
+      print("e type=${e.runtimeType}");
+      if (e is ApiException && e.code == 405) {
         UserUtil.logout();
         return null;
       }
@@ -143,12 +148,24 @@ class RequestClient {
         raw.value = response.data;
         return raw as T;
       } else {
-        ApiResponse<T> apiResponse = ApiResponse<T>.fromJson(response.data);
+        print('response.data.runtimeType=${response.data.runtimeType}');
+
+        // 应对response的header中content-type: [text/html;charset=utf-8]的情况
+        // 实际上都是json格式返回
+        Map<String, dynamic> json;
+        if (response.data is String) {
+          json = jsonDecode(response.data);
+        } else {
+          json = response.data;
+        }
+        //ApiResponse<T> apiResponse = ApiResponse<T>.fromJson(json.decode(response.data));
+        ApiResponse<T> apiResponse = ApiResponse.fromJson(json);
         onResponse?.call(apiResponse);
         return _handleBusinessResponse<T>(apiResponse);
       }
     } else {
-      var exception = ApiException(response.statusCode, ApiException.unknownException);
+      ApiException exception = ApiException(response.statusCode, ApiException.unknownException);
+      print("_handleResponse exception type=${exception.runtimeType}");
       throw exception;
     }
   }
@@ -158,7 +175,8 @@ class RequestClient {
     if (response.code == RequestConfig.successCode) {
       return response.data;
     } else {
-      var exception = ApiException(response.code, response.msg);
+      ApiException exception = ApiException(response.code, response.msg);
+      print("_handleBusinessResponse exception type=${exception.runtimeType}");
       throw exception;
     }
   }
@@ -6,7 +6,6 @@ import &#39;package:flutter_easyloading/flutter_easyloading.dart&#39;;
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/common/request/dao/user_dao.dart';
 import 'package:wow_english/common/request/exception.dart';
-import 'package:wow_english/common/request/request.dart';
 import 'package:wow_english/models/user_entity.dart';
 import 'package:wow_english/utils/loading.dart';
@@ -75,8 +74,6 @@ class LoginBloc extends Bloc&lt;LoginEvent, LoginState&gt; {
     try {
-      request(() => null);
-
       await loading(() async {
         var user = await UserDao.login(phoneNumber, type, checkKey, checkNumber);
         if (kDebugMode) {