From 1a9ac70c1f0f10d450dca2b2083a147e8027e042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyanghuaxuan=E2=80=9D?= <“646903573@qq.com”>
Date: Fri, 5 Feb 2021 09:23:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/android/app/build.gradle                          | 4 ++--
 example/lib/main.dart                                     | 8 +++++++-
 example/pubspec.yaml                                      | 2 +-
 .../feedback_page/bloc/feedback_record_repository.dart    | 3 +++
 lib/widgets/home/home_goods/bloc/home_goods_bloc.dart     | 8 --------
 lib/widgets/share/share_alert.dart                        | 2 +-
 pubspec.yaml                                              | 2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index f0c98e2..d853403 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -112,9 +112,9 @@ android {
         // 智夜生活
         zhiying {
             applicationId "cn.zhios.zhiying"
-            versionCode 38
+            versionCode 39
             dimension "app"
-            versionName '1.2.38'
+            versionName '1.2.39'
             // 签名信息
             signingConfig signingConfigs.zhiying
         }
diff --git a/example/lib/main.dart b/example/lib/main.dart
index b7579bd..b64232f 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -35,10 +35,16 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
+
   Widget getErrorWidget(BuildContext context, FlutterErrorDetails error) {
+    var erroStr='';
+    const bool inProduction = const bool.fromEnvironment("dart.vm.product");
+    if ( !inProduction) {
+      erroStr=error.exceptionAsString();
+    }
     return Center(
       child: Text(
-        "走神了~\n${error.exceptionAsString()}",
+        "走神了~"+erroStr,
         style: Theme
             .of(context)
             .textTheme
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index a8d1f73..cd34b18 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -38,7 +38,7 @@ dev_dependencies:
   zhiying_moments:
     #path: ../zhiying_moments
     git:
-      ref: 0.0.5
+      ref: 0.1.0
       url: http://192.168.0.138:3000/FnuoOS_ZhiYing/zhiying_moments.git
 
 # For information on the generic Dart part of this file, see the
diff --git a/lib/pages/feedback_page/bloc/feedback_record_repository.dart b/lib/pages/feedback_page/bloc/feedback_record_repository.dart
index 1f428d0..6e3b8c2 100644
--- a/lib/pages/feedback_page/bloc/feedback_record_repository.dart
+++ b/lib/pages/feedback_page/bloc/feedback_record_repository.dart
@@ -97,6 +97,9 @@ class FeedbackRecordRepository {
 
   /// 基础加载方法
   Future<dynamic> _fetchBaseRequest() async {
+    if(_currentPage==1){
+      _dataModel.data.clear();
+    }
     try {
       var result = await NetUtil.post('/api/v1/feedback/list', method: NetMethod.GET, queryParameters: {'page': _currentPage.toString()});
       if (NetUtil.isSuccess(result) && !EmptyUtil.isEmpty(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA])) {
diff --git a/lib/widgets/home/home_goods/bloc/home_goods_bloc.dart b/lib/widgets/home/home_goods/bloc/home_goods_bloc.dart
index 832392d..de1e461 100644
--- a/lib/widgets/home/home_goods/bloc/home_goods_bloc.dart
+++ b/lib/widgets/home/home_goods/bloc/home_goods_bloc.dart
@@ -24,17 +24,9 @@ class HomeGoodsBloc extends BlocBase implements CategoryGoodsOnClickCallBack {
     _goodsController = null;
   }
 
-  bool loading=false;
 
   void loadMore(dynamic provider) {
     ///避免多次下拉刷新出现跳页加载的情况
-    if(loading){
-      return ;
-    }
-    loading=true;
-    Timer(Duration(milliseconds: 2000), (){
-      loading=false;
-    });
     if (provider != _provider) {
       page = 1;
     }
diff --git a/lib/widgets/share/share_alert.dart b/lib/widgets/share/share_alert.dart
index ea2f4a7..a78d750 100644
--- a/lib/widgets/share/share_alert.dart
+++ b/lib/widgets/share/share_alert.dart
@@ -293,7 +293,7 @@ class _ShareAlertContentState extends State<_ShareAlertContent> {
       if (state == SSDKResponseState.Fail) {
         Fluttertoast.showToast(msg: '分享失败');
       } else if (state == SSDKResponseState.Success) {
-        Fluttertoast.showToast(msg: '分享成功');
+        //Fluttertoast.showToast(msg: '分享成功');
       } else if (state == SSDKResponseState.Cancel) {
         Fluttertoast.showToast(msg: '取消分享');
       }
diff --git a/pubspec.yaml b/pubspec.yaml
index e9edbe0..8803aa6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   bloc: ^4.0.0
   event_bus: ^1.1.1
   pull_to_refresh: ^1.6.1
-  flutter_cupertino_date_picker: ^1.0.26+2
+  flutter_cupertino_date_picker:
   image_picker: ^0.6.7+3
   tab_indicator_styler: 1.0.0
   connectivity: ^0.4.9+3