Merge branches 'test' and 'zcc/flutter' of…

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

lib/ClueModel/ClueRouter.dart

@@ -14,7 +14,7 @@ abstract class ClueRouter implements RouterBaser {
 
   Widget getPlansCompareFeed();
 
-  Widget getLevelOnePage(int planId);
+  Widget getLevelOnePage(Map<String,dynamic> params);
 
   Widget getLevelTwoPage();
 

lib/ClueModel/ClueRouterImpl.dart

@@ -20,8 +20,8 @@ class ClueRouterImpl implements ClueRouter {
   }
 
   @override
-  Widget getLevelOnePage(int planId) {
-    return LevelOnePage(planId);
+  Widget getLevelOnePage(Map<String,dynamic> params) {
+    return LevelOnePage(params);
   }
 
   @override

lib/ClueModel/page/levelOne/LevelOneList.dart

@@ -89,7 +89,9 @@ class LevelOneListState extends State<LevelOneList>
                           color: Color(0xffF7F6FA),
                         );
                       }
-                      return LevelOneItem(_model.data[index]);
+                      return LevelOneItem(_model.data[index]
+                      ,lowPrice: (){
+                        },);
                     },
                     childCount: _model.data.length+1,
                   ),

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -14,9 +14,12 @@ import 'package:flutter/services.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/levelTwo/LevelTwoPage.dart';
+import 'package:gm_flutter/commonModel/App.dart';
+import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 import 'package:gm_flutter/commonModel/base/BaseState.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 'package:gm_flutter/commonModel/view/baseRefreshIndicator.dart';
@@ -25,8 +28,11 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class LevelOnePage extends StatefulWidget {
   int planId = 10;
+  Map<String, dynamic> params;
 
-  LevelOnePage(this.planId);
+  LevelOnePage(this.params) {
+    this.planId = params["planId"];
+  }
 
   @override
   State<StatefulWidget> createState() => LevelOneState();
@@ -48,6 +54,9 @@ class LevelOneState extends BaseState<LevelOnePage>
 
   @override
   void initState() {
+    CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
+        "_gtid=3123e178b91a11eaa2d87e40d376ac134112; sessionid=pq9wf8equ4h26ia3yspzmquqn2rjs6mx; _gm_token=4091a81593419225");
+    DioUtil.getInstance().setProxy("172.30.8.245");
     super.initState();
     _model.plan_id = widget.planId;
     _model.init(() {

lib/ClueModel/page/plan/PlanPage.dart

@@ -30,6 +30,7 @@ import 'PlanModel.dart';
 import 'ProjectView.dart';
 
 class PlanPage extends StatefulWidget {
+
   @override
   State<StatefulWidget> createState() => PlanState();
 }

lib/MainRouter/MainRouter.dart

@@ -14,4 +14,6 @@ abstract class MainRouter extends RouterBaser {
   Widget getTestPage();
 
   void buriedEvent(String name, Map<String, dynamic> map);
+
+  void jumpPage(BuildContext context,String pageName, Map<String, dynamic> params,bool nativePage);
 }

lib/MainRouter/MainRouterImpl.dart

@@ -3,6 +3,7 @@
  * @date   2019-12-31
  **/
 import 'package:flutter/src/widgets/framework.dart';
+import 'package:gm_flutter/MainRouter/manager/JumpManager.dart';
 import 'package:gm_flutter/MainRouter/manager/MainManager.dart';
 import 'package:gm_flutter/MainRouter/page/test/TestPage.dart';
 
@@ -23,4 +24,10 @@ class MainRouterImpl implements MainRouter {
   void buriedEvent(String name, Map<String, dynamic> map) {
     MainManager.getInstance().buriedEvent(name, map);
   }
+
+  @override
+  void jumpPage(
+      BuildContext context, String pageName, Map<String, dynamic> params,bool nativePage) {
+    JumpManager.instance().jumpToPage(context, pageName, params,nativePage);
+  }
 }

lib/MainRouter/manager/JumpManager.dart

+/*
+ * @author lsy
+ * @date   2020/7/6
+ **/
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_boost/flutter_boost.dart';
+import 'package:flutter_common/commonModel/util/JumpUtil.dart';
+import 'package:gm_flutter/MainRouter/manager/MainManager.dart';
+import 'package:gm_flutter/main.mark.dart';
+
+class JumpManager {
+  static JumpManager _instance;
+
+  JumpManager._() {}
+
+  static JumpManager instance() {
+    if (_instance == null) {
+      _instance = JumpManager._();
+    }
+    return _instance;
+  }
+
+  void jumpToPage(BuildContext context, String pageName,
+      Map<String, dynamic> params, bool nativePage) {
+    String pageNameWrap =
+        nativePage ? "gm://${pageName}" : "flutter://${pageName}";
+    if (!MainManager.getInstance().isInit) {
+      JumpUtil.jumpToPageReplaceRight(context, initMap(params)[pageNameWrap]);
+    } else {
+      FlutterBoost.singleton.open(pageName, urlParams: params);
+    }
+  }
+
+  Map<String, dynamic> initMap(Map<String, dynamic> params) {
+    return {
+      "flutter://clueLevelOne":
+          RouterCenterImpl().findClueRouter().getLevelOnePage(params),
+    };
+  }
+}

lib/MainRouter/page/test/TestPage.dart

@@ -26,8 +26,11 @@ class TestState extends BaseState<TestPage> {
       JumpUtil.jumpToPageRight(context, NetProxyPage());
     }));
     list.add(listItem("一级列表页", () {
-      JumpUtil.jumpToPageRight(
-          context, RouterCenterImpl().findClueRouter().getLevelOnePage(137));
+//      JumpUtil.jumpToPageRight(
+//          context, RouterCenterImpl().findClueRouter().getLevelOnePage({"planId":137}));
+      RouterCenterImpl()
+          .findMainRouter()
+          .jumpPage(context, "clueLevelOne", {"planId": 137}, false);
     }));
     list.add(listItem("二级列表页", () {
       JumpUtil.jumpToPageRight(

lib/commonModel/net/Api.dart

@@ -21,6 +21,7 @@ const String APP_HOST_RELEASE = "https://x6cgr5y5-gengmei.mock.coding.io";
 //const String APP_HOST_DEBUG = "http://doctor.paas-merchant.env";
 const String APP_HOST_DEBUG = "https://x6cgr5y5-gengmei.mock.coding.io";
 //const String APP_HOST_DEBUG = "http://backend.paas-merchant.env";
+//const String APP_HOST_DEBUG = "http://janus.paas-merchant.env";
 
 /**
  * 开发环境

lib/commonModel/net/DioInterceptor.dart

@@ -34,46 +34,92 @@ class DioInterceptorManager {
       if (opt.queryParameters == null) {
         opt.queryParameters = Map<String, dynamic>();
       }
-      opt.queryParameters[APP_NAME] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(APP_NAME);
-      opt.queryParameters[VERSION] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(VERSION);
-      opt.queryParameters[PLATFORM] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(PLATFORM);
-      opt.queryParameters[DEVICE_ID] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(DEVICE_ID);
-      opt.queryParameters[OS_VERSION] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(OS_VERSION);
-      opt.queryParameters[MODEL] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(MODEL);
-      opt.queryParameters[SCREEN] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(SCREEN);
-      opt.queryParameters[LAT] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(LAT);
-      opt.queryParameters[LNG] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(LNG);
-      opt.queryParameters[CHANNEL] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(CHANNEL);
-      opt.queryParameters[MANUFACTURER] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(MANUFACTURER);
-      opt.queryParameters[UUID] =
-          CacheManager.getInstance().get(MEMORY_CACHE).get(UUID);
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(APP_NAME) != null) {
+        opt.queryParameters[APP_NAME] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(APP_NAME);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(VERSION) != null) {
+        opt.queryParameters[VERSION] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(VERSION);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(PLATFORM) != null) {
+        opt.queryParameters[PLATFORM] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(PLATFORM);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(DEVICE_ID) != null) {
+        opt.queryParameters[DEVICE_ID] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(DEVICE_ID);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(OS_VERSION) !=
+          null) {
+        opt.queryParameters[OS_VERSION] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(OS_VERSION);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(MODEL) != null) {
+        opt.queryParameters[MODEL] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(MODEL);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(SCREEN) != null) {
+        opt.queryParameters[SCREEN] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(SCREEN);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(LAT) != null) {
+        opt.queryParameters[LAT] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(LAT);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(LNG) != null) {
+        opt.queryParameters[LNG] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(LNG);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(CHANNEL) != null) {
+        opt.queryParameters[CHANNEL] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(CHANNEL);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(MANUFACTURER) !=
+          null) {
+        opt.queryParameters[MANUFACTURER] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(MANUFACTURER);
+      }
+      if (CacheManager.getInstance().get(MEMORY_CACHE).get(UUID) != null) {
+        opt.queryParameters[UUID] =
+            CacheManager.getInstance().get(MEMORY_CACHE).get(UUID);
+      }
       if (Platform.isAndroid) {
-        opt.queryParameters[ANDROID_DEVICE_ID] =
-            CacheManager.getInstance().get(MEMORY_CACHE).get(ANDROID_DEVICE_ID);
+        if (CacheManager.getInstance()
+                .get(MEMORY_CACHE)
+                .get(ANDROID_DEVICE_ID) !=
+            null) {
+          opt.queryParameters[ANDROID_DEVICE_ID] = CacheManager.getInstance()
+              .get(MEMORY_CACHE)
+              .get(ANDROID_DEVICE_ID);
+        }
       } else {
-        opt.queryParameters[RELEASE] =
-            CacheManager.getInstance().get(MEMORY_CACHE).get(RELEASE);
-        opt.queryParameters[IDFA] =
-            CacheManager.getInstance().get(MEMORY_CACHE).get(IDFA);
-        opt.queryParameters[IDFV] =
-            CacheManager.getInstance().get(MEMORY_CACHE).get(IDFV);
-        opt.queryParameters[IS_WIFI] =
-            CacheManager.getInstance().get(MEMORY_CACHE).get(IS_WIFI);
-        opt.queryParameters[HARDWARE_MODEL] =
-            CacheManager.getInstance().get(MEMORY_CACHE).get(HARDWARE_MODEL);
-        opt.queryParameters[CURRENT_CITY_ID] =
-            CacheManager.getInstance().get(MEMORY_CACHE).get(CURRENT_CITY_ID);
+        if (CacheManager.getInstance().get(MEMORY_CACHE).get(RELEASE) != null) {
+          opt.queryParameters[RELEASE] =
+              CacheManager.getInstance().get(MEMORY_CACHE).get(RELEASE);
+        }
+        if (CacheManager.getInstance().get(MEMORY_CACHE).get(IDFA) != null) {
+          opt.queryParameters[IDFA] =
+              CacheManager.getInstance().get(MEMORY_CACHE).get(IDFA);
+        }
+        if (CacheManager.getInstance().get(MEMORY_CACHE).get(IDFV) != null) {
+          opt.queryParameters[IDFV] =
+              CacheManager.getInstance().get(MEMORY_CACHE).get(IDFV);
+        }
+        if (CacheManager.getInstance().get(MEMORY_CACHE).get(IS_WIFI) != null) {
+          opt.queryParameters[IS_WIFI] =
+              CacheManager.getInstance().get(MEMORY_CACHE).get(IS_WIFI);
+        }
+        if (CacheManager.getInstance().get(MEMORY_CACHE).get(HARDWARE_MODEL) !=
+            null) {
+          opt.queryParameters[HARDWARE_MODEL] =
+              CacheManager.getInstance().get(MEMORY_CACHE).get(HARDWARE_MODEL);
+        }
+        if (CacheManager.getInstance().get(MEMORY_CACHE).get(CURRENT_CITY_ID) !=
+            null) {
+          opt.queryParameters[CURRENT_CITY_ID] =
+              CacheManager.getInstance().get(MEMORY_CACHE).get(CURRENT_CITY_ID);
+        }
       }
 
       print("请求之前  onRequest${opt.headers}");

lib/main.dart

@@ -59,7 +59,7 @@ class MyApp extends State<MyAppWidget> {
     super.initState();
     FlutterBoost.singleton.registerPageBuilders({
       'demoPage': (pageName, params, _) {
-        return RouterCenterImpl().findClueRouter().getLevelOnePage(137);
+        return RouterCenterImpl().findClueRouter().getLevelOnePage(params);
       },
       'demoPage1': (pageName, params, _) {
         return DemoPage1();