From 26cd2b6a27e88165b6fc9bb184bea40ceea0d512 Mon Sep 17 00:00:00 2001
From: WinUser01 <WinUser01@163.com>
Date: Sun, 27 Feb 2022 16:04:13 +0800
Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit106=EF=BC=9A=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=9B=B4=E6=96=B0=E4=B8=BA1.4.17+20220227?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?getAllStatisData=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/components/dioFun.dart |  12 ++++-
 pubspec.yaml               | 101 +++++++++++++++++++------------------
 2 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/lib/components/dioFun.dart b/lib/components/dioFun.dart
index ea2edff..5f431e4 100644
--- a/lib/components/dioFun.dart
+++ b/lib/components/dioFun.dart
@@ -488,7 +488,15 @@ Future getAllStatisData({String ip = '', String date = ''}) async {
 
     if (response.statusCode == 200) {
       Map _mapStatisDataRet = await getMapFromJson(response.data);
-      _listAllStatisData = _mapStatisDataRet['data'];
+      print('_mapStatisDataRet = ${_mapStatisDataRet}');
+      print('_mapStatisDataRet[\'data\'] = ${_mapStatisDataRet['data']}');
+      // _mapStatisDataRet = {ret: 200, data: {}, msg: }
+      // _mapStatisDataRet['data'] = {}
+      // 避免统计数据为空时报错：
+      // getAllStatisData 网络请求过程异常e：type '_InternalLinkedHashMap<String, dynamic>' is not a subtype of type 'List<dynamic>'
+      if (_mapStatisDataRet['data'].length > 0) {
+        _listAllStatisData = _mapStatisDataRet['data'];
+      }
       print('getAllStatisData 网络请求过程正常完成');
     } else {
       throw Exception('getAllStatisData 后端接口出现异常，请检测代码和服务器情况.........');
@@ -1983,7 +1991,7 @@ Future getThePageList(
       print(mapGetData.toString());
       //第一次必须先进行listWzxxGetList2.clear()，否则addAll报错终止
       print('mapGetData[' 'data' '][' 'items' '].length = ${mapGetData['data']['items'].length}');
-      if (bShowToast && 0 == mapGetData['data']['items'].length) {
+      if (page > 1 && bShowToast && 0 == mapGetData['data']['items'].length) {
         Fluttertoast.showToast(
           msg: '没有更多了！',
           toastLength: Toast.LENGTH_SHORT,
diff --git a/pubspec.yaml b/pubspec.yaml
index db4db18..30af0b8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,58 +5,59 @@ description: HeiYanZhuaPai_qx_name Flutter application .
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-  # 开发人员信息：
-  # 技术人员: 闵军
-  # By: ybmj@vip.163.com ,
-  # QQ: 153248043
-  # https://www.cnblogs.com/ybmj/
-
-  # The following defines the version and build number for your application.
-  # A version number is three numbers separated by dots, like 1.2.43
-  # followed by an optional build number separated by a +.
-  # Both the version and the builder number may be overridden in flutter
-  # build by specifying --build-name and --build-number, respectively.
-  # In Android, build-name is used as versionName while build-number used as versionCode.
-  # Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-  # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-  # Read more about iOS versioning at
-  # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-  # 版本名称: 1.2.7  版本号:1
-  # R:\FlutterProject\FlutterProject33\hyzp_ybqx\lib\components\commonFun.dart
-  # String dateAppCompile = '2021.05.18'; //1.2.7
-  # String dateAppCompile = '2021.05.15'; //1.3.1
-  # 版本号保存在该文件中：r:\FlutterProject\FlutterProject33\hyzp_ybqx\pubspec.yaml
-  # version: 1.3.1+20210508  +号前面是版本号，+号后面是时间（yyyymmdd 小版本号） 对应 hyzp_ybqx-Commit802-Branch.031
-  # version: 1.3.0+20210526
-  # version: 1.3.1+20210527
-  # version: 1.3.2+20210528
-  # version: 1.3.4+20210529
-  # version: 1.3.5+20210530
-  # version: 1.3.6+20210601
-  # version: 1.3.7+20210604
-  # version: 1.3.10+20210604
-  # version: 1.3.11+20210729
-  # 关键是在通过接口 App.Car_Upload.Apk 上传新版本 apk 时，ver参数的版本号必须为1.3.12，而不能为1.3.12+20210729
-  # 否则老版本1.3.10+20210604无法更新。新版本1.3.12+20210729已经解决该问题
-  # version: 1.3.12+20210729
-  # version: 1.3.13+20211026
-  # version: 1.4.1+20211226
-  # version: 1.4.2+20211227
-  # version: 1.4.4+20211230
-  # version: 1.4.6+20211231
-  # version: 1.4.7+20220101
-  # version: 1.4.9+20220103
-  # version: 1.4.10+20220104
-  # version: 1.4.11+20220106
-  #version: 1.4.12+20220107
-  # version: 1.4.13+20220121
-  # 用下划线编译报错：
-  # Error on line 53, column 10 of pubspec.yaml: Invalid version number: Could not parse "1.4.14_20220124".
-  # version: 1.4.14 # 为规范起见，从该版本起取消后面的 +20220124
-  #version: 1.4.14+20220124 # 無法獲取flutter编译时间，只有通过这种方式获取，所以还是保留后面的 +20220124。
+# 开发人员信息：
+# 技术人员: 闵军
+# By: ybmj@vip.163.com ,
+# QQ: 153248043
+# https://www.cnblogs.com/ybmj/
+
+# The following defines the version and build number for your application.
+# A version number is three numbers separated by dots, like 1.2.43
+# followed by an optional build number separated by a +.
+# Both the version and the builder number may be overridden in flutter
+# build by specifying --build-name and --build-number, respectively.
+# In Android, build-name is used as versionName while build-number used as versionCode.
+# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
+# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
+# Read more about iOS versioning at
+# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
+# 版本名称: 1.2.7  版本号:1
+# R:\FlutterProject\FlutterProject33\hyzp_ybqx\lib\components\commonFun.dart
+# String dateAppCompile = '2021.05.18'; //1.2.7
+# String dateAppCompile = '2021.05.15'; //1.3.1
+# 版本号保存在该文件中：r:\FlutterProject\FlutterProject33\hyzp_ybqx\pubspec.yaml
+# version: 1.3.1+20210508  +号前面是版本号，+号后面是时间（yyyymmdd 小版本号） 对应 hyzp_ybqx-Commit802-Branch.031
+# version: 1.3.0+20210526
+# version: 1.3.1+20210527
+# version: 1.3.2+20210528
+# version: 1.3.4+20210529
+# version: 1.3.5+20210530
+# version: 1.3.6+20210601
+# version: 1.3.7+20210604
+# version: 1.3.10+20210604
+# version: 1.3.11+20210729
+# 关键是在通过接口 App.Car_Upload.Apk 上传新版本 apk 时，ver参数的版本号必须为1.3.12，而不能为1.3.12+20210729
+# 否则老版本1.3.10+20210604无法更新。新版本1.3.12+20210729已经解决该问题
+# version: 1.3.12+20210729
+# version: 1.3.13+20211026
+# version: 1.4.1+20211226
+# version: 1.4.2+20211227
+# version: 1.4.4+20211230
+# version: 1.4.6+20211231
+# version: 1.4.7+20220101
+# version: 1.4.9+20220103
+# version: 1.4.10+20220104
+# version: 1.4.11+20220106
+#version: 1.4.12+20220107
+# version: 1.4.13+20220121
+# 用下划线编译报错：
+# Error on line 53, column 10 of pubspec.yaml: Invalid version number: Could not parse "1.4.14_20220124".
+# version: 1.4.14 # 为规范起见，从该版本起取消后面的 +20220124
+#version: 1.4.14+20220124 # 無法獲取flutter编译时间，只有通过这种方式获取，所以还是保留后面的 +20220124。
 # 上传软件时可以不加后面的 +20220124，否则二维码扫码后无法直接下载
 #version: 1.4.15+20220124
-version: 1.4.16+20220126
+#version: 1.4.16+20220126
+version: 1.4.17+20220227
 
 environment:
   sdk: ">=2.7.0 <3.0.0"