Commit 61b4a967 authored by 朱翠翠's avatar 朱翠翠

逻辑添加

parent 662f4759
...@@ -10,9 +10,9 @@ class PlansCompareFeedModel extends BaseModel { ...@@ -10,9 +10,9 @@ class PlansCompareFeedModel extends BaseModel {
LiveData<PlansCompareFeed> liveData = LiveData(); LiveData<PlansCompareFeed> liveData = LiveData();
RxDispose rxDispose = RxDispose(); RxDispose rxDispose = RxDispose();
void init() { void init(int _planType, int _planId) {
ClueApiImpl.getInstance() ClueApiImpl.getInstance()
.getPlansCompareFeed(DioUtil.getInstance().getDio(), 123, 1) .getPlansCompareFeed(DioUtil.getInstance().getDio(), _planId, _planType)
.listen((event) { .listen((event) {
liveData.notifyView(event); liveData.notifyView(event);
}) })
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
**/ **/
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.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/page/PlansCompareFeed/PlansCompareFeedModel.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlansCompareFeed.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlansCompareFeed.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart'; import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
...@@ -14,6 +15,9 @@ import 'CallBackCompareItem.dart'; ...@@ -14,6 +15,9 @@ import 'CallBackCompareItem.dart';
import 'PlansCompareFeedItemView.dart'; import 'PlansCompareFeedItemView.dart';
class PlansCompareFeedPage extends StatefulWidget { class PlansCompareFeedPage extends StatefulWidget {
int _planType;
int _planId;
@override @override
State<StatefulWidget> createState() => _PlansCompareFeedState(); State<StatefulWidget> createState() => _PlansCompareFeedState();
} }
...@@ -28,7 +32,7 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage> ...@@ -28,7 +32,7 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
void initState() { void initState() {
super.initState(); super.initState();
_model = new PlansCompareFeedModel(); _model = new PlansCompareFeedModel();
_model.init(); _model.init(widget._planType, widget._planId);
_compareColor = Color(0xFFCCCCCC); _compareColor = Color(0xFFCCCCCC);
_setCompare = Set(); _setCompare = Set();
} }
...@@ -101,6 +105,10 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage> ...@@ -101,6 +105,10 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
onClickCompare() { onClickCompare() {
if (_compareColor == Color(0xFFCCCCCC)) return; if (_compareColor == Color(0xFFCCCCCC)) return;
setState(() { setState(() {
FlutterBoost.onPageStart();
FlutterBoost.singleton.open(
"sample",
);
print("onClickCompare=====_compareColor$_compareColor"); print("onClickCompare=====_compareColor$_compareColor");
}); });
} }
......
...@@ -16,9 +16,9 @@ class ProjectDetailsModel extends BaseModel { ...@@ -16,9 +16,9 @@ class ProjectDetailsModel extends BaseModel {
LiveData<ProjectDetailsItem> liveData = LiveData(); LiveData<ProjectDetailsItem> liveData = LiveData();
RxDispose rxDispose = RxDispose(); RxDispose rxDispose = RxDispose();
void init() { void init(int _planId) {
ClueApiImpl.getInstance() ClueApiImpl.getInstance()
.getProjectDetails(DioUtil.getInstance().getDio(), 123) .getProjectDetails(DioUtil.getInstance().getDio(), _planId)
.listen((event) { .listen((event) {
liveData.notifyView(event); liveData.notifyView(event);
}) })
......
...@@ -13,6 +13,8 @@ import 'package:gm_flutter/commonModel/base/BaseState.dart'; ...@@ -13,6 +13,8 @@ import 'package:gm_flutter/commonModel/base/BaseState.dart';
import '../../server/entity/ProjectDetailsItem.dart'; import '../../server/entity/ProjectDetailsItem.dart';
class ProjectDetailsPage extends StatefulWidget { class ProjectDetailsPage extends StatefulWidget {
int _planId;
@override @override
State<StatefulWidget> createState() => _ProjectDetailsState(); State<StatefulWidget> createState() => _ProjectDetailsState();
} }
...@@ -24,7 +26,7 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> { ...@@ -24,7 +26,7 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
void initState() { void initState() {
super.initState(); super.initState();
_model = new ProjectDetailsModel(); _model = new ProjectDetailsModel();
_model.init(); _model.init(widget._planId);
} }
@override @override
...@@ -58,12 +60,24 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> { ...@@ -58,12 +60,24 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
} }
ProjectDetailsItem item = data.data; ProjectDetailsItem item = data.data;
if (item == null || item.data == null || item.data.groups == null) { if (item == null || item.data == null || item.data.groups == null) {
return emptyItem(MediaQuery.of(context).size.width, return emptyItem(MediaQuery
MediaQuery.of(context).size.height); .of(context)
.size
.width,
MediaQuery
.of(context)
.size
.height);
} }
if (item.error != 0) { if (item.error != 0) {
return errorItem(MediaQuery.of(context).size.width, return errorItem(MediaQuery
MediaQuery.of(context).size.height, () {}); .of(context)
.size
.width,
MediaQuery
.of(context)
.size
.height, () {});
} }
return ListView.builder( return ListView.builder(
itemCount: item.data.groups.length, itemCount: item.data.groups.length,
......
...@@ -19,11 +19,11 @@ import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceAuthBean.dart' ...@@ -19,11 +19,11 @@ import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceAuthBean.dart'
@ServiceCenter() @ServiceCenter()
abstract class ClueApi { abstract class ClueApi {
@Get("/api/janus/plans/plan_detail") @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") @Get("/api/janus/plans/compare_feed")
PlansCompareFeed getPlansCompareFeed( 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") @Get("api/janus/plans/plan_feed")
LevelOneFeedList getLevelOneList(@Query("plan_id") int plan_id, LevelOneFeedList getLevelOneList(@Query("plan_id") int plan_id,
......
...@@ -41,7 +41,7 @@ class ClueApiImpl { ...@@ -41,7 +41,7 @@ class ClueApiImpl {
return _instance; 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: { return Stream.fromFuture(get(_dio, '/api/janus/plans/plan_detail', data: {
'plan_id': plan_id, 'plan_id': plan_id,
})).flatMap((value) { })).flatMap((value) {
...@@ -56,7 +56,7 @@ class ClueApiImpl { ...@@ -56,7 +56,7 @@ class ClueApiImpl {
} }
Stream<PlansCompareFeed> getPlansCompareFeed( 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: { return Stream.fromFuture(get(_dio, '/api/janus/plans/compare_feed', data: {
'plan_id': plan_id, 'plan_id': plan_id,
'plan_type': plan_type, 'plan_type': plan_type,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment