Merge branch 'zcc/flutter' into 'test'

Zcc/flutter

See merge request !10

lib/ClueModel/ClueRouterImpl.dart

@@ -16,7 +16,7 @@ import 'package:gm_flutter/ClueModel/page/top/TopPage.dart';
 class ClueRouterImpl implements ClueRouter {
   @override
   Widget getProjectDetailsPage() {
-    return ProjectDetailsPage();
+    return ProjectDetailsPage(1);
   }
 
   @override
@@ -31,7 +31,7 @@ class ClueRouterImpl implements ClueRouter {
 
   @override
   Widget getPlansCompareFeed() {
-    return PlansCompareFeedPage();
+    return PlansCompareFeedPage(123,1);
   }
 
   @override

lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedModel.dart

@@ -10,9 +10,9 @@ class PlansCompareFeedModel extends BaseModel {
   LiveData<PlansCompareFeed> liveData = LiveData();
   RxDispose rxDispose = RxDispose();
 
-  void init() {
+  void init(int _planType, int _planId) {
     ClueApiImpl.getInstance()
-        .getPlansCompareFeed(DioUtil.getInstance().getDio(), 123, 1)
+        .getPlansCompareFeed(DioUtil.getInstance().getDio(), _planId, _planType)
         .listen((event) {
           liveData.notifyView(event);
         })

lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedPage.dart

@@ -5,6 +5,7 @@
  **/
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_boost/flutter_boost.dart';
 import 'package:gm_flutter/ClueModel/page/PlansCompareFeed/PlansCompareFeedModel.dart';
 import 'package:gm_flutter/ClueModel/server/entity/PlansCompareFeed.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
@@ -14,6 +15,11 @@ import 'CallBackCompareItem.dart';
 import 'PlansCompareFeedItemView.dart';
 
 class PlansCompareFeedPage extends StatefulWidget {
+  int _planType;
+  int _planId;
+
+  PlansCompareFeedPage(this._planType, this._planId);
+
   @override
   State<StatefulWidget> createState() => _PlansCompareFeedState();
 }
@@ -28,7 +34,7 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
   void initState() {
     super.initState();
     _model = new PlansCompareFeedModel();
-    _model.init();
+    _model.init(widget._planType, widget._planId);
     _compareColor = Color(0xFFCCCCCC);
     _setCompare = Set();
   }
@@ -101,7 +107,9 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
   onClickCompare() {
     if (_compareColor == Color(0xFFCCCCCC)) return;
     setState(() {
-      print("onClickCompare=====_compareColor$_compareColor");
+      Map<String, dynamic> map = {};
+      map["ids"] = _setCompare;
+      FlutterBoost.singleton.open("sample", urlParams: map);
     });
   }
 

lib/ClueModel/page/ProjectDetails/ProjectDetailsModel.dart

@@ -16,9 +16,9 @@ class ProjectDetailsModel extends BaseModel {
   LiveData<ProjectDetailsItem> liveData = LiveData();
   RxDispose rxDispose = RxDispose();
 
-  void init() {
+  void init(int _planId) {
     ClueApiImpl.getInstance()
-        .getProjectDetails(DioUtil.getInstance().getDio(), 123)
+        .getProjectDetails(DioUtil.getInstance().getDio(), _planId)
         .listen((event) {
           liveData.notifyView(event);
         })

lib/ClueModel/page/ProjectDetails/ProjectDetailsPage.dart

@@ -13,6 +13,10 @@ import 'package:gm_flutter/commonModel/base/BaseState.dart';
 import '../../server/entity/ProjectDetailsItem.dart';
 
 class ProjectDetailsPage extends StatefulWidget {
+  int _planId;
+
+  ProjectDetailsPage(this._planId);
+
   @override
   State<StatefulWidget> createState() => _ProjectDetailsState();
 }
@@ -24,7 +28,7 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
   void initState() {
     super.initState();
     _model = new ProjectDetailsModel();
-    _model.init();
+    _model.init(widget._planId);
   }
 
   @override
@@ -58,12 +62,24 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
         }
         ProjectDetailsItem item = data.data;
         if (item == null || item.data == null || item.data.groups == null) {
-          return emptyItem(MediaQuery.of(context).size.width,
-              MediaQuery.of(context).size.height);
+          return emptyItem(MediaQuery
+              .of(context)
+              .size
+              .width,
+              MediaQuery
+                  .of(context)
+                  .size
+                  .height);
         }
         if (item.error != 0) {
-          return errorItem(MediaQuery.of(context).size.width,
-              MediaQuery.of(context).size.height, () {});
+          return errorItem(MediaQuery
+              .of(context)
+              .size
+              .width,
+              MediaQuery
+                  .of(context)
+                  .size
+                  .height, () {});
         }
         return ListView.builder(
             itemCount: item.data.groups.length,

lib/ClueModel/server/api/ClueApi.dart

@@ -19,11 +19,11 @@ import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceAuthBean.dart'
 @ServiceCenter()
 abstract class ClueApi {
   @Get("/api/janus/plans/plan_detail")
-  ProjectDetailsItem getProjectDetails(@Query("plan_id") double plan_id);
+  ProjectDetailsItem getProjectDetails(@Query("plan_id") int plan_id);
 
   @Get("/api/janus/plans/compare_feed")
   PlansCompareFeed getPlansCompareFeed(
-      @Query("plan_id") double plan_id, @Query("plan_type") double plan_type);
+      @Query("plan_id") int plan_id, @Query("plan_type") int plan_type);
 
   @Get("api/janus/plans/plan_feed")
   LevelOneFeedList getLevelOneList(@Query("plan_id") int plan_id,

lib/ClueModel/server/api/ClueApi.serv.dart

@@ -41,7 +41,7 @@ class ClueApiImpl {
     return _instance;
   }
 
-  Stream<ProjectDetailsItem> getProjectDetails(Dio _dio, double plan_id) {
+  Stream<ProjectDetailsItem> getProjectDetails(Dio _dio, int plan_id) {
     return Stream.fromFuture(get(_dio, '/api/janus/plans/plan_detail', data: {
       'plan_id': plan_id,
     })).flatMap((value) {
@@ -56,7 +56,7 @@ class ClueApiImpl {
   }
 
   Stream<PlansCompareFeed> getPlansCompareFeed(
-      Dio _dio, double plan_id, double plan_type) {
+      Dio _dio, int plan_id, int plan_type) {
     return Stream.fromFuture(get(_dio, '/api/janus/plans/compare_feed', data: {
       'plan_id': plan_id,
       'plan_type': plan_type,