commit

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -11,6 +11,7 @@ import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart';
+import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart';
 import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart';
 import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneList.dart';
 import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneModel.dart';
@@ -535,6 +536,8 @@ class LevelOneState extends BaseState<LevelOnePage>
                     RouterCenterImpl()
                         .findMainRouter()
                         .buriedEvent("popup_view", map);
+                    DiscussLowPricePopView.showPopView(context,
+                        widget.PAGE_NAME, "${widget.planId}", "", "");
                   },
                   child: Container(
                     margin: EdgeInsets.only(left: 15),

lib/ClueModel/page/plan/FilterView.dart

@@ -6,6 +6,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:gm_flutter/ClueModel/page/plan/PlanProgressBar.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
+import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
 
 class FilterView extends StatelessWidget {
@@ -15,17 +16,9 @@ class FilterView extends StatelessWidget {
 
   int min = 0;
   int max = 0;
-  PlanProgressBar planProgressBar;
 
   @override
   Widget build(BuildContext context) {
-    planProgressBar = PlanProgressBar(
-      0,
-      5,
-      0,
-      10000,
-      padding: 15,
-    );
     return Container(
       color: Colors.white,
       height: 186,
@@ -36,7 +29,13 @@ class FilterView extends StatelessWidget {
             left: 0,
             child: Container(
               width: MediaQuery.of(context).size.width,
-              child: planProgressBar,
+              child: PlanProgressBar(
+                0,
+                5,
+                0,
+                10000,
+                padding: 15,
+              ),
             ),
           ),
           Positioned(
@@ -66,7 +65,8 @@ class FilterView extends StatelessWidget {
                       child: baseText("重置", 16, Color(0xff3FB5AF)),
                       alignment: Alignment.center,
                     ).gestureDetector(() {
-                      planProgressBar.changeNotifier.notifyListeners();
+                      SimpleEventBus.instance()
+                          .notifyListener("PlanProgressBarState", "");
                     }),
                   ),
                   Expanded(

lib/ClueModel/page/plan/PlanModel.dart

@@ -8,13 +8,13 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_common/commonModel/live/BaseModel.dart';
 import 'package:flutter_common/commonModel/live/LiveData.dart';
 import 'package:flutter_common/commonModel/toast/NativeToast.dart';
-import 'package:gm_flutter/ClueModel/page/plan/PlanTest.dart';
 import 'package:gm_flutter/ClueModel/server/api/ClueApi.serv.dart';
 import 'package:gm_flutter/ClueModel/server/entity/PlanBean.dart';
 import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart';
 import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
 import 'package:gm_flutter/commonModel/cache/CacheManager.dart';
+import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
 import 'package:gm_flutter/commonModel/util/PrintUtil.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -110,6 +110,7 @@ class PlanModel extends BaseModel {
   }
 
   void refreshFeed(bool clear, {RefreshController controller}) {
+
     if (clear) {
       page = 1;
       feedDatas.clear();

lib/ClueModel/page/plan/PlanPage.dart

@@ -25,6 +25,7 @@ import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 import 'package:gm_flutter/commonModel/base/BaseState.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
 import 'package:gm_flutter/commonModel/cache/CacheManager.dart';
+import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:gm_flutter/commonModel/net/DioUtil.dart';
 import 'package:gm_flutter/commonModel/popMenu/BaseMenuListener.dart';
 import 'package:gm_flutter/commonModel/popMenu/BasePopMenu.dart';
@@ -58,18 +59,18 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
   PlanBarView planBarView;
   double stateBarHeight;
   double topHeight;
+  Function(String str) func;
 
   @override
   void initState() {
     print("LSY PLAN INIT");
 //    DioUtil.getInstance().setProxy("172.30.9.128");
     super.initState();
+    func = (str) {
+      _model.init();
+    };
     if (CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) == null) {
-      VoidCallback callback = () {
-        _model.init();
-      };
-      print("LST FIRST CALLBACK is null ?${callback == null}");
-      RouterCenterImpl().findMainRouter().getInitParams(callback);
+      SimpleEventBus.instance().resignEvent("PlanPage!initState", func);
     } else {
       _model.init();
     }
@@ -79,6 +80,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
 
   @override
   void dispose() {
+    SimpleEventBus.instance().unResignEvent("PlanPage!initState", func);
     hideAllMenuListener.dispose();
     projectMenuListener.dispose();
     sortMenuListener.dispose();

lib/ClueModel/page/plan/PlanProgressBar.dart

@@ -5,6 +5,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
+import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 
 class PlanProgressBar extends StatefulWidget {
   int low;
@@ -12,7 +13,6 @@ class PlanProgressBar extends StatefulWidget {
   int maxlow;
   int maxHigh;
   int padding;
-  ChangeNotifier changeNotifier;
 
   PlanProgressBar(this.low, this.high, this.maxlow, this.maxHigh,
       {this.padding});
@@ -35,20 +35,18 @@ class PlanProgressBarState extends State<PlanProgressBar> {
 
   double textLeft = -1;
   bool isLeftMove = true;
+  Function(String str) func;
 
   @override
   void initState() {
     super.initState();
     distance = widget.maxHigh - widget.maxlow - 0.0;
-    widget.changeNotifier = ChangeNotifier();
     init();
-    if (widget.changeNotifier != null && !widget.changeNotifier.hasListeners) {
-      widget.changeNotifier.addListener(() {
-        print("HHH");
-        init();
-        setState(() {});
-      });
-    }
+    func = (str) {
+      init();
+      setState(() {});
+    };
+    SimpleEventBus.instance().resignEvent("PlanProgressBarState", func);
   }
 
   void init() {
@@ -61,7 +59,7 @@ class PlanProgressBarState extends State<PlanProgressBar> {
 
   @override
   void dispose() {
-    widget.changeNotifier.dispose();
+    SimpleEventBus.instance().unResignEvent("PlanProgressBarState", func);
     super.dispose();
   }
 

lib/MainRouter/MainRouterImpl.dart

@@ -45,7 +45,6 @@ class MainRouterImpl implements MainRouter {
 
   @override
   void getInitParams(VoidCallback callback) {
-    print("LST SECOND CALLBACK is null ?${callback == null}");
     MainManager.getInstance().getInitParams(callback);
   }
 }

lib/MainRouter/manager/MainManager.dart

@@ -10,6 +10,7 @@ import 'package:flutter_boost/flutter_boost.dart';
 import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
 import 'package:gm_flutter/commonModel/cache/CacheManager.dart';
+import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
 
 import '../../commonModel/App.dart';
@@ -72,21 +73,17 @@ class MainManager {
 
     innerSetData(map, BASE_URL);
     DioUtil.setDefOptions(baseUrl: "${map[BASE_URL]}/", agent: map[USER_AGENT]);
-    if (map[COOKIE] == null) {
-      CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
-          "_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
-    } else {
-      innerSetData(map, COOKIE);
-    }
+//    if (map[COOKIE] == null) {
+//      CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
+//          "_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
+//    } else {
+    innerSetData(map, COOKIE);
+//    }
     print(
         "LSY QQWWEERRTTYY ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}"
         "  ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) is String}");
     DioUtil.getInstance().changeOpt();
-    print("LSY QQ11   callback is NULL?${callback == null}");
-    if (callback != null) {
-      callback();
-    }
-    print("LSY QQ22");
+    SimpleEventBus.instance().notifyListener("PlanPage!initState", "");
   }
 
   void innerSetData(Map<String, dynamic> map, String str) {

lib/commonModel/view/baseRefreshIndicator.dart

@@ -8,6 +8,7 @@ import 'dart:math' as math;
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:gm_flutter/commonModel/GMBase.dart';
+import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:lottie/lottie.dart';
 
 // The over-scroll distance that moves the indicator to its maximum
@@ -167,14 +168,24 @@ class NestedScrollViewRefreshIndicatorState
   static final Animatable<double> _kDragSizeFactorLimitTween =
       Tween<double>(begin: 0.0, end: _kDragSizeFactorLimit);
 
+  Function(String str) func;
+
   @override
   void initState() {
     super.initState();
+    func = (str) {
+      if (str == "refresh") {
+        if (mounted) {
+          _show();
+        }
+      }
+    };
+    SimpleEventBus.instance()
+        .resignEvent("BaseNestedScrollViewRefreshIndicator", func);
     _positionController = AnimationController(vsync: this);
     _positionFactor = _positionController.drive(_kDragSizeFactorLimitTween);
     _value = _positionController.drive(
         _threeQuarterTween); // The "value" of the circular progress indicator during a drag.
-
   }
 
   @override
@@ -192,6 +203,8 @@ class NestedScrollViewRefreshIndicatorState
 
   @override
   void dispose() {
+    SimpleEventBus.instance()
+        .unResignEvent("BaseNestedScrollViewRefreshIndicator", func);
     _positionController.dispose();
     super.dispose();
   }