Merge branch 'test' of http://git.wanmeizhensuo.com/linshengyu/gm_flutter into zcc/flutter

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -173,15 +173,20 @@ class LevelOneItem extends StatelessWidget {
                 ),
               ),
             ),
-            Positioned(
-              left: 0,
-              bottom: 0,
-              child: Container(
-                width: MediaQuery.of(context).size.width - 30,
-                height: 0.5,
-                color: Color(0xffE5E5E5),
-              ),
-            )
+            allSize != null && position != null && position < allSize - 1
+                ? Positioned(
+                    left: 0,
+                    bottom: 0,
+                    child: Container(
+                      width: MediaQuery.of(context).size.width - 30,
+                      height: 0.5,
+                      color: Color(0xffE5E5E5),
+                    ),
+                  )
+                : Container(
+                    width: 0,
+                    height: 0,
+                  )
           ],
         ),
       ),
@@ -305,15 +310,20 @@ class LevelOneItem extends StatelessWidget {
 //                top: 47,
 //                child: FiveStarView(int.parse(cards.hospital.star), 5),
 //              ),
-              Positioned(
-                left: 0,
-                bottom: 0,
-                child: Container(
-                  width: MediaQuery.of(context).size.width - 30,
-                  height: 0.5,
-                  color: Color(0xffE5E5E5),
-                ),
-              )
+              allSize != null && position != null && position < allSize - 1
+                  ? Positioned(
+                      left: 0,
+                      bottom: 0,
+                      child: Container(
+                        width: MediaQuery.of(context).size.width - 30,
+                        height: 0.5,
+                        color: Color(0xffE5E5E5),
+                      ),
+                    )
+                  : Container(
+                      width: 0,
+                      height: 0,
+                    )
             ],
           ),
         ));
@@ -634,11 +644,15 @@ class LevelOneItem extends StatelessWidget {
               ],
             ),
           ),
-          Container(
-            width: double.maxFinite,
-            height: 0.5,
-            color: Color(0xffE5E5E5),
-          )
+          allSize != null && position != null && position < allSize - 1
+              ? Container(
+                  width: double.maxFinite,
+                  height: 0.5,
+                  color: Color(0xffE5E5E5),
+                )
+              : Container(
+                  height: 0.5,
+                )
         ],
       ),
     ).gestureDetector(() {

lib/ClueModel/page/plan/FilterView.dart

@@ -134,7 +134,7 @@ class FilterViewState extends State<FilterView> {
                   ),
                   Expanded(
                     child: Container(
-                      color: Color(0xff3FB5AF),
+                      color: Color(0xff51CDC7),
                       alignment: Alignment.center,
                       child: baseText("确定", 16, Colors.white),
                     ).gestureDetector(() {

lib/ClueModel/page/top/TopPage.dart

@@ -81,9 +81,7 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
   @override
   Widget buildItem(BuildContext context) {
     return Scaffold(
-        body: SafeArea(
-      top: false,
-      child: baseStateView(
+      body: baseStateView(
           MediaQuery.of(context).size.width,
           MediaQuery.of(context).size.height,
           _model.stateLive,
@@ -104,7 +102,7 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
       },
           paddingTop:
               MediaQueryData.fromWindow(window).padding.top + kToolbarHeight),
-    ));
+    );
   }
 
   Widget homeWarp() {

lib/MainRouter/manager/MainManager.dart

@@ -12,6 +12,7 @@ import 'package:flutter_common/commonModel/toast/toast.dart';
 import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
 import 'package:gm_flutter/commonModel/cache/CacheManager.dart';
+import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
 
 import '../../commonModel/App.dart';
@@ -72,7 +73,15 @@ class MainManager {
     innerSetData(map, USER_ID);
     innerSetData(map, USER_AGENT);
 
-//    innerSetData(map, BASE_URL);
+    innerSetData(map, BASE_URL);
+    if (map[BASE_URL] != null) {
+      DioUtil.getInstance();
+      DioUtil.setDefOptions(
+          baseUrl: "${map[BASE_URL]}/", agent: map[USER_AGENT]);
+      DioUtil.getInstance().changeOpt();
+    }
+    SimpleEventBus.instance().notifyListener("clueModel|Plan|PlanPage", "init");
+
 //    if (map[COOKIE] == null) {
 //      CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
 //          "_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
@@ -88,11 +97,7 @@ class MainManager {
     print(
         "LSY QQWWEERRTTYY ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}"
         "  ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) is String}");
-    if (map[BASE_URL] != null) {
-      DioUtil.setDefOptions(
-          baseUrl: "${map[BASE_URL]}/", agent: map[USER_AGENT]);
-      DioUtil.getInstance().changeOpt();
-    }
+
 //    SimpleEventBus.instance().notifyListener("PlanPage!initState", "");
   }
 

lib/commonModel/net/DioUtil.dart

@@ -53,7 +53,7 @@ class DioUtil {
     (_dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate =
         (client) {
       client.findProxy = (url) {
-        return 'PROXY $proxy:${port??8888}';
+        return 'PROXY $proxy:${port ?? 8888}';
       };
     };
   }
@@ -62,7 +62,7 @@ class DioUtil {
     return _dio;
   }
 
-  static void setDefOptions({String baseUrl, String cookie, String agent}) {
+  static void setDefOptions({String baseUrl, String agent}) {
     _options.connectTimeout = 10 * 1000;
     _options.receiveTimeout = 20 * 1000;
     _options.responseType = ResponseType.plain;
@@ -71,10 +71,8 @@ class DioUtil {
     if (agent != null) {
       headers['User-Agent'] = agent;
     }
-    if (cookie != null) {
-      headers[HttpHeaders.cookieHeader] = cookie;
-    }
     _options.headers = headers;
-    _options.baseUrl = baseUrl ?? Api.getInstance().getBaseUrl() + "/";
+    print("ISEMPTY ?? ${baseUrl}");
+    _options.baseUrl = baseUrl ?? "${Api.getInstance().getBaseUrl()}/";
   }
 }