commit

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -300,10 +300,8 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                         Text('指导价：',
                             style: TextStyle(
                                 color: Color(0xff999999), fontSize: 12)),
-                        Text(
-                          '¥' + _model.planoverItem.guidePrice,
-                          style:
-                              TextStyle(color: Color(0xffFF5963), fontSize: 12),
+                        Expanded(
+                          child: baseText('¥' + _model.planoverItem.guidePrice,12,Color(0xffFF5963)),
                         )
                       ],
                     )
@@ -373,11 +371,11 @@ class LevelTwoState extends BaseState<LevelTwoPage>
           ),
           GestureDetector(
             onTap: () {
-//              RouterCenterImpl().findMainRouter().jumpPage(
-//                  context,
-//                  "level_one_plan_instruction",
-//                  {"planId": widget.planId},
-//                  false);
+              RouterCenterImpl().findMainRouter().jumpPage(
+                  context,
+                  "level_one_plan_instruction",
+                  {"planId": widget.planId},
+                  false);
             },
             behavior: HitTestBehavior.opaque,
             child: baseText("了解更多", 12, Color(0xff3FB5AF)),
@@ -388,13 +386,44 @@ class LevelTwoState extends BaseState<LevelTwoPage>
     if (_model.planoverItem != null) {
       _model.planoverItem.explanationAttrs.forEach((element) {
         list.add(Container(
-          height: 28,
+          margin: EdgeInsets.only(bottom: 15),
           child: Row(
             children: <Widget>[
-              baseText(element.attrName, 13, Color(0xff999999)),
               Container(
-                margin: EdgeInsets.only(left: 12),
-                child: baseText(element.attrValue, 13, Color(0xff666666)),
+                  constraints: BoxConstraints(
+                    maxWidth: 52,
+                  ),
+                  child: Text(
+                    element.attrName,
+                    textScaleFactor: 1.0,
+                    softWrap: true,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                        decoration: TextDecoration.none,
+                        fontSize: 13,
+                        color: Color(0xff999999),
+                        fontStyle: FontStyle.normal,
+                        fontWeight: FontWeight.w400),
+                  )),
+              Expanded(
+                child: Container(
+                  margin: EdgeInsets.only(left: 12),
+                  child: Text(
+                    element.attrValue,
+                    textScaleFactor: 1.0,
+                    softWrap: false,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                        decoration: TextDecoration.none,
+                        fontSize: 13,
+                        color: Color(0xff666666),
+                        fontStyle: FontStyle.normal,
+                        fontWeight: FontWeight.w400),
+                  ),
+//                baseText(element.attrValue, 13, Color(0xff666666)
+//                ),
+                ),
               )
             ],
           ),

lib/ClueModel/page/plan/PlanModel.dart

@@ -110,7 +110,6 @@ class PlanModel extends BaseModel {
   }
 
   void refreshFeed(bool clear, {RefreshController controller}) {
-
     if (clear) {
       page = 1;
       feedDatas.clear();
@@ -184,8 +183,8 @@ class PlanModel extends BaseModel {
     if (max_price == max.toString() && min_price == min.toString()) {
       return;
     }
-    max_price = max.toString();
-    min_price = min.toString();
+    max_price = "${max}";
+    min_price = "${min}";
     feedsLive.notifyView(Pair(LOADING, null));
     refreshFeed(true);
   }

lib/ClueModel/page/plan/PlanPage.dart

@@ -59,28 +59,19 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
   PlanBarView planBarView;
   double stateBarHeight;
   double topHeight;
-  Function(String str) func;
 
   @override
   void initState() {
     print("LSY PLAN INIT");
 //    DioUtil.getInstance().setProxy("172.30.9.128");
+    _model.init();
     super.initState();
-    func = (str) {
-      _model.init();
-    };
-    if (CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) == null) {
-      SimpleEventBus.instance().resignEvent("PlanPage!initState", func);
-    } else {
-      _model.init();
-    }
     planBarView =
         PlanBarView(_model.managerLive, clickIndex, hideAllMenuListener);
   }
 
   @override
   void dispose() {
-    SimpleEventBus.instance().unResignEvent("PlanPage!initState", func);
     hideAllMenuListener.dispose();
     projectMenuListener.dispose();
     sortMenuListener.dispose();

lib/MainRouter/MainRouter.dart

@@ -20,7 +20,4 @@ abstract class MainRouter extends RouterBaser {
   Widget getProxyPage();
 
   void catchErrorToBugly(String err);
-
-  void getInitParams(VoidCallback callback);
-
 }

lib/MainRouter/MainRouterImpl.dart

@@ -42,9 +42,4 @@ class MainRouterImpl implements MainRouter {
   void catchErrorToBugly(String err) {
     MainManager.getInstance().catchErrorToBugly(err);
   }
-
-  @override
-  void getInitParams(VoidCallback callback) {
-    MainManager.getInstance().getInitParams(callback);
-  }
 }

lib/MainRouter/manager/MainManager.dart

@@ -83,7 +83,7 @@ class MainManager {
         "LSY QQWWEERRTTYY ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}"
         "  ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) is String}");
     DioUtil.getInstance().changeOpt();
-    SimpleEventBus.instance().notifyListener("PlanPage!initState", "");
+//    SimpleEventBus.instance().notifyListener("PlanPage!initState", "");
   }
 
   void innerSetData(Map<String, dynamic> map, String str) {
@@ -110,20 +110,20 @@ class MainManager {
     }
   }
 
-  void getInitParams(VoidCallback callback) {
-    if (isInit) {
-      if (flutterChannel != null) {
-        flutterChannel.invokeMethod("get_common_params").then((data) {
-          if (data is Map) {
-            var map = Map<String, dynamic>.from(data);
-            initParams(map, callback: callback);
-          }
-        }).whenComplete(() {
-//          callback();
-        });
-        return;
-      }
-    }
-    callback();
-  }
+//  void getInitParams(VoidCallback callback) {
+//    if (isInit) {
+//      if (flutterChannel != null) {
+//        flutterChannel.invokeMethod("get_common_params").then((data) {
+//          if (data is Map) {
+//            var map = Map<String, dynamic>.from(data);
+//            initParams(map, callback: callback);
+//          }
+//        }).whenComplete(() {
+////          callback();
+//        });
+//        return;
+//      }
+//    }
+//    callback();
+//  }
 }

lib/commonModel/net/DioInterceptor.dart

@@ -27,10 +27,7 @@ class DioInterceptorManager {
       if (opt.headers == null) {
         opt.headers = Map();
       }
-      print("INTERCEPTOR");
       if (CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) != null) {
-        print(
-            "INTERCEPTOR 11 ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}");
         opt.headers[HttpHeaders.cookieHeader] =
             CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE);
       }