更新首页网络异常时,根据当前页面是否有数据,来决定是否跳转错误页面

更新首页刷新时的indicator的颜色 其他页面待下周修改

Author: phoenixsky

lib/config/net/wan_android_api.dart

@@ -31,6 +31,7 @@ class ApiInterceptor extends InterceptorsWrapper {
 
  @override
  onResponse(Response response) {
+// debugPrint('---api-response--->resp----->${response.data}');
  ResponseData respData = ResponseData.fromJson(response.data);
  if (respData.success) {
  response.data = respData.data;

lib/provider/view_state_list_model.dart

@@ -14,7 +14,6 @@ abstract class ViewStateListModel<T> extends ViewStateModel {
  // 下拉刷新
  refresh({bool init = false}) async {
  try {
- if (init) list.clear();
  List<T> data = await loadData();
  if (data.isEmpty) {
  list.clear();
@@ -26,8 +25,8 @@ abstract class ViewStateListModel<T> extends ViewStateModel {
  setIdle();
  }
  } catch (e, s) {
- list.clear();
- setError(e,s);
+ if (init) list.clear();
+ setError(e, s);
  }
  }
 

lib/provider/view_state_model.dart

@@ -1,6 +1,8 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:fun_android/config/net/api.dart';
+import 'package:fun_android/generated/i18n.dart';
+import 'package:oktoast/oktoast.dart';
 
 import 'view_state.dart';
 
@@ -30,6 +32,8 @@ class ViewStateModel with ChangeNotifier {
 
  ViewStateError get viewStateError => _viewStateError;
 
+
+
  String get errorMessage => _viewStateError?.message;
 
  /// 以下变量是为了代码书写方便,加入的get方法.严格意义上讲,并不严谨
@@ -61,6 +65,9 @@ class ViewStateModel with ChangeNotifier {
  onUnAuthorizedException();
  }
 
+ /// 未授权的回调
+ void onUnAuthorizedException() {}
+
  /// [e]分类Error和Exception两种
  void setError(e, stackTrace, {String message}) {
  ErrorType errorType = ErrorType.defaultError;
@@ -87,8 +94,17 @@ class ViewStateModel with ChangeNotifier {
  printErrorStack(e, stackTrace);
  }
 
- /// 未授权的回调
- void onUnAuthorizedException() {}
+ /// 显示错误消息
+ showErrorMessage(context, {String networkErrorMessage}) {
+ var message = viewStateError.message;
+ if (viewStateError.isNetworkError) {
+ message =
+ networkErrorMessage ?? S.of(context).viewStateMessageNetworkError;
+ }
+ Future.microtask((){
+ showToast(message, context: context);
+ });
+ }
 
  @override
  String toString() {

lib/provider/view_state_refresh_list_model.dart

@@ -20,10 +20,13 @@ abstract class ViewStateRefreshListModel<T> extends ViewStateListModel<T> {
  int _currentPageNum = pageNumFirst;
 
  /// 下拉刷新
+ ///
+ /// [init] 是否是第一次加载
+ /// true: Error时,需要跳转页面
+ /// false: Error时,不需要跳转页面,直接给出提示
  Future<List<T>> refresh({bool init = false}) async {
  try {
  _currentPageNum = pageNumFirst;
- if (init) list.clear();
  var data = await loadData(pageNum: pageNumFirst);
  if (data.isEmpty) {
  refreshController.refreshCompleted(resetFooterState: true);
@@ -45,7 +48,10 @@ abstract class ViewStateRefreshListModel<T> extends ViewStateListModel<T> {
  }
  return data;
  } catch (e, s) {
- list.clear();
+ /// 页面已经加载了数据,如果刷新报错,不应该直接跳转错误页面
+ /// 而是显示之前的页面数据.给出错误提示
+ if (init) list.clear();
+ refreshController.refreshFailed();
  setError(e, s);
  return null;
  }

lib/ui/helper/refresh_helper.dart

@@ -1,6 +1,8 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fun_android/generated/i18n.dart';
 import 'package:fun_android/ui/page/tab/home_second_floor_page.dart';
+import 'package:fun_android/ui/widget/activity_indicator.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 /// 首页列表的header
@@ -15,6 +17,7 @@ class HomeRefreshHeader extends StatelessWidget {
  outerBuilder: (child) => HomeSecondFloorOuter(child),
  twoLevelView: Container(),
  height: 70 + MediaQuery.of(context).padding.top / 3,
+ refreshingIcon: ActivityIndicator(brightness: Brightness.dark),
  releaseText: strings.canRefreshText+',继续下拉触发惊喜',
  );
  }

lib/ui/page/tab/home_page.dart

@@ -56,7 +56,7 @@ class _HomePageState extends State<HomePage>
  context: context,
  removeTop: false,
  child: Builder(builder: (_) {
- if (homeModel.error) {
+ if (homeModel.error && homeModel.list.isEmpty) {
  return AnnotatedRegion<SystemUiOverlayStyle>(
  value: StatusBarUtils.systemUiOverlayStyle(context),
  child: ViewStateErrorWidget(
@@ -70,11 +70,11 @@ class _HomePageState extends State<HomePage>
  //最大下拉距离,android默认为0,这里为了触发二楼
  maxOverScrollExtent: kHomeRefreshHeight,
  headerTriggerDistance:
- 80 + MediaQuery.of(context).padding.top/3,
+ 80 + MediaQuery.of(context).padding.top / 3,
  child: SmartRefresher(
  controller: homeModel.refreshController,
  header: HomeRefreshHeader(),
- enableTwoLevel: homeModel.idle,
+ enableTwoLevel: homeModel.list.isNotEmpty,
  onTwoLevel: () async {
  await Navigator.of(context)
  .pushNamed(RouteName.homeSecondFloor);
@@ -84,7 +84,7 @@ class _HomePageState extends State<HomePage>
  .twoLevelComplete();
  },
  footer: RefresherFooter(),
- enablePullDown: homeModel.idle,
+ enablePullDown: homeModel.list.isNotEmpty,
  onRefresh: homeModel.refresh,
  onLoading: homeModel.loadMore,
  enablePullUp: homeModel.list.isNotEmpty,
@@ -135,7 +135,8 @@ class _HomePageState extends State<HomePage>
  child: ViewStateEmptyWidget(
  onPressed: homeModel.initData),
  )),
- if (homeModel.idle) HomeTopArticleList(),
+ if (homeModel.topArticles?.isNotEmpty ?? false)
+ HomeTopArticleList(),
  HomeArticleList(),
  ],
  )),

lib/ui/page/user/login_page.dart

@@ -137,9 +137,7 @@ class LoginButton extends StatelessWidget {
  if (value) {
  Navigator.of(context).pop(true);
  } else {
- showToast(model.viewStateError.isNetworkError
- ? S.of(context).viewStateMessageNetworkError
- : model.errorMessage);
+ model.showErrorMessage(context);
  }
  });
  }

lib/ui/widget/activity_indicator.dart

@@ -0,0 +1,20 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+/// 由于app不管明暗模式,都是有底色
+/// 所以将indicator颜色为亮色
+class ActivityIndicator extends StatelessWidget {
+ final double radius;
+ final Brightness brightness;
+
+ ActivityIndicator({this.radius, this.brightness});
+
+ @override
+ Widget build(BuildContext context) {
+ return Theme(
+ data: ThemeData(
+ cupertinoOverrideTheme: CupertinoThemeData(brightness: brightness),
+ ),
+ child: CupertinoActivityIndicator(radius: radius ?? 10));
+ }
+}

lib/ui/widget/app_bar.dart

@@ -1,19 +1,18 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:fun_android/ui/widget/activity_indicator.dart';
 
 /// 由于app不管明暗模式,都是有底色
 /// 所以将indicator颜色为亮色
 class AppBarIndicator extends StatelessWidget {
  final double radius;
 
- AppBarIndicator({this.radius:10});
+ AppBarIndicator({this.radius});
 
  @override
  Widget build(BuildContext context) {
- return Theme(
- data: ThemeData(
- cupertinoOverrideTheme:
- CupertinoThemeData(brightness: Brightness.dark)),
- child: CupertinoActivityIndicator(radius: radius));
+ return ActivityIndicator(
+ brightness: Brightness.dark,
+ radius: radius,
+ );
  }
 }

test/widget_test.dart

@@ -25,9 +25,40 @@ void main() {
 // expect(find.text('1'), findsOneWidget);
 // });
 
- test(('reg'), () {
- String title = r"在Java 中<em class='highlight'>安全</em>使用接口引用";
+ test(('copy array'), () {
+ var a = [1000000000, 2, 3];
+ var b = [...a];
+ a[0] = 111;
+ print(a);
+ print(b);
 
- print(title.replaceAll(RegExp("<[^>]+>"), ''));
+ var aa = ['我还没改名1', '我还没改名2','我还没改名3'];
+ var bb = [...aa];
+ aa[0] = '我已经改名啦1';
+ print(aa);
+ print(bb);
+
+// var aa = [Person('11'),Person('22'),Person('33')];
+
+ var aaa = [
+ Person('111'),
+ Person('222'),
+ Person('222')
+ ];
+ var bbb = [...aaa];
+ aaa[0].name = '我要改名了';
+ print(aaa);
+ print(bbb);
  });
 }
+
+class Person {
+ String name;
+
+ Person(this.name);
+
+ @override
+ String toString() {
+ return 'Person{name: $name}';
+ }
+}