commit

lib/ClueModel/page/plan/PlanItem.dart

@@ -12,8 +12,10 @@ import 'package:gm_flutter/main.mark.dart';
 
 class PlanItem extends StatelessWidget {
   final Plans plans;
+  final int pos;
+  final bool isPlanPage;
 
-  PlanItem(this.plans);
+  PlanItem(this.plans, this.pos, this.isPlanPage);
 
   @override
   Widget build(BuildContext context) {
@@ -113,6 +115,23 @@ class PlanItem extends StatelessWidget {
         ),
       ),
     ).gestureDetector(() {
+      Map<String, dynamic> map;
+      if (isPlanPage) {
+        map = {
+          "page_name": "plan_home",
+          "tab_name": "plan_home",
+          "referrer_id": "",
+          "referrer": "",
+          "position": pos,
+          "business_id": "",
+          "card_id": plans.id,
+          "card_type": "card",
+          "transaction_type": "",
+          "card_content_type": "level_one_plan"
+        };
+      }
+
+      RouterCenterImpl().findMainRouter().buriedEvent("on_click_card", map);
       RouterCenterImpl().findMainRouter().jumpPage(
           context, "level_one_plan_detail", {"planId": plans.id}, false);
     });

lib/ClueModel/page/plan/PlanPage.dart

@@ -62,7 +62,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
   @override
   void initState() {
     print("LSY PLAN INIT");
-//    DioUtil.getInstance().setProxy("172.30.8.245");
+//    DioUtil.getInstance().setProxy("172.30.9.128");
     super.initState();
     if (CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) == null) {
       RouterCenterImpl().findMainRouter().getInitParams((() {
@@ -397,7 +397,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                       } else {
                         refreshController.loadComplete();
                       }
-                      return PlanItem(_model.feedDatas[index]);
+                      return PlanItem(_model.feedDatas[index],index,true);
                     },
                     childCount: _model.feedDatas.length,
                   ),
@@ -523,65 +523,4 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
       filterMenuListener.show();
     }
   }
-
-  Widget pages() {
-    return StreamBuilder<Pair<int, List<Plans>>>(
-      stream: _model.feedsLive.stream,
-      initialData: _model.feedsLive.data ?? Pair(LOADING, null),
-      builder: (c, data) {
-        double height = MediaQuery.of(context).size.height - 131;
-        if (_model.feedDatas != null && _model.feedDatas.length > 0) {
-          height = max(_model.feedDatas.length * 100.0, height);
-        }
-        if (data.data.first == FAIL) {
-          return Container(
-            color: Color(0xffF7F6FA),
-            width: double.maxFinite,
-            height: height,
-            child: errorItem(MediaQuery.of(context).size.width, height, () {
-              _model.feedsLive.notifyView(Pair(LOADING, null));
-              _model.refreshFeed(true);
-            }),
-          );
-        }
-        if (data.data.first == LOADING) {
-          return Container(
-            color: Color(0xffF7F6FA),
-            width: double.maxFinite,
-            height: height,
-            child: loadingItem(),
-          );
-        }
-        return Container(
-            color: Color(0xffF7F6FA),
-            width: double.maxFinite,
-            height: height,
-            child: ListView.builder(
-              physics: NeverScrollableScrollPhysics(),
-              itemBuilder: (c, index) {
-                if (data.data.first == FAIL) {
-                  return errorItem(MediaQuery.of(context).size.width, height,
-                      () {
-                    _model.refreshFeed(true);
-                  });
-                }
-                if (data.data.first == LOADING) {
-                  return loadingItem();
-                }
-                if (data.data.second.length == 0) {
-                  if (_model.page == 1) {
-                    return emptyItem(MediaQuery.of(context).size.width, height);
-                  } else {
-                    refreshController.loadNoData();
-                  }
-                } else {
-                  refreshController.loadComplete();
-                }
-                return PlanItem(_model.feedDatas[index]);
-              },
-              itemCount: _model.feedDatas.length,
-            ));
-      },
-    );
-  }
 }

lib/ClueModel/page/top/TopList.dart

@@ -10,7 +10,6 @@ import 'package:gm_flutter/commonModel/bean/Pair.dart';
 import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
-
 import 'TopListModel.dart';
 
 class TopList extends StatefulWidget {
@@ -23,8 +22,7 @@ class TopList extends StatefulWidget {
   State<StatefulWidget> createState() => TopListState();
 }
 
-class TopListState extends State<TopList>
-    with AutomaticKeepAliveClientMixin{
+class TopListState extends State<TopList> with AutomaticKeepAliveClientMixin {
   RefreshController refreshController = RefreshController();
   TopListModel _model = TopListModel();
   Function(String str) refresh;
@@ -32,7 +30,7 @@ class TopListState extends State<TopList>
   @override
   void initState() {
     super.initState();
-    _model.tagId="${widget.id}";
+    _model.tagId = "${widget.id}";
     _model.getData(true);
     refresh = (str) {
       _model.stateLive.notifyView(LOADING);
@@ -57,7 +55,7 @@ class TopListState extends State<TopList>
     return baseStateView(MediaQuery.of(context).size.width,
         MediaQuery.of(context).size.height, _model.stateLive, home(), () {
       _model.getData(true);
-    },paddingTop: widget.topHeight);
+    }, paddingTop: widget.topHeight);
   }
 
   Widget home() {
@@ -88,7 +86,7 @@ class TopListState extends State<TopList>
                   itemExtent: 100,
                   delegate: SliverChildBuilderDelegate(
                     (BuildContext context, int index) {
-                      return PlanItem(_model.datas[index]);
+                      return PlanItem(_model.datas[index], index, false);
                     },
                     childCount: _model.datas.length,
                   ),
@@ -101,8 +99,7 @@ class TopListState extends State<TopList>
               builder: (c, data) {
                 double height = MediaQuery.of(context).size.height -
                     40 -
-                    100 * _model.datas.length
-                ;
+                    100 * _model.datas.length;
                 return SliverToBoxAdapter(
                   child: Container(
                     height: height < 0 ? 0 : height,

lib/ClueModel/page/top/TopModel.dart

@@ -13,6 +13,7 @@ import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
 import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
 import 'package:gm_flutter/commonModel/util/PrintUtil.dart';
+import 'package:gm_flutter/main.mark.dart';
 
 class TopModel extends BaseModel {
   int tabIndex = 0;
@@ -40,6 +41,10 @@ class TopModel extends BaseModel {
       return;
     }
     tabIndex = index;
+//    Map<String, dynamic> map = {
+//      "page_name"
+//    };
+//    RouterCenterImpl().findMainRouter().buriedEvent("on_click_tab", map);
   }
 
   void init(VoidCallback back) {

lib/MainRouter/manager/MainManager.dart

@@ -47,7 +47,7 @@ class MainManager {
     });
   }
 
-  void initParams(Map<String, dynamic> map) {
+  void initParams(Map<String, dynamic> map, {VoidCallback callback}) {
     innerSetData(map, APP_NAME);
     innerSetData(map, VERSION);
     innerSetData(map, PLATFORM);
@@ -82,6 +82,11 @@ class MainManager {
         "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");
   }
 
   void innerSetData(Map<String, dynamic> map, String str) {
@@ -114,10 +119,10 @@ class MainManager {
         flutterChannel.invokeMethod("get_common_params").then((data) {
           if (data is Map) {
             var map = Map<String, dynamic>.from(data);
-            initParams(map);
+            initParams(map, callback: callback);
           }
         }).whenComplete(() {
-          callback();
+//          callback();
         });
         return;
       }