Merge branch 'zx/gmFlutter' into 'test'

Zx/gm flutter

See merge request !34

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -67,20 +67,8 @@ class LevelOneItem extends StatelessWidget {
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
       onTap: () {
-        Map<String, dynamic> buriedMap;
-        buriedMap = {
-          "tab_name": tabName,
-          "position": position,
-          "card_id": cards.doctor.doctor_id,
-          "card_name": "card",
-          "card_type": "card",
-          "transaction_type": "",
-          "card_content_type": "doctor"
-        };
-        RouterCenterImpl()
-            .findMainRouter()
-            .buriedEvent("on_click_card", buriedMap);
-
+        buried_on_click_card(
+            position, tabName, "doctor", cards.doctor.doctor_id);
         Map<String, dynamic> map = {
           "business_id": "${cards.doctor.doctor_id}",
         };
@@ -198,19 +186,8 @@ class LevelOneItem extends StatelessWidget {
     return GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: () {
-          Map<String, dynamic> buriedMap;
-          buriedMap = {
-            "tab_name": tabName,
-            "position": position,
-            "card_id": cards.hospital.hosiptalId,
-            "card_name": "card",
-            "card_type": "card",
-            "transaction_type": "",
-            "card_content_type": "hospital"
-          };
-          RouterCenterImpl()
-              .findMainRouter()
-              .buriedEvent("on_click_card", buriedMap);
+          buried_on_click_card(
+              position, tabName, "hospital", cards.hospital.hosiptalId);
           Map<String, dynamic> map = {
             "business_id": "${cards.hospital.hosiptalId}",
           };
@@ -396,20 +373,8 @@ class LevelOneItem extends StatelessWidget {
         ],
       ),
     ).gestureDetector(() {
-      Map<String, dynamic> buriedMap;
-      buriedMap = {
-        "tab_name": tabName,
-        "position": position,
-        "card_id": cards.plan.plan_id,
-        "card_name": "card",
-        "card_type": "card",
-        "transaction_type": "",
-        "card_content_type": "level_two_plan"
-      };
-      RouterCenterImpl()
-          .findMainRouter()
-          .buriedEvent("on_click_card", buriedMap);
-
+      buried_on_click_card(
+          position, tabName, "level_two_plan", "${cards.plan.plan_id}");
       Map<String, dynamic> map = {
         "business_id": "${cards.plan.plan_id}",
         "planId": cards.plan.plan_id
@@ -652,4 +617,19 @@ class LevelOneItem extends StatelessWidget {
           "gengmei://diary?diary_id=${cards.diary.diaryId}", null, true);
     });
   }
+
+  buried_on_click_card(
+      int position, String btnName, String cardContentType, String cardId) {
+    Map<String, dynamic> buriedMap;
+    buriedMap = {
+      "tab_name": tabName,
+      "position": position,
+      "card_id": cardId,
+      "card_name": "card",
+      "card_type": "card",
+      "transaction_type": "",
+      "card_content_type": cardContentType
+    };
+    RouterCenterImpl().findMainRouter().buriedEvent("on_click_card", buriedMap);
+  }
 }

lib/ClueModel/page/levelOne/LevelOneModel.dart

@@ -15,6 +15,7 @@ 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:pull_to_refresh/pull_to_refresh.dart';
+import 'package:gm_flutter/main.mark.dart';
 
 class LevelOneModel extends BaseModel {
   LiveData<int> stateLive = LiveData();
@@ -59,7 +60,19 @@ class LevelOneModel extends BaseModel {
     textLive.dispost();
   }
 
-  void selectTab(int index) {
+  void selectTab(int index, String tab_name, String from_tab_name) {
+    buried_on_click_tab(index, tab_name, from_tab_name);
+  }
 
+  buried_on_click_tab(int position, String tab_name, String from_tab_name) {
+    Map<String, dynamic> buriedMap;
+    buriedMap = {
+      "tab_name": tab_name,
+      "position": position,
+      "from_tab_name": from_tab_name,
+    };
+    RouterCenterImpl()
+        .findMainRouter()
+        .buriedEvent("on_click_button", buriedMap);
   }
 }

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -18,6 +18,7 @@ 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';
 import 'package:gm_flutter/ClueModel/page/mechanismBox/MechanismBoxPage.dart';
+import 'package:gm_flutter/ClueModel/server/entity/PlanBarBean.dart';
 import 'package:gm_flutter/ClueModel/util/NumPlanUtil.dart';
 import 'package:gm_flutter/commonModel/App.dart';
 import 'package:gm_flutter/commonModel/GMBase.dart';
@@ -232,7 +233,9 @@ class LevelOneState extends BaseState<LevelOnePage>
                 height: 40,
                 color: Colors.white,
                 child: baseTabBar(tabController, getTabs(), (index) {
-                  _model.selectTab(index);
+                  _model.selectTab(index, _model.tabsList[index].name,
+                      _model.tabsList[_model.currentIndex].name);
+                  _model.currentIndex = index;
                 }, scroll: false),
               )),
             ),
@@ -329,9 +332,7 @@ class LevelOneState extends BaseState<LevelOnePage>
             right: 15,
             bottom: 8,
             child: baseText(
-                "销量${_model.planoverItem.salesCount}",
-                11,
-                Color(0xff666666)),
+                "销量${_model.planoverItem.salesCount}", 11, Color(0xff666666)),
           )
         ],
       ),

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -235,18 +235,9 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                 height: 40,
                 color: Colors.white,
                 child: baseTabBar(tabController, getTabs(), (index) {
-                  Map<String, dynamic> map = {};
-                  map["page_name"] = "level_two_plan_deatil";
-                  map["referrer"] = "";
-                  map["referrer_id"] = "";
-                  map["referrer_link"] = ["plan_home"];
-                  map["from_tab_name"] = "全部";
-                  map["tab_name"] = index == 0 ? '机构' : '医生';
-                  map["position"] = 1;
-                  RouterCenterImpl()
-                      .findMainRouter()
-                      .buriedEvent("on_click_tab", map);
-                  _model.selectTab(index);
+                  _model.selectTab(index, _model.tabsList[index].name,
+                      _model.tabsList[_model.currentIndex].name);
+                  _model.currentIndex = index;
                 }, scroll: false),
               )),
             ),