Merge branch 'zx/gmFlutter' into 'test'

埋点修改

See merge request !45

lib/ClueModel/page/levelOne/LevelOneList.dart

@@ -24,11 +24,12 @@ class LevelOneList extends StatefulWidget {
   double topHeight;
   int planId;
   String tabName;
+  String tabType;
   String pageName;
   int index;
 
-  LevelOneList(
-      this.index, this.pageName, this.planId, this.tabName, this.topHeight);
+  LevelOneList(this.index, this.pageName, this.planId, this.tabType,
+      this.tabName, this.topHeight);
 
   @override
   State<StatefulWidget> createState() => LevelOneListState();
@@ -45,7 +46,7 @@ class LevelOneListState extends State<LevelOneList>
   void initState() {
     super.initState();
     _model.plan_id = widget.planId;
-    _model.tab_type = widget.tabName;
+    _model.tab_type = widget.tabType;
     _model.refreshView(true);
     refresh = (str) {
       _model.stateLive.notifyView(LOADING);
@@ -205,7 +206,7 @@ class LevelOneListState extends State<LevelOneList>
                               map,
                               false);
                         },
-                        tabName: _model.tab_type,
+                        tabName: widget.tabName,
                         position: index,
                       );
                     },

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -201,8 +201,13 @@ class LevelOneState extends BaseState<LevelOnePage>
     for (int i = 0; i < _model.tabsList.length; i++) {
       list.add(extend.NestedScrollViewInnerScrollPositionKeyWidget(
           Key("Tab${i}"),
-          LevelOneList(0, widget.PAGE_NAME, widget.planId,
-              _model.tabsList[i].tabType, kToolbarHeight + stateBarHeight)));
+          LevelOneList(
+              0,
+              widget.PAGE_NAME,
+              widget.planId,
+              _model.tabsList[i].tabType,
+              _model.tabsList[i].name,
+              kToolbarHeight + stateBarHeight)));
     }
     final double statusBarHeight = MediaQuery.of(context).padding.top;
     final double pinnedHeaderHeight = statusBarHeight + kToolbarHeight;

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -203,8 +203,13 @@ class LevelTwoState extends BaseState<LevelTwoPage>
     for (int i = 0; i < _model.tabsList.length; i++) {
       list.add(extend.NestedScrollViewInnerScrollPositionKeyWidget(
           Key("Tab${i}"),
-          LevelOneList(1, widget.PAGE_NAME, widget.planId,
-              _model.tabsList[i].tabType, kToolbarHeight + d)));
+          LevelOneList(
+              1,
+              widget.PAGE_NAME,
+              widget.planId,
+              _model.tabsList[i].tabType,
+              _model.tabsList[i].name,
+              kToolbarHeight + d)));
     }
     final double statusBarHeight = MediaQuery.of(context).padding.top;
     final double pinnedHeaderHeight = statusBarHeight + kToolbarHeight;