接口异常处理修复

xusujun33 · Jul 17, 2019 · 2f86e7a · 2f86e7a
1 parent 1082992
commit 2f86e7a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/lib/login/register_page.dart b/lib/login/register_page.dart
@@ -80,14 +80,14 @@ class _RegisterState extends State<Register> {
               controller: _nameController,
               maxLength: 11,
               keyboardType: TextInputType.phone,
-              hintText: "请输入账号",
+              hintText: "请输入手机号",
             ),
             Gaps.vGap10,
             MyTextField(
               controller: _vCodeController,
               keyboardType: TextInputType.number,
               getVCode: (){
-
+                Toast.show("并没有真正发送哦，直接登录吧！");
               },
               maxLength: 6,
               hintText: "请输入验证码",

diff --git a/lib/login/sms_login_page.dart b/lib/login/sms_login_page.dart
@@ -70,7 +70,7 @@ class _SMSLoginState extends State<SMSLogin> {
               controller: _phoneController,
               maxLength: 11,
               keyboardType: TextInputType.phone,
-              hintText: "请输入账号",
+              hintText: "请输入手机号",
             ),
             Gaps.vGap10,
             MyTextField(

diff --git a/lib/mvp/base_page_presenter.dart b/lib/mvp/base_page_presenter.dart
@@ -1,7 +1,6 @@
 
 import 'package:dio/dio.dart';
-import 'package:flutter_deer/net/dio_utils.dart';
-import 'package:flutter_deer/net/error_handle.dart';
+import 'package:flutter_deer/net/net.dart';
 import 'package:meta/meta.dart';
 
 import 'mvps.dart';
@@ -51,7 +50,7 @@ class BasePagePresenter<V extends IMvpView> extends IPresenter {
           }
         },
         onError: (code, msg){
-          _onError(code, msg, isClose, onError);
+          _onError(code, msg, onError);
         }
     );
   }
@@ -71,7 +70,7 @@ class BasePagePresenter<V extends IMvpView> extends IPresenter {
           }
         },
         onError: (code, msg){
-          _onError(code, msg, isClose, onError);
+          _onError(code, msg, onError);
         }
     );
   }
@@ -98,13 +97,14 @@ class BasePagePresenter<V extends IMvpView> extends IPresenter {
           }
         },
         onError: (code, msg){
-          _onError(code, msg, isClose, onError);
+          _onError(code, msg, onError);
         }
     );
   }
 
-  _onError(int code, String msg, bool isClose, Function(int code, String mag) onError){
-    if (isClose) view.closeProgress();
+  _onError(int code, String msg, Function(int code, String mag) onError){
+    /// 异常时直接关闭加载圈，不受isClose影响
+    view.closeProgress();
     if (code != ExceptionHandle.cancel_error){
       view.showToast(msg);
     }

diff --git a/lib/net/dio_utils.dart b/lib/net/dio_utils.dart
@@ -62,7 +62,11 @@ class DioUtils {
       _code = _map["code"];
       _msg = _map["message"];
       if (_map.containsKey("data")){
-        _data = EntityFactory.generateOBJ(_map["data"]);
+        if (T.toString() == "String"){
+          _data = _map["data"].toString() as T;
+        }else{
+          _data = EntityFactory.generateOBJ(_map["data"]);
+        }
       }
     }catch(e){
       print(e);

diff --git a/lib/net/intercept.dart b/lib/net/intercept.dart
@@ -199,7 +199,7 @@ class AdapterInterceptor extends Interceptor{
           } catch (e) {
             Log.d("异常信息：$e");
             // 解析异常直接按照返回原数据处理（一般为返回500,503 HTML页面代码）
-            result = content;
+            result = sprintf(FAILURE_FORMAT, [response.statusCode, "服务器异常(${response.statusCode})"]);
           }
         }
       }

diff --git a/lib/net/net.dart b/lib/net/net.dart
@@ -0,0 +1,3 @@
+export 'error_handle.dart';
+export 'dio_utils.dart';
+export 'api.dart';
diff --git a/lib/order/presenter/order_search_presenter.dart b/lib/order/presenter/order_search_presenter.dart
@@ -1,7 +1,6 @@
 
 import 'package:flutter_deer/mvp/base_page_presenter.dart';
-import 'package:flutter_deer/net/api.dart';
-import 'package:flutter_deer/net/dio_utils.dart';
+import 'package:flutter_deer/net/net.dart';
 import 'package:flutter_deer/order/models/search_entity.dart';
 import 'package:flutter_deer/widgets/state_layout.dart';