commit

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -54,9 +54,6 @@ 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/PlanModel.dart

@@ -46,6 +46,7 @@ class PlanModel extends BaseModel {
     ClueApiImpl.getInstance()
         .getPlan(DioUtil.getInstance().getDio())
         .listen((event) {
+          print("ERROR12  ${event.error}");
           if (event.error == 0) {
             projectData = event.data.tags;
             sortList = event.data.orders;
@@ -59,6 +60,7 @@ class PlanModel extends BaseModel {
         })
         .addToDispose(rxDispose)
         .onError((err) {
+          print("ERROR12WCCCCCC  ${err.toString()}");
           PrintUtil.printBug(err);
           stateLive.notifyView(FAIL);
         });

lib/ClueModel/page/plan/PlanPage.dart

@@ -17,9 +17,12 @@ import 'package:gm_flutter/ClueModel/page/plan/SortView.dart';
 import 'package:gm_flutter/ClueModel/server/entity/PlanBean.dart';
 import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart';
 import 'package:gm_flutter/ClueModel/util/PosUtil.dart';
+import 'package:gm_flutter/commonModel/App.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 import 'package:gm_flutter/commonModel/base/BaseState.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
+import 'package:gm_flutter/commonModel/cache/CacheManager.dart';
+import 'package:gm_flutter/commonModel/net/DioUtil.dart';
 import 'package:gm_flutter/commonModel/popMenu/BaseMenuListener.dart';
 import 'package:gm_flutter/commonModel/popMenu/BasePopMenu.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
@@ -30,7 +33,6 @@ import 'PlanModel.dart';
 import 'ProjectView.dart';
 
 class PlanPage extends StatefulWidget {
-
   @override
   State<StatefulWidget> createState() => PlanState();
 }
@@ -51,6 +53,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
 
   @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.init();
     planBarView =
@@ -250,13 +255,16 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                     child: loadingItem(),
                   );
                 } else if (data.data == FAIL) {
-                  return errorItem(
-                    MediaQuery.of(context).size.width,
-                    MediaQuery.of(context).size.height,
-                    () {
-                      _model.stateLive.notifyView(LOADING);
-                      _model.init();
-                    },
+                  return Container(
+                    color: Colors.white,
+                    child: errorItem(
+                      MediaQuery.of(context).size.width,
+                      MediaQuery.of(context).size.height,
+                      () {
+                        _model.stateLive.notifyView(LOADING);
+                        _model.init();
+                      },
+                    ),
                   );
                 } else {
                   return Container(

lib/ClueModel/server/entity/PlanBean.dart

@@ -10,14 +10,22 @@ class PlanBean {
   UserType userType;
   Data data;
 
-  PlanBean({this.error, this.message, this.extra, this.errorExtra, this.userType, this.data});
+  PlanBean(
+      {this.error,
+      this.message,
+      this.extra,
+      this.errorExtra,
+      this.userType,
+      this.data});
 
   PlanBean.fromJson(Map<String, dynamic> json) {
     error = json['error'];
     message = json['message'];
     extra = json['extra'];
     errorExtra = json['error_extra'];
-    userType = json['user_type'] != null ? new UserType.fromJson(json['user_type']) : null;
+    userType = json['user_type'] != null
+        ? new UserType.fromJson(json['user_type'])
+        : null;
     data = json['data'] != null ? new Data.fromJson(json['data']) : null;
   }
 
@@ -38,16 +46,14 @@ class PlanBean {
 }
 
 class UserType {
-
   UserType();
 
-UserType.fromJson(Map<String, dynamic> json) {
-}
+  UserType.fromJson(Map<String, dynamic> json) {}
 
-Map<String, dynamic> toJson() {
-  final Map<String, dynamic> data = new Map<String, dynamic>();
-  return data;
-}
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    return data;
+  }
 }
 
 class Data {
@@ -61,19 +67,27 @@ class Data {
   Data.fromJson(Map<String, dynamic> json) {
     if (json['ranks'] != null) {
       ranks = new List<Ranks>();
-      json['ranks'].forEach((v) { ranks.add(new Ranks.fromJson(v)); });
+      json['ranks'].forEach((v) {
+        ranks.add(new Ranks.fromJson(v));
+      });
     }
     if (json['areas'] != null) {
       areas = new List<Areas>();
-      json['areas'].forEach((v) { areas.add(new Areas.fromJson(v)); });
+      json['areas'].forEach((v) {
+        areas.add(new Areas.fromJson(v));
+      });
     }
     if (json['tags'] != null) {
       tags = new List<Tags>();
-      json['tags'].forEach((v) { tags.add(new Tags.fromJson(v)); });
+      json['tags'].forEach((v) {
+        tags.add(new Tags.fromJson(v));
+      });
     }
     if (json['orders'] != null) {
       orders = new List<Orders>();
-      json['orders'].forEach((v) { orders.add(new Orders.fromJson(v)); });
+      json['orders'].forEach((v) {
+        orders.add(new Orders.fromJson(v));
+      });
     }
   }
 
@@ -96,6 +110,7 @@ class Data {
 }
 
 class Ranks {
+  int id;
   String name;
   String gmUrl;
   String icon;
@@ -103,6 +118,7 @@ class Ranks {
   Ranks({this.name, this.gmUrl, this.icon});
 
   Ranks.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
     name = json['name'];
     gmUrl = json['gm_url'];
     icon = json['icon'];
@@ -111,6 +127,7 @@ class Ranks {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['name'] = this.name;
+    data['id'] = this.id;
     data['gm_url'] = this.gmUrl;
     data['icon'] = this.icon;
     return data;
@@ -129,7 +146,9 @@ class Areas {
     name = json['name'];
     if (json['groups'] != null) {
       groups = new List<Groups>();
-      json['groups'].forEach((v) { groups.add(new Groups.fromJson(v)); });
+      json['groups'].forEach((v) {
+        groups.add(new Groups.fromJson(v));
+      });
     }
   }
 
@@ -157,7 +176,9 @@ class Groups {
     initial = json['initial'];
     if (json['cities'] != null) {
       cities = new List<Cities>();
-      json['cities'].forEach((v) { cities.add(new Cities.fromJson(v)); });
+      json['cities'].forEach((v) {
+        cities.add(new Cities.fromJson(v));
+      });
     }
     title = json['title'];
   }
@@ -207,7 +228,9 @@ class Tags {
     id = json['id'].toString();
     if (json['sub_tags'] != null) {
       subTags = new List<SubTags>();
-      json['sub_tags'].forEach((v) { subTags.add(new SubTags.fromJson(v)); });
+      json['sub_tags'].forEach((v) {
+        subTags.add(new SubTags.fromJson(v));
+      });
     }
     name = json['name'];
   }
@@ -260,4 +283,3 @@ class Orders {
     return data;
   }
 }
-

lib/MainRouter/manager/JumpManager.dart

@@ -35,6 +35,9 @@ class JumpManager {
     return {
       "flutter://clueLevelOne":
           RouterCenterImpl().findClueRouter().getLevelOnePage(params),
+      "flutter://cluePlan":
+        RouterCenterImpl().findClueRouter().getPlanPage(),
+
     };
   }
 }

lib/commonModel/net/Api.dart

@@ -19,8 +19,8 @@ const String APP_HOST_RELEASE = "https://x6cgr5y5-gengmei.mock.coding.io";
  */
 //const String APP_HOST_DEBUG = "http://backend.paas-merchant.envs";
 //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 = "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";
 
 /**