Merge branch 'test' into featrue/duxin

.gitignore

@@ -46,3 +46,4 @@ app.*.symbols
 
 # Obfuscation related
 app.*.map.json
+.updateAar.sh
\ No newline at end of file

lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart

@@ -56,7 +56,6 @@ class _PopView implements ICenterPicker {
           return Opacity(
               opacity: alp / 255.0,
               child: Container(
-                color: Colors.red,
                 width: contentWidth,
                 height: _model.popViewLive.data.second.title.length > 13
                     ? 367.5

lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart

@@ -41,7 +41,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
 
   @override
   void initState() {
-//    DioUtil.getInstance().setProxy("172.30.9.128");
+    //  DioUtil.getInstance().setProxy("172.30.9.128");
     super.initState();
     _model.init(widget._planIds);
   }
@@ -446,10 +446,10 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
       children: <Widget>[
         planItem(
             index > plan1.attrs.length - 1
-                ? "无"
+                ? "暂无"
                 : "${plan1.attrs[index].attrValue}",
             index > plan2.attrs.length - 1
-                ? "无"
+                ? "暂无"
                 : "${plan2.attrs[index].attrValue}",
             false),
         Container(
@@ -457,10 +457,10 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
         ),
         planItem(
             index > plan1.attrs.length - 1
-                ? "无"
+                ? "暂无"
                 : "${plan1.attrs[index].attrName}",
             index > plan2.attrs.length - 1
-                ? "无"
+                ? "暂无"
                 : "${plan2.attrs[index].attrName}",
             true),
         Container(
@@ -475,7 +475,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
     return Row(children: <Widget>[
       Expanded(
         flex: 1,
-        child: baseText(left.empty() ? "无" : left, 14,
+        child: baseText(left.empty() ? "暂无" : left, 14,
             isName ? Color(0xff666666) : Color(0xff3FB5AF),
             bold: true, maxLines: 100, isWarp: true, textAlign: TextAlign.end),
       ),
@@ -484,7 +484,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
       ),
       Expanded(
           flex: 1,
-          child: baseText(right.empty() ? "无" : right, 14,
+          child: baseText(right.empty() ? "暂无" : right, 14,
               isName ? Color(0xff666666) : Color(0xffF25874),
               bold: true,
               maxLines: 100,

lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedItemView.dart

@@ -40,6 +40,7 @@ class _PlansCompareFeedItemViewState
   }
 
   getItem() {
+    _icon = widget.plan.isChecked ? _checked : _unchecked;
     if (widget.plan.planType == 1) {
       return getFirstLevelItem();
     } else {
@@ -200,12 +201,14 @@ class _PlansCompareFeedItemViewState
   onClickCheckBox(String icon) {
     if (icon == _checked) {
       _icon = _unchecked;
+      widget.plan.isChecked = false;
     } else {
       if (widget._setCompare.length == 2) {
         NativeToast.showNativeToast("请选择最多2个项目进行对比");
         return;
       }
       _icon = _checked;
+      widget.plan.isChecked = true;
     }
     setState(() {
       widget.compareItem.checkedItem(widget.plan.planId);

lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedPage.dart

@@ -128,7 +128,7 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
         widget._planType == 1
             ? "level_one_plan_compare_detail"
             : "level_two_plan_compare_deatil",
-        {"planIds": _setCompare.toList()},
+        {"planIds": _setCompare.toList(), "referrer_tab_name": ""},
         false);
   }
 

lib/ClueModel/page/ProjectDetails/ProjectDetailsItemView.dart

@@ -54,7 +54,7 @@ class ProjectDetailsItemView extends StatelessWidget {
         Container(
             margin: EdgeInsets.only(right: 25.0, left: 15, bottom: 25),
             width: 78,
-            child: baseText(attrs.attrName.empty() ? "无" : attrs.attrName, 13,
+            child: baseText(attrs.attrName.empty() ? "暂无" : attrs.attrName, 13,
                 Color(0xFF999999),
                 textAlign: TextAlign.start,
                 maxLines: 2,
@@ -62,7 +62,7 @@ class ProjectDetailsItemView extends StatelessWidget {
         Expanded(
           child: Container(
               margin: EdgeInsets.only(right: 15, bottom: 25),
-              child: baseText(attrs.attrValue.empty() ? "无" : attrs.attrValue,
+              child: baseText(attrs.attrValue.empty() ? "暂无" : attrs.attrValue,
                   14, Color(0xFF282828),
                   textAlign: TextAlign.start,
                   maxLines: 2,

lib/ClueModel/page/ProjectDetails/ProjectDetailsPage.dart

@@ -70,7 +70,10 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
           return Container();
         }
         ProjectDetailsItem item = data.data;
-        if (item == null || item.data == null || item.data.groups == null) {
+        if (item == null ||
+            item.data == null ||
+            item.data.groups == null ||
+            item.data.groups.isEmpty) {
           return emptyItem(MediaQuery.of(context).size.width,
               MediaQuery.of(context).size.height);
         }

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -76,6 +76,7 @@ class LevelOneItem extends StatelessWidget {
             position, tabName, "doctor", cards.doctor.doctor_id);
         Map<String, dynamic> map = {
           "business_id": "${cards.doctor.doctor_id}",
+          "referrer_tab_name": ""
         };
         RouterCenterImpl()
             .findMainRouter()
@@ -205,6 +206,7 @@ class LevelOneItem extends StatelessWidget {
               position, tabName, "hospital", cards.hospital.hosiptalId);
           Map<String, dynamic> map = {
             "business_id": "${cards.hospital.hosiptalId}",
+            "referrer_tab_name": ""
           };
           RouterCenterImpl()
               .findMainRouter()
@@ -394,7 +396,8 @@ class LevelOneItem extends StatelessWidget {
           position, tabName, "level_two_plan", "${cards.plan.plan_id}");
       Map<String, dynamic> map = {
         "business_id": "${cards.plan.plan_id}",
-        "planId": cards.plan.plan_id
+        "planId": cards.plan.plan_id,
+        "referrer_tab_name": ""
       };
       RouterCenterImpl()
           .findMainRouter()

lib/ClueModel/page/levelOne/LevelOneList.dart

@@ -185,7 +185,8 @@ class LevelOneListState extends State<LevelOneList>
                           Map<String, dynamic> map = {
                             "business_id": "${widget.planId}",
                             "planId": planId,
-                            "planType": 2
+                            "planType": 2,
+                            "referrer_tab_name": ""
                           };
                           RouterCenterImpl().findMainRouter().jumpPage(
                               context,

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -428,7 +428,8 @@ class LevelOneState extends BaseState<LevelOnePage>
             onTap: () {
               Map<String, dynamic> map = {
                 "business_id": "${widget.planId}",
-                "planId": widget.planId
+                "planId": widget.planId,
+                "referrer_tab_name": _model.tabsList[tabController.index].name
               };
               RouterCenterImpl()
                   .findMainRouter()
@@ -447,11 +448,9 @@ class LevelOneState extends BaseState<LevelOnePage>
           child: Row(
             children: <Widget>[
               Container(
-                  width: 52,
-//                  constraints: BoxConstraints(
-//                    maxWidth: 52,
-//                    minWidth:
-//                  ),
+                  constraints: BoxConstraints(
+                    maxWidth: 55,
+                  ),
                   child: Text(
                     element.attrName.length == 2
                         ? "${element.attrName.substring(0, 1)}      ${element.attrName.substring(1, 2)}"
@@ -515,11 +514,12 @@ class LevelOneState extends BaseState<LevelOnePage>
               Map<String, dynamic> map = {
                 "business_id": "${widget.planId}",
                 "planId": widget.planId,
-                "planType": 1
+                "planType": 1,
+                "referrer_tab_name": _model.tabsList[tabController.index].name
               };
               RouterCenterImpl()
                   .findMainRouter()
-                  .jumpPage(context, "level_two_plan_compare", map, false);
+                  .jumpPage(context, "level_one_plan_compare", map, false);
             },
             child: Container(
               margin: EdgeInsets.only(left: 21),

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -386,7 +386,8 @@ class LevelTwoState extends BaseState<LevelTwoPage>
             onTap: () {
               Map<String, dynamic> map = {
                 "business_id": "${widget.planId}",
-                "planId": widget.planId,
+                "referrer_tab_name": _model.tabsList[tabController.index].name,
+                "planId": widget.planId
               };
               RouterCenterImpl()
                   .findMainRouter()
@@ -468,6 +469,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
             onTap: () {
               Map<String, dynamic> map = {
                 "business_id": "${widget.planId}",
+                "referrer_tab_name": _model.tabsList[tabController.index].name,
                 "planId": widget.planId,
                 "planType": 2
               };

lib/ClueModel/page/plan/PlanItem.dart

@@ -48,6 +48,13 @@ class PlanItem extends StatelessWidget {
     }
     rate = rate.replaceAll("%", "");
     var price = NumPlanUtil.getPrice(plans.minPrice, plans.maxPrice);
+    String showOprea = "";
+    if (!plans.operation_type.empty()) {
+      showOprea = plans.operation_type.contains(";")
+          ? plans.operation_type.split(";")[0]
+          : plans.operation_type;
+      showOprea = showOprea.length > 4 ? showOprea.substring(0, 4) : showOprea;
+    }
     return Container(
         margin: EdgeInsets.only(top: 10, left: 10, right: 10),
         child: Card(
@@ -81,7 +88,7 @@ class PlanItem extends StatelessWidget {
                     mainAxisSize: MainAxisSize.min,
                     children: <Widget>[
                       Container(
-                        constraints: BoxConstraints(maxWidth: 95),
+                        constraints: BoxConstraints(maxWidth: 126),
                         child: baseText(plans.name, 14, Color(0xff282828),
                             bold: true),
                       ),
@@ -91,7 +98,7 @@ class PlanItem extends StatelessWidget {
                               height: 0,
                             )
                           : Container(
-                              constraints: BoxConstraints(maxWidth: 60),
+//                              constraints: BoxConstraints(maxWidth: 60),
                               margin: EdgeInsets.only(left: 4),
                               child: Container(
                                 padding: EdgeInsets.only(
@@ -100,7 +107,7 @@ class PlanItem extends StatelessWidget {
                                     borderRadius: BorderRadius.circular(2),
                                     color: Color(0xffF0F9F7)),
                                 alignment: Alignment.center,
-                                child: baseText("${plans.operation_type}", 11,
+                                child: baseText(showOprea, 11,
                                     Color(0xff3FB5AF),
                                     bold: true),
                               ),
@@ -181,6 +188,7 @@ class PlanItem extends StatelessWidget {
               .buriedEvent("on_click_card", buriedMap);
           Map<String, dynamic> map = {
             "business_id": "${plans.id}",
+            "referrer_tab_name": "",
             "planId": plans.id,
             "title": "${plans.name}"
           };

lib/ClueModel/page/plan/PlanModel.dart

@@ -61,7 +61,6 @@ class PlanModel extends BaseModel {
       picLive.notifyView(planBean.data.ranks);
       low = PlanModelInstance.getInstance().low;
       high = PlanModelInstance.getInstance().high;
-      print("QWEEW${low} ${high}");
 
       projectSelectIndex = PlanModelInstance.getInstance().projectSelectIndex;
 

lib/ClueModel/page/plan/PlanPage.dart

@@ -89,11 +89,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
     stateBarHeight = MediaQueryData.fromWindow(window).padding.top;
     topHeight = stateBarHeight + kToolbarHeight;
     return Scaffold(
-        body: MediaQuery.removePadding(
-      removeTop: true,
-      context: context,
-      child: SafeArea(
-          top: false,
+      body: MediaQuery.removePadding(
+          removeTop: true,
+          context: context,
           child: baseStateView(
               MediaQuery.of(context).size.width,
               MediaQuery.of(context).size.height,
@@ -102,7 +100,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
             _model.stateLive.notifyView(LOADING);
             _model.init();
           }, paddingTop: stateBarHeight + kToolbarHeight)),
-    ));
+    );
   }
 
   Widget newHome() {
@@ -446,6 +444,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                       "id": "${data.data[0].id}",
                       "title": "${data.data[0].name}",
                       "business_id": "${data.data[0].id}",
+                      "referrer_tab_name": ""
                     };
 
                     RouterCenterImpl()
@@ -477,6 +476,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                       "id": "${data.data[1].id}",
                       "title": "${data.data[1].name}",
                       "business_id": "${data.data[1].id}",
+                      "referrer_tab_name": ""
                     };
 
                     RouterCenterImpl()

lib/ClueModel/server/entity/PlansCompareFeed.dart

@@ -86,6 +86,7 @@ class Plans {
   String maxPrice;
   String projectImage;
   String guidePrice;
+  bool isChecked = false;
 
   Plans(
       {this.planId,

lib/commonModel/view/baseTabIndicator.dart

@@ -43,15 +43,14 @@ class _MD2Painter extends BoxPainter {
   void paint(Canvas canvas, Offset offset, ImageConfiguration configuration) {
     assert(configuration != null);
     assert(configuration.size != null);
-    double width = (configuration.size.width-50) / 3.0 * 2.0;
     Rect rect = Offset(
             offset.dx +
                 configuration.size.width / 2 -
-                width / 2,
+                decoration.indicatorWidth / 2,
             (configuration.size.height -
                 decoration.indicatorHeight -
                 decoration.indicatorPaddingBottom)) &
-        Size(width, decoration.indicatorHeight);
+        Size(decoration.indicatorWidth, decoration.indicatorHeight);
 
     final Paint paint = Paint();
     paint.color = decoration.indicatorColor;

updateAar.sh

@@ -17,6 +17,6 @@ rm -rf ${projectDir}/build
 flutter build aar --release --target-platform android-arm
 
 #rm -rf /Users/apple/lsy/gengmei_android/gm-flutter/libs/flutterApp.aar
-cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/apple/lsy/gengmei_android/gm-flutter/libs/flutterApp.aar
+cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/zcc/Downloads/gm-flutter/libs/flutterApp.aar