ViewState强化

区分网络异常和其他异常,页面区分显示

Author: phoenixsky

android/app/build.gradle

@@ -44,7 +44,6 @@ android {
  versionCode flutterVersionCode.toInteger()
  versionName flutterVersionName
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-// archivesBaseName = "FunAndroid${flutterVersionName}"
  }
  signingConfigs {
  release {

android/build.gradle

@@ -5,7 +5,8 @@ buildscript {
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
+ //classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath 'com.android.tools.build:gradle:3.5.1'
  }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

assets/fonts/iconfont.ttf

@@ -21,9 +21,9 @@ class ImageHelper {
 
  static Widget placeHolder({double width, double height}) {
  return SizedBox(
- width: width, height: height, child: CupertinoActivityIndicator(
- radius: min(10.0, width / 3)
- ));
+ width: width,
+ height: height,
+  child: CupertinoActivityIndicator(radius: min(10.0, width / 3)));
  }
 
  static Widget error({double width, double height, double size}) {
@@ -38,19 +38,18 @@ class ImageHelper {
 
  static String randomUrl(
  {int width = 100, int height = 100, Object key = ''}) {
- return 'http://placeimg.com/$width/$height/${key.hashCode.toString()+key.toString()}';
+ return 'http://placeimg.com/$width/$height/${key.hashCode.toString() + key.toString()}';
  }
 }
 
 class IconFonts {
  IconFonts._();
 
+ /// iconfont:flutter base
  static const String fontFamily = 'iconfont';
 
  static const IconData pageEmpty = IconData(0xe63c, fontFamily: fontFamily);
  static const IconData pageError = IconData(0xe600, fontFamily: fontFamily);
- static const IconData pageUnAuthorized =
- IconData(0xe65f, fontFamily: fontFamily);
- static const IconData train = IconData(0xe89a, fontFamily: fontFamily);
- static const IconData hotel = IconData(0xe8a0, fontFamily: fontFamily);
+ static const IconData pageNetworkError = IconData(0xe678, fontFamily: fontFamily);
+ static const IconData pageUnAuth = IconData(0xe65f, fontFamily: fontFamily);
 }

lib/config/resource_mananger.dart

@@ -82,11 +82,12 @@ class S implements WidgetsLocalizations {
  String get twoPwdDifferent => "The two passwords differ";
  String get unLike => "UnLike";
  String get userName => "Username";
- String get viewStateButtonError => "Load Failed";
  String get viewStateButtonLogin => "Sign In";
  String get viewStateButtonRefresh => "Refresh";
  String get viewStateButtonRetry => "Retry";
  String get viewStateMessageEmpty => "Nothing Found";
+ String get viewStateMessageError => "Load Failed";
+ String get viewStateMessageNetworkError => "Load Failed,Check network ";
  String get viewStateMessageUnAuth => "Not sign in yet";
  String get wechatAccount => "Wechat";
  String appUpdateFoundNewVersion(String version) => "New version $version";
@@ -139,6 +140,8 @@ class $zh_CN extends S {
  @override
  String get Like => "收藏";
  @override
+ String get viewStateMessageNetworkError => "网络连接异常,请检查网络或稍后重试";
+ @override
  String get appUpdateActionDownloadAgain => "重新下载";
  @override
  String get autoBySystem => "跟随系统";
@@ -159,8 +162,6 @@ class $zh_CN extends S {
  @override
  String get noAccount => "还没账号? ";
  @override
- String get viewStateButtonError => "加载失败";
- @override
  String get openBrowser => "浏览器打开";
  @override
  String get appUpdateActionUpdate => "更新";
@@ -183,6 +184,8 @@ class $zh_CN extends S {
  @override
  String get signIn3thd => "第三方登录";
  @override
+ String get viewStateMessageError => "加载失败";
+ @override
  String get rate => "评分";
  @override
  String get actionCancel => "取消";

lib/generated/i18n.dart

@@ -1,4 +1,53 @@
-enum ViewState { idle, busy, empty, error, unAuthorized }
+import 'package:fun_android/config/net/api.dart';
+import 'package:fun_android/provider/view_state_model.dart';
+
+/// 页面状态类型
+enum ViewState {
+ idle,
+ busy, //加载中
+ empty, //无数据
+ error, //加载失败
+ unAuthorized, //未登录
+}
+
+/// 错误类型
+enum ErrorType {
+ defaultError,
+ networkError,
+}
+
+class ViewStateError {
+ ErrorType _type = ErrorType.defaultError;
+ String _message;
+ String _errorMessage;
+
+ ViewStateError(e, {String message, StackTrace stackTrace}) {
+// if(e is String){
+// _errorMessage = e;
+// } else if (e is Error) {//错误类型
+// _errorMessage = e.toString();
+// } else { //exception
+// _errorMessage = e.message;
+// }
+ printErrorStack(e, stackTrace);
+ _errorMessage = e.toString();
+ _message = message;
+ if (e is DioError) {
+ _type = ErrorType.networkError;
+ }
+ }
+
+ ErrorType get errorType => _type;
+
+ String get message => _message ?? _errorMessage;
+
+ String get errorMessage => _errorMessage;
+
+ @override
+ String toString() {
+ return 'ViewStateError{_errorType: $_type, _message: $_message, _errorMessage: $_errorMessage}';
+ }
+}
 
 //enum ConnectivityStatus { WiFi, Cellular, Offline }
 

lib/provider/view_state.dart

@@ -24,7 +24,7 @@ abstract class ViewStateListModel<T> extends ViewStateModel {
  setIdle();
  }
  } catch (e, s) {
- handleException(e, s);
+ setError(e,stackTrace: s);
  }
  }
 

lib/provider/view_state_list_model.dart

@@ -1,4 +1,3 @@
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 
 import 'view_state.dart';
@@ -20,14 +19,16 @@ class ViewStateModel with ChangeNotifier {
  ViewState get viewState => _viewState;
 
  set viewState(ViewState viewState) {
+ _viewStateError = null;
  _viewState = viewState;
  notifyListeners();
  }
 
- /// 出错时的message
- String _errorMessage;
+ ViewStateError _viewStateError;
 
- String get errorMessage => _errorMessage;
+ ViewStateError get viewStateError => _viewStateError;
+
+ String get errorMessage => _viewStateError?.message;
 
  /// 以下变量是为了代码书写方便,加入的变量.严格意义上讲,并不严谨
 
@@ -42,49 +43,35 @@ class ViewStateModel with ChangeNotifier {
  bool get unAuthorized => viewState == ViewState.unAuthorized;
 
  void setIdle() {
- _errorMessage = null;
  viewState = ViewState.idle;
  }
 
  void setBusy() {
- _errorMessage = null;
  viewState = ViewState.busy;
  }
 
  void setEmpty() {
- _errorMessage = null;
  viewState = ViewState.empty;
  }
 
+ void setUnAuthorized() {
+ viewState = ViewState.unAuthorized;
+ onUnAuthorizedException();
+ }
+
  /// [e]分类Error和Exception两种
  void setError(e, {String message, StackTrace stackTrace}) {
- if (e is String) {
- _errorMessage = e;
- } else {
- debugPrint('''
-<-----↓↓↓↓↓↓↓↓↓↓-----error-----↓↓↓↓↓↓↓↓↓↓----->
-$e
-<-----↑↑↑↑↑↑↑↑↑↑-----error-----↑↑↑↑↑↑↑↑↑↑----->
- ''');
-
- debugPrint('''
-<-----↓↓↓↓↓↓↓↓↓↓-----trace-----↓↓↓↓↓↓↓↓↓↓----->
-$stackTrace
-<-----↑↑↑↑↑↑↑↑↑↑-----trace-----↑↑↑↑↑↑↑↑↑↑----->
- ''');
- _errorMessage = message ?? (e is Error ? e.toString() : e.message);
- }
  viewState = ViewState.error;
+ _viewStateError =
+ ViewStateError(e, message: message, stackTrace: stackTrace);
  }
 
- void setUnAuthorized() {
- _errorMessage = null;
- viewState = ViewState.unAuthorized;
- }
+ /// 未授权的回调
+ void onUnAuthorizedException() {}
 
  @override
  String toString() {
- return 'BaseModel{_viewState: $viewState, _errorMessage: $_errorMessage}';
+ return 'BaseModel{_viewState: $viewState, _viewStateError: $_viewStateError}';
  }
 
  @override
@@ -99,18 +86,20 @@ $stackTrace
  _disposed = true;
  super.dispose();
  }
+}
 
- /// Handle Error and Exception
- ///
- /// 统一处理子类的异常情况
- /// [e],有可能是Error,也有可能是Exception.所以需要判断处理
- /// [s] 为堆栈信息
- void handleException(e, s) {
- // DioError的判断,理论不应该拿进来,增强了代码耦合性,抽取为时组件时.应移除
- if (e is DioError && e.error is UnAuthorizedException) {
- setUnAuthorized();
- } else {
- setError(e, stackTrace: s);
- }
- }
+/// [e]为错误类型 :可能为 Error , Exception ,String
+/// [s]为堆栈信息
+printErrorStack(e, s) {
+ debugPrint('''
+<-----↓↓↓↓↓↓↓↓↓↓-----error-----↓↓↓↓↓↓↓↓↓↓----->
+$e
+<-----↑↑↑↑↑↑↑↑↑↑-----error-----↑↑↑↑↑↑↑↑↑↑----->
+ ''');
+
+ debugPrint('''
+<-----↓↓↓↓↓↓↓↓↓↓-----trace-----↓↓↓↓↓↓↓↓↓↓----->
+$s
+<-----↑↑↑↑↑↑↑↑↑↑-----trace-----↑↑↑↑↑↑↑↑↑↑----->
+ ''');
 }

lib/provider/view_state_model.dart

@@ -43,7 +43,7 @@ abstract class ViewStateRefreshListModel<T> extends ViewStateListModel<T> {
  }
  return data;
  } catch (e, s) {
- handleException(e, s);
+ setError(e,stackTrace: s);
  return null;
  }
  }