增加 Github Api 异常提示

williamHlw · Apr 10, 2020 · 542bc35 · 542bc35
1 parent 8e796ea
commit 542bc35
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 5 deletions.
diff --git a/lib/app.dart b/lib/app.dart
@@ -83,6 +83,7 @@ class _FlutterReduxAppState extends State<FlutterReduxApp>
                 _context = context;
                 return NavigatorUtils.pageContainer(new LoginPage());
               },
+
               ///使用 ModalRoute.of(context).settings.arguments; 获取参数
               PhotoViewPage.sName: (context) {
                 return PhotoViewPage();
@@ -138,12 +139,20 @@ mixin HttpErrorListener on State<FlutterReduxApp> {
       case 404:
         Fluttertoast.showToast(
             msg: GSYLocalizations.i18n(_context).network_error_404);
+      case 422:
+        Fluttertoast.showToast(
+            msg: GSYLocalizations.i18n(_context).network_error_422);
         break;
       case Code.NETWORK_TIMEOUT:
         //超时
         Fluttertoast.showToast(
             msg: GSYLocalizations.i18n(_context).network_error_timeout);
         break;
+      case Code.GITHUB_API_REFUSED:
+        //超时
+        Fluttertoast.showToast(
+            msg: GSYLocalizations.i18n(_context).network_error_timeout);
+        break;
       default:
         Fluttertoast.showToast(
             msg: GSYLocalizations.i18n(_context).network_error_unknown +

diff --git a/lib/common/localization/gsy_string_base.dart b/lib/common/localization/gsy_string_base.dart
@@ -95,12 +95,16 @@ abstract class GSYStringBase {
 
   String get network_error_404;
 
+  String get network_error_422;
+
   String get network_error_timeout;
 
   String get network_error_unknown;
 
   String get network_error;
 
+  String get github_refused;
+
   String get load_more_not;
 
   String get load_more_text;

diff --git a/lib/common/localization/gsy_string_en.dart b/lib/common/localization/gsy_string_en.dart
@@ -1,4 +1,5 @@
 import 'package:gsy_github_app_flutter/common/localization/gsy_string_base.dart';
+import 'package:gsy_github_app_flutter/common/localization/gsy_string_base.dart';
 
 /**
  * Created by guoshuyu
@@ -110,12 +111,15 @@ class GSYStringEn extends GSYStringBase {
   @override
   String network_error_404 = "Http 404";
   @override
+  String network_error_422 = "Request Body Error，Please Check Github ClientId";
+  @override
   String network_error_timeout = "Http timeout";
   @override
   String network_error_unknown = "Http unknown error";
   @override
   String network_error = "network error";
-
+  @override
+  String github_refused = "Github Api Error[OS Error: Connection refused]. Please switch networks or try again later ";
   @override
   String load_more_not = "nothing";
   @override

diff --git a/lib/common/localization/gsy_string_zh.dart b/lib/common/localization/gsy_string_zh.dart
@@ -98,7 +98,7 @@ class GSYStringZh extends GSYStringBase {
   String home_theme_6 = "主题6";
 
   @override
-  String login_username_hint_text = "请输入github用户名";
+  String login_username_hint_text = "github用户名，清不要用邮箱";
   @override
   String login_password_hint_text = "请输入密码";
   @override
@@ -111,12 +111,15 @@ class GSYStringZh extends GSYStringBase {
   @override
   String network_error_404 = "404错误";
   @override
+  String network_error_422 = "请求实体异常，请确保 Github ClientId 等信息正确。";
+  @override
   String network_error_timeout = "请求超时";
   @override
   String network_error_unknown = "其他异常";
   @override
   String network_error = "网络错误";
-
+  @override
+  String github_refused = "Github Api 出现异常[Connection refused]，建议换个网络环境或者稍后再试";
   @override
   String load_more_not = "没有更多数据";
   @override

diff --git a/lib/common/net/code.dart b/lib/common/net/code.dart
@@ -12,12 +12,18 @@ class Code {
   ///网络返回数据格式化一次
   static const NETWORK_JSON_EXCEPTION = -3;
 
+  ///Github APi Connection refused
+  static const GITHUB_API_REFUSED = -4;
+
   static const SUCCESS = 200;
 
   static errorHandleFunction(code, message, noTip) {
     if (noTip) {
       return message;
     }
+    if(message != null && message is String && message.contains("Connection refused")) {
+      code = GITHUB_API_REFUSED;
+    }
     eventBus.fire(new HttpErrorEvent(code, message));
     return message;
   }

diff --git a/lib/common/net/interceptors/log_interceptor.dart b/lib/common/net/interceptors/log_interceptor.dart
@@ -30,7 +30,12 @@ class LogsInterceptors extends InterceptorsWrapper {
     }
     try {
       addLogic(sRequestHttpUrl, options.path ?? "");
-      var data = options.data ?? Map<String, dynamic>();
+      var data;
+      if (options.data is Map) {
+        data = options.data;
+      } else {
+        data = Map<String, dynamic>();
+      }
       var map = {
         "header:": {...options.headers},
       };
@@ -39,6 +44,7 @@ class LogsInterceptors extends InterceptorsWrapper {
       }
       addLogic(sHttpRequest, map);
     } catch (e) {
+      print("########2");
       print(e);
     }
     return options;
@@ -85,7 +91,7 @@ class LogsInterceptors extends InterceptorsWrapper {
   onError(DioError err) async {
     if (Config.DEBUG) {
       print('请求异常: ' + err.toString());
-      print('请求异常信息: ' + err.response?.toString() ?? "");
+      print('请求异常信息: ' + (err.response?.toString() ?? ""));
     }
     try {
       addLogic(sHttpErrorUrl, err.request.path ?? "null");