Commit 4759f490 authored by 林生雨's avatar 林生雨

w

parent a8635992
......@@ -38,13 +38,11 @@ class PlanCompareDetailModel extends BaseModel {
} else {
stateLive.notifyView(FAIL);
NativeToast.showNativeToast(event.message);
detailLive.notifyView(Pair(FAIL, null));
}
})
.addToDispose(rxDispose)
.onError((err) {
stateLive.notifyView(FAIL);
detailLive.notifyView(Pair(FAIL, null));
NativeToast.showNativeToast(err.message);
});
}
......
......@@ -17,6 +17,7 @@ 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/net/DioUtil.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart';
import 'dart:convert';
import 'package:gm_flutter/main.mark.dart';
......@@ -99,13 +100,6 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
stream: _model.detailLive.stream,
initialData: _model.detailLive.data ?? Pair(LOADING, null),
builder: (c, data) {
if (data.data.first == FAIL) {
return errorItem(MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height, () {
_model.stateLive.notifyView(LOADING);
_model.init(widget._planIds);
});
}
if (data.data.first == EMPTY) {
return emptyItem(MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height);
......@@ -129,17 +123,10 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Widget widget;
if (group.groupType == 'hot') {
widget = planPopularityView(group);
// height: 100,
// alignment: Alignment.center,
// child: baseText("第一个", 15, Colors.black),
} else if (group.groupType == 'normal_attrs') {
widget = Container(
child: planNormalEffectiveAttrsView(group),
);
widget = planNormalEffectiveAttrsView(group);
} else if (group.groupType == 'effective_attrs') {
widget = Container(
child: planNormalEffectiveAttrsView(group),
);
widget = planNormalEffectiveAttrsView(group);
} else {
widget = planNormalEffectiveAttrsView(group);
}
......@@ -158,23 +145,34 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Widget head() {
return Container(
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Colors.black12,
offset: Offset(0.0, 2.0),
blurRadius: 0.5,
spreadRadius: 0.5)
],
color: Colors.white,
),
// key: keyTop,
width: screenWidth,
height: 105,
height: 98,
alignment: Alignment.topLeft,
child: Container(
margin: EdgeInsets.only(left: 15, right: 15),
child: Row(children: <Widget>[
// 根据 flex系数,分配剩余空间
Expanded(flex: 1, child: headItem(0)),
Expanded(flex: 1, child: headItem(1))
]),
);
));
}
Widget headItem(int index) {
return StreamBuilder<List<PlansInfoDetail>>(
stream: _model.headerLive.stream,
initialData: _model.headerLive.data ?? null,
initialData: _model.headerLive.data,
builder: (c, data) {
if (data.data == null || data.data.length != 2) {
return Container();
......@@ -196,19 +194,16 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Positioned(
left: 12,
top: 24,
child: Container(
width: (screenWidth - 30 - 11) / 2,
child: baseText(data.data[index].planName, 15, Color(0xff333333),
bold: true),
),
),
Positioned(
left: 12,
top: 48,
child: baseText(
'¥' +
data.data[index].minPrice +
'-' +
data.data[index].maxPrice,
14,
Colors.red,
top: 56,
child: baseText('${data.data[index].price}', 14, Colors.red,
bold: true),
),
]));
......@@ -218,9 +213,9 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Widget titleView(String title) {
return Container(
height: 75,
height: 25,
width: screenWidth,
margin: EdgeInsets.fromLTRB(0, 30, 0, 20),
margin: EdgeInsets.fromLTRB(0, 30, 0, 25),
alignment: Alignment.center,
child: Container(
width: 90,
......@@ -260,8 +255,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Widget planPopularityBodyView(Groups groups) {
return Container(
height: 170,
child: Row(
children: <Widget>[
child: Row(children: <Widget>[
Expanded(
flex: 1, child: planPopularityLeftItem(groups.plans[0], groups)),
Expanded(
......@@ -273,11 +267,11 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
return Container(
height: 170,
child: Stack(children: <Widget>[
Positioned(
right: 20,
top: 0,
child: baseText(plan.positiveRate, 21, Color(0xff3FB5AF),
bold: true)),
// Positioned(
// right: 20,
// top: 0,
// child: baseText(plan.positiveRate, 21, Color(0xff3FB5AF),
// bold: true)),
Positioned(
right: 20,
top: 24,
......@@ -289,11 +283,11 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
child: FiveStarView(3, 5,
starAssets: 'assets/plan_compare_detail_green_star_all.png'),
),
Positioned(
right: 20,
top: 84,
child: baseText(plan.salesCount, 21, Color(0xff3FB5AF), bold: true),
),
// Positioned(
// right: 20,
// top: 84,
// child: baseText(plan.salesCount, 21, Color(0xff3FB5AF), bold: true),
// ),
Positioned(
right: 20,
top: 108,
......@@ -339,11 +333,11 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
return Container(
height: 170,
child: Stack(children: <Widget>[
Positioned(
left: 20,
top: 0,
child: baseText(plan.positiveRate, 21, Color(0xffF25874),
bold: true)),
// Positioned(
// left: 20,
// top: 0,
// child: baseText(plan.positiveRate, 21, Color(0xffF25874),
// bold: true)),
Positioned(
left: 20,
top: 24,
......@@ -361,11 +355,11 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
starAssets: 'assets/plan_compare_detail_red_star_all.png',
),
)),
Positioned(
left: 20,
top: 84,
child: baseText(plan.salesCount, 21, Color(0xffF25874), bold: true),
),
// Positioned(
// left: 20,
// top: 84,
// child: baseText(plan.salesCount, 21, Color(0xffF25874), bold: true),
// ),
Positioned(
left: 20,
top: 108,
......@@ -410,9 +404,16 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Widget planNormalEffectiveAttrsView(Groups groups) {
List<Widget> list = new List();
list.add(titleView(groups.groupName));
groups.plans.forEach((element) {
list.add(planBaseAttrsView(element));
});
if (groups.plans != null && groups.plans.length == 2) {
for (int i = 0;
i < max(groups.plans[0].attrs.length, groups.plans[1].attrs.length);
i++) {
list.add(planBaseAttrsView(groups.plans[0], groups.plans[1], i));
}
}
list.add(Container(
height: 6,
));
return Container(
child: Column(
mainAxisSize: MainAxisSize.min,
......@@ -420,60 +421,68 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
children: list));
}
Widget planBaseAttrsView(Plans plans) {
return Container(
height: 56,
child: Row(children: <Widget>[
Expanded(flex: 1, child: planBaseAttrsLeftView(plans)),
Expanded(flex: 1, child: planBaseAttrsRightView(plans))
]));
}
Widget planBaseAttrsLeftView(Plans plan) {
return Container(
height: 56,
child: Stack(children: <Widget>[
Positioned(
right: 20,
top: 0,
child: baseText(plan.attrs[0].attrValue, 14, Color(0xff3FB5AF),
bold: true)),
Positioned(
top: 20,
right: 20,
child: baseText(plan.attrs[0].attrName, 12, Color(0xff666666),
bold: false),
Widget planBaseAttrsView(Plans plan1, Plans plan2, int index) {
return Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
planItem(
index > plan1.attrs.length - 1
? "无"
: "${plan1.attrs[index].attrValue}",
index > plan2.attrs.length - 1
? "无"
: "${plan2.attrs[index].attrValue}",
false),
Container(
height: 6,
),
]));
planItem(
index > plan1.attrs.length - 1
? "无"
: "${plan1.attrs[index].attrName}",
index > plan2.attrs.length - 1
? "无"
: "${plan2.attrs[index].attrName}",
true),
Container(
height: 24,
)
],
);
;
}
Widget planBaseAttrsRightView(Plans plan) {
return Container(
height: 56,
child: Stack(children: <Widget>[
Positioned(
left: 20,
top: 0,
child: baseText(plan.attrs[0].attrValue, 14, Color(0xffF25874),
bold: true)),
Positioned(
left: 20,
top: 20,
child: baseText(plan.attrs[0].attrName, 12, Color(0xff666666),
bold: false),
Widget planItem(String left, String right, bool isName) {
return Row(children: <Widget>[
Expanded(
flex: 1,
child: baseText(left.empty() ? "无" : left, 14,
isName ? Color(0xff666666) : Color(0xff3FB5AF),
bold: true, maxLines: 100, isWarp: true, textAlign: TextAlign.end),
),
]));
Container(
width: 40,
),
Expanded(
flex: 1,
child: baseText(right.empty() ? "无" : right, 14,
isName ? Color(0xff666666) : Color(0xffF25874),
bold: true,
maxLines: 100,
isWarp: true,
textAlign: TextAlign.start))
]);
}
double sellCount(int index, Plans anotherPlans) {
Groups popularity = _model.detailLive.data.second[0];
Plans plans = popularity.plans[index];
int salesCount = int.parse(plans.salesCount);
int anSalesCount = int.parse(plans.salesCount);
if (salesCount >= anSalesCount) {
return 1.0;
} else {
return anSalesCount / salesCount;
}
// int salesCount = int.parse(plans.salesCount);
// int anSalesCount = int.parse(plans.salesCount);
// if (salesCount >= anSalesCount) {
// return 1.0;
// } else {
// return anSalesCount / salesCount;
// }
}
}
......@@ -128,6 +128,8 @@ class _PlansCompareFeedItemViewState
}
getSecondLevelItem() {
String price =
NumPlanUtil.getPrice(widget.plan.minPrice, widget.plan.maxPrice);
return Container(
height: 77,
child: Row(
......@@ -135,9 +137,6 @@ class _PlansCompareFeedItemViewState
Container(
margin: EdgeInsets.only(right: 15.0),
alignment: Alignment.centerLeft,
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => onClickCheckBox(_icon),
child: Container(
alignment: Alignment.center,
child: Image.asset(
......@@ -146,7 +145,6 @@ class _PlansCompareFeedItemViewState
height: 17,
fit: BoxFit.fill,
))),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
......@@ -159,10 +157,25 @@ class _PlansCompareFeedItemViewState
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
baseText('¥${widget.plan.minPrice}-${widget.plan.maxPrice}',
13, Color(0xFFFF5963)),
baseText("指导价:¥${widget.plan.guidePrice}", 11,
Color(0xFF666666)),
Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[
price == "暂无报价"
? Container(
width: 0,
height: 0,
)
: baseText("¥", 12, Color(0xFFFF5963)),
baseText(
price,
price == "暂无报价" ? 13 : 15,
price == "暂无报价"
? Color(0xFF666666)
: Color(0xFFFF5963),
bold: price != "暂无报价")
],
),
],
),
],
......@@ -170,7 +183,9 @@ class _PlansCompareFeedItemViewState
)
],
),
);
).gestureDetector(() {
onClickCheckBox(_icon);
});
}
onClickCheckBox(String icon) {
......
......@@ -52,6 +52,7 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
@override
Widget buildItem(BuildContext context) {
return Scaffold(
backgroundColor: Colors.white,
appBar: baseAppBar(
title: "方案对比",
centerTitle: true,
......@@ -62,10 +63,9 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
Navigator.of(context).pop();
}
}),
body: Center(
body: SafeArea(
child: getBody(),
),
);
));
}
getBody() {
......@@ -93,36 +93,32 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
}
getList(List<Plans> plans) {
return Stack(alignment: Alignment.bottomCenter, children: <Widget>[
ListView.builder(
return Column(
children: <Widget>[
Expanded(
child: ListView.builder(
itemCount: plans.length,
itemBuilder: (BuildContext context, int position) {
return PlansCompareFeedItemView(plans[position], this, _setCompare);
return PlansCompareFeedItemView(
plans[position], this, _setCompare);
}),
),
Divider(height: 0.5, color: Color(0xFFE5E5E5)),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => onClickCompare(),
child: Container(
color: Colors.white,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Divider(height: 0.5, color: Color(0xFFE5E5E5)),
Container(
margin: EdgeInsets.only(
left: 15, right: 15, top: 7.5, bottom: 7.5),
margin: EdgeInsets.only(left: 15, right: 15, top: 7.5, bottom: 7.5),
width: double.maxFinite,
height: 40,
decoration: BoxDecoration(
color: _compareColor,
borderRadius: BorderRadius.circular(20)),
color: _compareColor, borderRadius: BorderRadius.circular(20)),
alignment: Alignment.center,
child: baseText("对比", 14, Colors.white, bold: true),
),
)
],
),
))
]);
);
}
onClickCompare() {
......
......@@ -48,9 +48,9 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
title: "项目说明",
centerTitle: true,
backClick: () {
if(RouterCenterImpl().findMainRouter().isWithNative()){
if (RouterCenterImpl().findMainRouter().isWithNative()) {
FlutterBoost.singleton.closeCurrent();
}else{
} else {
Navigator.of(context).pop();
}
}),
......@@ -66,7 +66,8 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
initialData: _model.liveData.data ?? null,
builder: (c, data) {
if (_model.liveData.data == null) {
return loadingItem();
// return loadingItem();
return Container();
}
ProjectDetailsItem item = data.data;
if (item == null || item.data == null || item.data.groups == null) {
......
......@@ -6,10 +6,12 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
import 'package:gm_flutter/ClueModel/util/NumPlanUtil.dart';
import 'package:gm_flutter/ClueModel/view/FiveStarView.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart';
import 'package:gm_flutter/commonModel/util/NumberUtil.dart';
import 'package:gm_flutter/main.mark.dart';
class LevelOneItem extends StatelessWidget {
......@@ -20,6 +22,7 @@ class LevelOneItem extends StatelessWidget {
Function(int planId) gotoPlan;
int position;
String tabName;
LevelOneItem(this.cards,
{this.lowPrice,
this.ask,
......@@ -301,16 +304,8 @@ class LevelOneItem extends StatelessWidget {
if (cards.plan == null && isDebug) {
throw new Exception();
}
String price;
if (cards.plan.minPrice.empty() && cards.plan.maxPrice.empty()) {
price = "暂无报价";
} else if (cards.plan.minPrice.empty() && !cards.plan.maxPrice.empty()) {
price = "${cards.plan.maxPrice}";
} else if (!cards.plan.minPrice.empty() && cards.plan.maxPrice.empty()) {
price = "${cards.plan.minPrice}";
} else {
price = "${cards.plan.minPrice}-${cards.plan.maxPrice}";
}
String price =
NumPlanUtil.getPrice(cards.plan.minPrice, cards.plan.maxPrice);
return Container(
height: 118,
margin: EdgeInsets.only(left: 15, right: 15),
......
......@@ -497,6 +497,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
boxShadow: [
BoxShadow(
color: Colors.black12,
offset: Offset(0.0, 2.0),
blurRadius: 0.5,
spreadRadius: 0.5
)
......
......@@ -8,19 +8,30 @@ class PlanCompareDetail {
int error;
String message;
Map extra;
int errorCode;
Map errorExtra;
UserType userType;
Data data;
UserType userType;
PlanCompareDetail({this.error, this.message, this.extra, this.errorExtra, this.userType, this.data});
PlanCompareDetail(
{this.error,
this.message,
this.extra,
this.errorCode,
this.errorExtra,
this.data,
this.userType});
PlanCompareDetail.fromJson(Map<String, dynamic> json) {
error = json['error'];
message = json['message'];
extra = json['extra'];
errorCode = json['error_code'];
errorExtra = json['error_extra'];
userType = json['user_type'] != null ? new UserType.fromJson(json['user_type']) : null;
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
userType = json['user_type'] != null
? new UserType.fromJson(json['user_type'])
: null;
}
Map<String, dynamic> toJson() {
......@@ -28,27 +39,14 @@ class PlanCompareDetail {
data['error'] = this.error;
data['message'] = this.message;
data['extra'] = this.extra;
data['error_code'] = this.errorCode;
data['error_extra'] = this.errorExtra;
if (this.userType != null) {
data['user_type'] = this.userType.toJson();
}
if (this.data != null) {
data['data'] = this.data.toJson();
}
return data;
}
}
class UserType {
UserType();
UserType.fromJson(Map<String, dynamic> json) {
if (this.userType != null) {
data['user_type'] = this.userType.toJson();
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
return data;
}
}
......@@ -62,11 +60,15 @@ class Data {
Data.fromJson(Map<String, dynamic> json) {
if (json['plans_info'] != null) {
plansInfo = new List<PlansInfoDetail>();
json['plans_info'].forEach((v) { plansInfo.add(new PlansInfoDetail.fromJson(v)); });
json['plans_info'].forEach((v) {
plansInfo.add(new PlansInfoDetail.fromJson(v));
});
}
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));
});
}
}
......@@ -85,24 +87,21 @@ class Data {
class PlansInfoDetail {
int planId;
String planName;
String minPrice;
String maxPrice;
String price;
PlansInfoDetail({this.planId, this.planName, this.minPrice, this.maxPrice});
PlansInfoDetail({this.planId, this.planName, this.price});
PlansInfoDetail.fromJson(Map<String, dynamic> json) {
planId = json['plan_id'];
planName = json['plan_name'];
minPrice = json['min_price'];
maxPrice = json['max_price'];
price = json['price'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['plan_id'] = this.planId;
data['plan_name'] = this.planName;
data['min_price'] = this.minPrice;
data['max_price'] = this.maxPrice;
data['price'] = this.price;
return data;
}
}
......@@ -119,7 +118,9 @@ class Groups {
groupName = json['group_name'];
if (json['plans'] != null) {
plans = new List<Plans>();
json['plans'].forEach((v) { plans.add(new Plans.fromJson(v)); });
json['plans'].forEach((v) {
plans.add(new Plans.fromJson(v));
});
}
}
......@@ -136,27 +137,23 @@ class Groups {
class Plans {
int planId;
String positiveRate;
String salesCount;
List<Attrs> attrs;
Plans({this.planId, this.positiveRate, this.salesCount, this.attrs});
Plans({this.planId, this.attrs});
Plans.fromJson(Map<String, dynamic> json) {
planId = json['plan_id'];
positiveRate = json['positive_rate'];
salesCount = json['sales_count'];
if (json['attrs'] != null) {
attrs = new List<Attrs>();
json['attrs'].forEach((v) { attrs.add(new Attrs.fromJson(v)); });
json['attrs'].forEach((v) {
attrs.add(new Attrs.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['plan_id'] = this.planId;
data['positive_rate'] = this.positiveRate;
data['sales_count'] = this.salesCount;
if (this.attrs != null) {
data['attrs'] = this.attrs.map((v) => v.toJson()).toList();
}
......@@ -183,6 +180,13 @@ class Attrs {
}
}
class UserType {
UserType();
UserType.fromJson(Map<String, dynamic> json) {}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
return data;
}
}
......@@ -3,6 +3,7 @@
* @date 2020/7/10
**/
import 'package:common_utils/common_utils.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart';
class NumPlanUtil {
static String getSale(String sale) {
......@@ -24,4 +25,20 @@ class NumPlanUtil {
static formatNum(double num, int postion) {
return (NumUtil.getNumByValueDouble(num, postion)).toStringAsFixed(postion);
}
static String getPrice(String min, String max) {
String price;
if (min.empty() && max.empty()) {
price = "暂无报价";
} else if (min.empty() && !max.empty()) {
price = "${max}";
} else if (!min.empty() && max.empty()) {
price = "${min}";
} else if (min == max) {
price = "${max}";
} else {
price = "${min}-${max}";
}
return price;
}
}
......@@ -84,11 +84,13 @@ Text baseText(String text, double fontSize, Color color,
{bool bold = false,
TextAlign textAlign,
int maxLines = 1,
TextOverflow overflow}) {
TextOverflow overflow
,bool isWarp=false}) {
return Text(
text,
textAlign: textAlign ?? TextAlign.start,
textScaleFactor: 1.0,
softWrap: isWarp,
style: TextStyle(
decoration: TextDecoration.none,
fontSize: fontSize,
......@@ -432,6 +434,7 @@ Widget baseTabBar(
boxShadow: [
BoxShadow(
color: Colors.black12,
offset: Offset(0.0, 2.0),
blurRadius: 0.5,
spreadRadius: 0.5
)
......
......@@ -123,7 +123,7 @@ class DioInterceptorManager {
print("请求之前 onRequest${opt.uri}${opt.queryParameters}${opt.headers}");
}, onResponse: (response) {
print("响应之前 onResponse${response}");
print("响应之前 ");
}, onError: (e) {
print("网络错误 $e message ${e.message}");
});
......
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