From 6d033ed7db7f5417cd2cf142cd8cfc06da3cb72a Mon Sep 17 00:00:00 2001
From: niuhuan <niuhuancn@outlook.com>
Date: Mon, 28 Feb 2022 16:46:31 +0800
Subject: [PATCH] update error type pattern

---
 lib/basic/enum/ErrorTypes.dart | 5 ++++-
 lib/screens/AccountScreen.dart | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/basic/enum/ErrorTypes.dart b/lib/basic/enum/ErrorTypes.dart
index 07055ac..8b9472d 100644
--- a/lib/basic/enum/ErrorTypes.dart
+++ b/lib/basic/enum/ErrorTypes.dart
@@ -12,7 +12,10 @@ String errorType(String error) {
   if (error.contains("timeout") ||
       error.contains("connection refused") ||
       error.contains("deadline") ||
-      error.contains("connection abort")) {
+      error.contains("connection abort") ||
+      error.contains("certificate") ||
+      error.contains("x509") ||
+      error.contains("ssl")) {
     return ERROR_TYPE_NETWORK;
   }
   if (error.contains("permission denied")) {
diff --git a/lib/screens/AccountScreen.dart b/lib/screens/AccountScreen.dart
index 598b7a3..a22dc49 100644
--- a/lib/screens/AccountScreen.dart
+++ b/lib/screens/AccountScreen.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:pikapika/basic/Common.dart';
-import 'package:pikapika/basic/config/Themes.dart';
 import 'package:pikapika/basic/Method.dart';
+import 'package:pikapika/basic/config/Themes.dart';
 import 'package:pikapika/basic/enum/ErrorTypes.dart';
 import 'package:pikapika/screens/RegisterScreen.dart';
 import 'package:pikapika/screens/components/NetworkSetting.dart';
@@ -155,7 +155,7 @@ class _AccountScreenState extends State<AccountScreen> {
       setState(() {
         _logging = false;
       });
-      var message = "请检查账号密码";
+      var message = "请检查账号密码或网络环境";
       switch (errorType("$e")) {
         case ERROR_TYPE_NETWORK:
           message = "网络不通";
@@ -164,6 +164,9 @@ class _AccountScreenState extends State<AccountScreen> {
           message = "请检查设备时间";
           break;
       }
+      if ("$e".contains("email") && "$e".contains("password")) {
+        message = "请检查账号密码";
+      }
       alertDialog(
         context,
         '登录失败',