fix bug

lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart

@@ -34,6 +34,7 @@ class _PopView implements ICenterPicker {
   VoidCallback dismissCallback;
   double contentWidth;
   DiscussLowPriceModel _model = new DiscussLowPriceModel();
+
   @override
   Widget build(BuildContext context, int alp) {
     contentWidth = MediaQuery.of(context).size.width - 72;
@@ -51,7 +52,8 @@ class _PopView implements ICenterPicker {
               opacity: alp / 255.0,
               child: Container(
                 width: contentWidth,
-                height: _model.popViewLive.data.second.title.length > 13
+                height: _model.popViewLive.data.second.title != null &&
+                        _model.popViewLive.data.second.title.length > 13
                     ? 377.5
                     : 330.5,
                 child: Stack(
@@ -146,7 +148,7 @@ class _PopView implements ICenterPicker {
           Container(
               width: contentWidth,
               alignment: Alignment.center,
-              margin: EdgeInsets.only(bottom: 25,left: 30,right: 30),
+              margin: EdgeInsets.only(bottom: 25, left: 30, right: 30),
               child: baseText("${_model.popViewLive.data.second.title}", 18,
                   Color(0xff464646),
                   bold: true, textAlign: TextAlign.center, maxLines: 2)),

lib/ClueModel/page/levelOne/LevelOneList.dart

@@ -133,7 +133,9 @@ class LevelOneListState extends State<LevelOneList>
                               DiscussLowPricePopView.showPopView(
                                   context,
                                   widget.pageName,
-                                  "${widget.planId}",
+                                  data2.cardType == "plan"
+                                      ? "${data2.plan.plan_id}"
+                                      : "${widget.planId}",
                                   _model.data[index].cardType == "hospital"
                                       ? _model.data[index].hospital.hosiptalId
                                       : "",

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -455,7 +455,7 @@ class LevelOneState extends BaseState<LevelOnePage>
           child: Row(
             children: <Widget>[
               Container(
-                  width: 53.5,
+                  width: 55,
                   child: element.attrName.length < 4
                       ? Row(
                           children: textList,

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -415,7 +415,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
           child: Row(
             children: <Widget>[
               Container(
-                  width: 53.5,
+                  width: 55,
                   child: element.attrName.length < 4
                       ? Row(
                           children: textList,

lib/ClueModel/page/plan/PlanPage.dart

@@ -348,9 +348,8 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                 handle:
                     NestedScrollView.sliverOverlapAbsorberHandleFor(context),
                 sliver: baseSliverAppBar(null,
-                    height: 0,
-                    needpic: false,
-                    paddingTop: -(kToolbarHeight - stateBarHeight) + 2)),
+                    height: stateBarHeight,
+                    needpic: false)),
             SliverList(
                 delegate: SliverChildBuilderDelegate((BuildContext c, int i) {
               if (i == 0) {

lib/commonModel/base/BaseComponent.dart

@@ -11,6 +11,7 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter_common/commonModel/live/LiveData.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
+import 'package:gm_flutter/commonModel/view/ImagesAnimation.dart';
 import 'package:gm_flutter/commonModel/view/baseTabIndicator.dart';
 import 'package:gm_flutter/main.mark.dart';
 import 'package:lottie/lottie.dart';
@@ -364,8 +365,12 @@ Widget normalRefreshHeader() {
 //            durationSeconds: 1500,
 //            entry: ImagesAnimationEntry(1, 20, "assets/ptr_header_loading"));
 
-        body = Lottie.asset("assets/smart_refresh_header.json",
-            repeat: true, reverse: false);
+//        body = Lottie.asset("assets/smart_refresh_header.json",
+//            width: 55, height: 55, repeat: true, reverse: false);
+        body = ImagesAnimation(
+            h: 55,
+            durationSeconds: 1500,
+            entry: ImagesAnimationEntry(1, 16, "assets/ptr_header_loading"));
       }
 //            else if (mode == RefreshStatus.failed) {
 //            body = Text("Load Failed!Click retry!");

lib/commonModel/view/ImagesAnimation.dart

@@ -53,8 +53,8 @@ class _InState extends State<ImagesAnimation> with TickerProviderStateMixin {
         return new Image.asset(
           "${widget.entry.basePath}${frame}.png",
           gaplessPlayback: true, //避免图片闪烁
-          width: widget.w,
           height: widget.h,
+          fit: BoxFit.fitHeight,
         );
       },
     );

lib/commonModel/view/baseRefreshIndicator.dart

@@ -11,6 +11,8 @@ import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:lottie/lottie.dart';
 
+import 'ImagesAnimation.dart';
+
 // The over-scroll distance that moves the indicator to its maximum
 // displacement, as a percentage of the scrollable's container extent.
 const double _kDragContainerExtentPercentage = 0.25;
@@ -473,10 +475,17 @@ class NestedScrollViewRefreshIndicatorState
                 animation: _positionController,
                 builder: (BuildContext context, Widget child) {
                   return Container(
-                    height: 55,
-                    child: Lottie.asset("assets/smart_refresh_header.json",
-                        repeat: true, reverse: false),
-                  );
+                      height: 80,
+                      alignment: Alignment.center,
+//                    child:Center(
+//                      child:  Lottie.asset("assets/smart_refresh_header.json",
+//                          repeat: true, reverse: false, fit: BoxFit.fitHeight),
+//                    ),
+                      child: ImagesAnimation(
+                          h: 80,
+                          durationSeconds: 1500,
+                          entry: ImagesAnimationEntry(
+                              1, 16, "assets/ptr_header_loading")));
                 },
               ),
             ),

lib/main.dart

@@ -19,6 +19,7 @@ bool inProduction = true;
 
 void main() {
   inProduction = bool.fromEnvironment("dart.vm.product");
+  print("DEBUG?? ${inProduction}");
   navigationService = NavigationService();
   WidgetsFlutterBinding.ensureInitialized();
   FlutterError.onError = (FlutterErrorDetails details) async {