Skip to content

G
gm_flutter
Commit 21f25c43 authored by 杜欣's avatar 杜欣
Browse files
Options

Merge branch 'test' into featrue/duxin 

# Conflicts:
#	lib/ClueModel/server/api/ClueApi.dart
#	lib/ClueModel/server/api/ClueApi.serv.dart
parents 3280ec6b cc889c68
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1983 additions and 464 deletions
lib/ClueModel/ClueRouterImpl.dart
View file @ 21f25c43
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* @author lsy * @author lsy
* @date 2020/6/24 * @date 2020/6/24
**/ **/
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart'; import 'package:flutter/src/widgets/framework.dart';
import 'package:gm_flutter/ClueModel/ClueRouter.dart'; import 'package:gm_flutter/ClueModel/ClueRouter.dart';
import 'package:gm_flutter/ClueModel/page/PlansCompareFeed/PlansCompareFeedPage.dart'; import 'package:gm_flutter/ClueModel/page/PlansCompareFeed/PlansCompareFeedPage.dart';
...@@ -15,14 +16,14 @@ import 'package:gm_flutter/ClueModel/page/top/TopPage.dart'; ...@@ -15,14 +16,14 @@ import 'package:gm_flutter/ClueModel/page/top/TopPage.dart';
class ClueRouterImpl implements ClueRouter { class ClueRouterImpl implements ClueRouter {
@override @override
Widget getProjectDetailsPage() { Widget getProjectDetailsPage() {
return ProjectDetailsPage(); return ProjectDetailsPage(1);
} }
@override @override
Widget getLevelOnePage() { Widget getLevelOnePage() {
return LevelOnePage(); return LevelOnePage();
} }
@override @override
Widget getLevelTwoPage() { Widget getLevelTwoPage() {
return LevelTwoPage(); return LevelTwoPage();
...@@ -30,7 +31,7 @@ class ClueRouterImpl implements ClueRouter { ...@@ -30,7 +31,7 @@ class ClueRouterImpl implements ClueRouter {
@override @override
Widget getPlansCompareFeed() { Widget getPlansCompareFeed() {
return PlansCompareFeedPage(); return PlansCompareFeedPage(123,1);
} }
@override @override
...@@ -38,6 +39,7 @@ class ClueRouterImpl implements ClueRouter { ...@@ -38,6 +39,7 @@ class ClueRouterImpl implements ClueRouter {
return PlanPage(); return PlanPage();
} }
@override
Widget getPlanCompareDetailPage() { Widget getPlanCompareDetailPage() {
return PlanCompareDetailPage(); return PlanCompareDetailPage();
} }
......
lib/ClueModel/page/DiscussLowPrice/DiscussLowPriceModel.dart 0 → 100644
View file @ 21f25c43
/*
* @Author: zx
* @Date: 2020-07-03 20:54:59
* @Last Modified by: zx
* @Last Modified time: 2020-07-04 12:20:45
*/
import 'package:dio/dio.dart';
import 'package:flutter_common/commonModel/live/BaseModel.dart';
import 'package:flutter_common/commonModel/live/LiveData.dart';
import 'package:gm_flutter/ClueModel/server/api/ClueApi.serv.dart';
import 'package:gm_flutter/commonModel/GMBase.dart';
import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
import 'package:flutter_common/commonModel/toast/NativeToast.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceModelBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceAuthBean.dart';
class DiscussLowPriceModel extends BaseModel {
LiveData<Pair<int, DiscussLowPriceModelBean>> popViewLive = LiveData();
RxDispose rxDispose = RxDispose();
fetchPopviewData(String planId, String hospitalId, String doctorId) {
ClueApiImpl.getInstance()
.getPopviewData(
DioUtil.getInstance().getDio(), planId, hospitalId, doctorId)
.listen((event) {
if (event.error == 0) {
if (event.data == null) {
popViewLive.notifyView(Pair(ENDLOADING, null));
} else {
popViewLive.notifyView(Pair(ENDLOADING, event.data));
}
} else {
NativeToast.showNativeToast(event.message);
popViewLive.notifyView(Pair(FAIL, null));
}
})
.addToDispose(rxDispose)
.onError((err) {
popViewLive.notifyView(Pair(FAIL, null));
NativeToast.showNativeToast(err.message);
});
}
givePhoneAuth(int leadPhoneRequestId, VoidCallback callback) {
popViewLive.notifyView(Pair(LOADING, null));
ClueApiImpl.getInstance()
.givePhoneAuth(DioUtil.getInstance().getDio(), leadPhoneRequestId)
.listen((event) {
if (event.error == 0) {
} else {
NativeToast.showNativeToast(event.message);
}
callback();
})
.addToDispose(rxDispose)
.onError((err) {
NativeToast.showNativeToast(err.message);
callback();
});
}
@override
void dispose() {
popViewLive.dispost();
rxDispose.dispose();
}
}
lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart 0 → 100644
View file @ 21f25c43
/*
* @Author: zx
* @Date: 2020-07-03 13:53:16
* @Last Modified by: zx
* @Last Modified time: 2020-07-04 12:48:35
*/
import 'package:flutter/material.dart';
import 'package:flutter_common/commonModel/picker/base/BaseCenterPicker.dart';
import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceModelBean.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPriceModel.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart';
class DiscussLowPricePopView {
static void showPopView(BuildContext content) {
BaseCenterPicker()
..setPicker(_PopView())
..show(content);
}
}
class _PopView implements ICenterPicker {
VoidCallback dismissCallback;
double contentWidth;
DiscussLowPriceModel _model = new DiscussLowPriceModel();
@override
Widget build(BuildContext context, int alp) {
contentWidth = MediaQuery.of(context).size.width - 72;
return StreamBuilder<Pair<int, DiscussLowPriceModelBean>>(
stream: _model.popViewLive.stream,
initialData: _model.popViewLive.data ?? Pair(LOADING, null),
builder: (c, data) {
if (data.data.first == LOADING) {
return loadingItem();
}
if (data.data.second == null || data.data.first == FAIL) {
return errorItem(contentWidth, 308.5, () {});
}
return Opacity(
opacity: alp / 255.0,
child: Container(
width: contentWidth,
height: 308.5,
child: Stack(
alignment: AlignmentDirectional.topCenter,
children: <Widget>[
Positioned(
top: 42.5,
child: setupBodyView(),
),
Positioned(
top: 62.5,
right: 20,
width: 13.5,
height: 13.5,
child: GestureDetector(
onTap: () {
dismissCallback();
},
child: Image.asset(
'assets/discuss_loe_price_cancel.png'),
)),
Container(
width: 85,
height: 85,
decoration: BoxDecoration(boxShadow: [
BoxShadow(
color: Colors.black12,
offset: Offset(0.0, 15.0),
blurRadius: 15.0,
spreadRadius: 1.0)
], shape: BoxShape.circle),
child: ClipOval(
child: Image.network(
_model.popViewLive.data.second.icon,
fit: BoxFit.cover),
),
)
]),
));
});
}
setupBodyView() {
return Container(
height: 266,
width: contentWidth,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(7),
color: Colors.white,
),
child: Container(
alignment: Alignment.center,
margin: EdgeInsets.only(bottom: 0, top: 44),
child: detailView(),
),
);
}
detailView() {
return Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container(
margin: EdgeInsets.only(bottom: 13.5),
alignment: AlignmentDirectional.center,
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
width: 16,
height: 16,
child: Image.asset(
'assets/discuss_loe_price_like.png',
)),
Container(
margin: EdgeInsets.only(left: 4),
child: baseText(_model.popViewLive.data.second.tip, 14,
Color(0xff848484)),
)
]),
),
Container(
margin: EdgeInsets.only(bottom: 25),
child: baseText(
_model.popViewLive.data.second.title, 18, Color(0xff464646),
bold: true)),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(7),
color: Color(0xffECECEC),
),
alignment: Alignment.center,
margin: EdgeInsets.only(bottom: 12),
width: contentWidth - 70,
height: 37,
child: baseText(_model.popViewLive.data.second.authorizePhone, 16,
Color(0xff484848))),
Container(
margin: EdgeInsets.only(bottom: 14),
width: contentWidth - 70,
height: 37,
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(7),
// color: Color.fromARGB(alp, 58, 195, 189)
// ),
child: Image.asset(
"assets/discuss_loe_price_auth.png",
),
).gestureDetector(() {
// 一键授权
_model.givePhoneAuth(111, () {
dismissCallback();
});
}),
Container(
width: contentWidth - 70,
margin: EdgeInsets.only(bottom: 23.5),
child: baseText('授权后，您的手机将以“虚拟号”方式提供给机构', 11, Color(0xff999999))),
]);
}
@override
void dispose() {
_model.dispose();
}
@override
void initState(VoidCallback dismissCall, BuildContext context) {
this.dismissCallback = dismissCall;
_model.fetchPopviewData('1', '2', '3');
}
}
lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailModel.dart
View file @ 21f25c43
...@@ -53,5 +53,6 @@ class PlanCompareDetailModel extends BaseModel { ...@@ -53,5 +53,6 @@ class PlanCompareDetailModel extends BaseModel {
void dispose() { void dispose() {
stateLive.dispost(); stateLive.dispost();
detailLive.dispost(); detailLive.dispost();
headerLive.dispost();
} }
} }
lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart
View file @ 21f25c43
...@@ -47,13 +47,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> { ...@@ -47,13 +47,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Navigator.pop(context); Navigator.pop(context);
}), }),
body: Container( body: Container(
child: child: reloadPage(),
// head(),
// planPopularityView()
// planNormalEffectiveAttrsView()
// setupHome([], []),
reloadPage(),
)); ));
} }
......
lib/ClueModel/page/PlansCompareFeed/CallBackCompareItem.dart 0 → 100644
View file @ 21f25c43
class CallBackCompareItem {
checkedItem(int id) {}
}
lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedItemView.dart
View file @ 21f25c43
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_common/commonModel/toast/NativeToast.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/BaseState.dart';
class PlansCompareFeedItemView extends StatelessWidget { import 'CallBackCompareItem.dart';
class PlansCompareFeedItemView extends StatefulWidget {
Plans plan; Plans plan;
int groupValue = 1; CallBackCompareItem compareItem;
Set<int> _setCompare;
PlansCompareFeedItemView(this.plan, this.compareItem, this._setCompare);
@override
State<StatefulWidget> createState() => _PlansCompareFeedItemViewState();
}
class _PlansCompareFeedItemViewState
extends BaseState<PlansCompareFeedItemView> {
ImageIcon _checked = ImageIcon(AssetImage("assets/icon_compare_select.png"));
PlansCompareFeedItemView(this.plan); ImageIcon _unchecked =
ImageIcon(AssetImage("assets/icon_compare_unselect.png"));
ImageIcon _icon = ImageIcon(AssetImage("assets/icon_compare_unselect.png"));
@override @override
Widget build(BuildContext context) { Widget buildItem(BuildContext context) {
return Container(child: getItem()); return Container(
margin: EdgeInsets.only(left: 15, right: 15), child: getItem());
} }
getItem() { getItem() {
if (plan.planType == 1) { if (widget.plan.planType == 2) {
return getFirstLevelItem(); return getFirstLevelItem();
} else { } else {
return getSecondLevelItem(); return getSecondLevelItem();
...@@ -26,21 +45,19 @@ class PlansCompareFeedItemView extends StatelessWidget { ...@@ -26,21 +45,19 @@ class PlansCompareFeedItemView extends StatelessWidget {
width: double.maxFinite, width: double.maxFinite,
height: 90, height: 90,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
padding: EdgeInsets.only(left: 15, right: 15, top: 20, bottom: 20), padding: EdgeInsets.only(top: 20, bottom: 20),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Radio( IconButton(
value: 1, icon: _icon,
groupValue: groupValue, onPressed: () => onClickCheckBox(_icon),
onChanged: (value) { ),
groupValue = value;
}),
Container( Container(
margin: EdgeInsets.only(left: 15, right: 15), margin: EdgeInsets.only(left: 15, right: 15),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(2.0), borderRadius: BorderRadius.circular(2.0),
child: Image.network( child: Image.network(
plan.projectImage, widget.plan.projectImage,
width: 50, width: 50,
height: 50, height: 50,
fit: BoxFit.fill, fit: BoxFit.fill,
...@@ -56,42 +73,20 @@ class PlansCompareFeedItemView extends StatelessWidget { ...@@ -56,42 +73,20 @@ class PlansCompareFeedItemView extends StatelessWidget {
margin: EdgeInsets.only(top: 2, bottom: 5), margin: EdgeInsets.only(top: 2, bottom: 5),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Text( baseText(widget.plan.name, 14, Color(0xFF282828),
plan.name, bold: true),
style: TextStyle( baseText(" 好评率 ", 11, Color(0xFF282828)),
fontWeight: FontWeight.bold, baseText(widget.plan.positiveRate, 14, Color(0xFFFF5963),
fontSize: 14, bold: true),
color: Color(0xFF282828)),
maxLines: 1,
),
Text(
"好评率 ",
style:
TextStyle(fontSize: 11, color: Color(0xFF282828)),
maxLines: 1,
),
Text(
plan.positiveRate,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14,
color: Color(0xFFFF5963)),
maxLines: 1,
),
], ],
), ),
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
Text( baseText('￥${widget.plan.minPrice}-${widget.plan.maxPrice}',
'￥${plan.minPrice}-${plan.maxPrice}', 13, Color(0xFFFF5963)),
style: TextStyle(fontSize: 13, color: Color(0xFFFF5963)), baseText(" 销量${widget.plan.salesCount}", 11,
), Color(0xFF282828))
Text(
"销量${plan.salesCount}",
style: TextStyle(fontSize: 11, color: Color(0xFF282828)),
maxLines: 1,
)
], ],
) )
], ],
...@@ -104,58 +99,55 @@ class PlansCompareFeedItemView extends StatelessWidget { ...@@ -104,58 +99,55 @@ class PlansCompareFeedItemView extends StatelessWidget {
getSecondLevelItem() { getSecondLevelItem() {
return Container( return Container(
width: double.maxFinite,
height: 77, height: 77,
alignment: Alignment.centerLeft,
margin: EdgeInsets.only(left: 15, right: 15),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Radio(
value: 1,
groupValue: groupValue,
onChanged: (value) {
groupValue = value;
}),
Container( Container(
margin: EdgeInsets.only(left: 15.0), margin: EdgeInsets.only(right: 15.0),
height: 77,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Column( child: IconButton(
crossAxisAlignment: CrossAxisAlignment.start, icon: _icon,
children: <Widget>[ onPressed: () => onClickCheckBox(_icon),
Container(
margin: EdgeInsets.only(top: 13.0, bottom: 12),
child: Text(
plan.name,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14,
color: Color(0xFF282828)),
maxLines: 1,
),
),
Row(
children: <Widget>[
Text(
'￥${plan.minPrice}-${plan.maxPrice}',
style: TextStyle(fontSize: 13, color: Color(0xFFFF5963)),
),
Container(
alignment: Alignment.centerRight,
child: Text(
"指导价：￥${plan.guidePrice}",
style:
TextStyle(fontSize: 11, color: Color(0xFF282828)),
maxLines: 1,
),
),
],
)
],
), ),
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(top: 13.0, bottom: 12),
child: baseText(widget.plan.name, 14, Color(0xFF282828),
bold: true),
),
Row(
children: <Widget>[
baseText('￥${widget.plan.minPrice}-${widget.plan.maxPrice}',
13, Color(0xFFFF5963)),
Container(
width: 160,
alignment: Alignment.centerRight,
child: baseText("指导价：￥${widget.plan.guidePrice}", 11,
Color(0xFF282828))),
],
),
],
) )
], ],
), ),
); );
} }
onClickCheckBox(ImageIcon icon) {
if (icon == _checked) {
_icon = _unchecked;
} else {
if (widget._setCompare.length == 2) {
NativeToast.showNativeToast("不许再选了两个够了！");
return;
}
_icon = _checked;
}
setState(() {
widget.compareItem.checkedItem(widget.plan.planId);
});
}
} }
lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedModel.dart
View file @ 21f25c43
...@@ -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);
}) })
......
lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedPage.dart
View file @ 21f25c43
...@@ -5,38 +5,48 @@ ...@@ -5,38 +5,48 @@
**/ **/
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';
import 'package:gm_flutter/commonModel/base/BaseState.dart'; import 'package:gm_flutter/commonModel/base/BaseState.dart';
import 'CallBackCompareItem.dart';
import 'PlansCompareFeedItemView.dart'; import 'PlansCompareFeedItemView.dart';
class PlansCompareFeedPage extends StatefulWidget { class PlansCompareFeedPage extends StatefulWidget {
int _planType;
int _planId;
PlansCompareFeedPage(this._planType, this._planId);
@override @override
State<StatefulWidget> createState() => PlansCompareFeedState(); State<StatefulWidget> createState() => _PlansCompareFeedState();
} }
class PlansCompareFeedState extends BaseState<PlansCompareFeedPage> { class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
PlansCompareFeedModel _model = new PlansCompareFeedModel(); implements CallBackCompareItem {
PlansCompareFeedModel _model;
Color _compareColor;
Set<int> _setCompare;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_model.init(); _model = new PlansCompareFeedModel();
_model.init(widget._planType, widget._planId);
_compareColor = Color(0xFFCCCCCC);
_setCompare = Set();
} }
@override @override
void dispose() { void dispose() {
_model.dispose();
super.dispose(); super.dispose();
_model.dispose();
} }
@override @override
Widget buildItem(BuildContext context) {} Widget buildItem(BuildContext context) {
@override
Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: baseAppBar( appBar: baseAppBar(
title: "方案对比", title: "方案对比",
...@@ -50,31 +60,6 @@ class PlansCompareFeedState extends BaseState<PlansCompareFeedPage> { ...@@ -50,31 +60,6 @@ class PlansCompareFeedState extends BaseState<PlansCompareFeedPage> {
); );
} }
getList(List<Plans> plans) {
return Stack(alignment: Alignment.bottomCenter, //指定未定位或部分定位widget的对齐方式
children: <Widget>[
ListView.builder(
itemCount: plans.length,
itemBuilder: (BuildContext context, int position) {
return PlansCompareFeedItemView(plans[position]);
}),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {},
child: Container(
margin:
EdgeInsets.only(left: 15, right: 15, top: 7.5, bottom: 7.5),
width: double.maxFinite,
height: 40,
decoration: BoxDecoration(
color: Color(0xff51CDC7),
borderRadius: BorderRadius.circular(20)),
alignment: Alignment.center,
child: baseText("对比", 14, Colors.white, bold: true),
))
]);
}
getBody() { getBody() {
return StreamBuilder( return StreamBuilder(
stream: _model.liveData.stream, stream: _model.liveData.stream,
...@@ -96,4 +81,51 @@ class PlansCompareFeedState extends BaseState<PlansCompareFeedPage> { ...@@ -96,4 +81,51 @@ class PlansCompareFeedState extends BaseState<PlansCompareFeedPage> {
}, },
); );
} }
getList(List<Plans> plans) {
return Stack(alignment: Alignment.bottomCenter, children: <Widget>[
ListView.builder(
itemCount: plans.length,
itemBuilder: (BuildContext context, int position) {
return PlansCompareFeedItemView(plans[position], this, _setCompare);
}),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => onClickCompare(),
child: Container(
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)),
alignment: Alignment.center,
child: baseText("对比", 14, Colors.white, bold: true),
))
]);
}
onClickCompare() {
if (_compareColor == Color(0xFFCCCCCC)) return;
setState(() {
Map<String, dynamic> map = {};
map["ids"] = _setCompare;
FlutterBoost.singleton.open("sample", urlParams: map);
});
}
@override
checkedItem(int id) {
if (_setCompare.contains(id)) {
_setCompare.remove(id);
} else {
_setCompare.add(id);
}
setState(() {
if (_setCompare.length == 2) {
_compareColor = Color(0xff51CDC7);
} else {
_compareColor = Color(0xFFCCCCCC);
}
});
}
} }
lib/ClueModel/page/ProjectDetails/ProjectDetailsItemView.dart
View file @ 21f25c43
...@@ -6,52 +6,48 @@ ...@@ -6,52 +6,48 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gm_flutter/ClueModel/server/entity/ProjectDetailsItem.dart'; import 'package:gm_flutter/ClueModel/server/entity/ProjectDetailsItem.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
class ProjectDetailsItemView extends StatelessWidget { class ProjectDetailsItemView extends StatelessWidget {
Groups listData; Groups listData;
List<Widget> listAttrs = [];
ProjectDetailsItemView(this.listData); ProjectDetailsItemView(this.listData) {
init();
}
@override init() {
Widget build(BuildContext context) {
List<Widget> tiles = [];
for (var item in listData.attrs) { for (var item in listData.attrs) {
tiles.add(getItem(item)); listAttrs.add(getAttrItem(item));
} }
var column = Column( }
@override
Widget build(BuildContext context) {
return Column(
children: <Widget>[ children: <Widget>[
Container( Container(
padding: EdgeInsets.only(left: 15.0), padding: EdgeInsets.only(left: 15.0),
margin: EdgeInsets.only(bottom: 16.0), margin: EdgeInsets.only(bottom: 16.0),
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
width: double.maxFinite, height: 55,
height: 55, decoration: BoxDecoration(
decoration: BoxDecoration( image: DecorationImage(
image: DecorationImage( image: AssetImage("assets/bg_project_detail_item.png"),
image: AssetImage("assets/bg_project_detail_item.png"), fit: BoxFit.cover)),
fit: BoxFit.cover)), child: baseText(listData.name, 15, Colors.black, bold: true)),
child: Text(
listData.name,
style: TextStyle(
fontWeight: FontWeight.bold,
color: Color(0xFF000000),
fontSize: 15.0,
),
),
),
Column( Column(
children: tiles, children: listAttrs,
),
SizedBox(
height: 5,
) )
], ],
); );
return Container(
margin: EdgeInsets.only(bottom: 5),
child: column,
);
} }
getItem(Attrs attrs) { getAttrItem(Attrs attrs) {
var row = Container( return Container(
width: double.maxFinite, width: double.maxFinite,
margin: EdgeInsets.only(bottom: 25, left: 15, right: 15), margin: EdgeInsets.only(bottom: 25, left: 15, right: 15),
child: Row( child: Row(
...@@ -60,29 +56,13 @@ class ProjectDetailsItemView extends StatelessWidget { ...@@ -60,29 +56,13 @@ class ProjectDetailsItemView extends StatelessWidget {
margin: EdgeInsets.only(right: 25.0), margin: EdgeInsets.only(right: 25.0),
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
width: 78, width: 78,
child: Text( child: baseText(attrs.attrName, 13, Color(0xFF999999)),
attrs.attrName,
style: TextStyle(
color: Color(0xFF999999),
fontSize: 13.0,
),
),
), ),
Container( Container(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: baseText(attrs.attrValue, 14, Color(0xFF282828))),
attrs.attrValue,
style: TextStyle(
color: Color(0xFF282828),
fontSize: 14.0,
),
),
),
], ],
), ),
); );
return Container(
child: row,
);
} }
} }
lib/ClueModel/page/ProjectDetails/ProjectDetailsModel.dart
View file @ 21f25c43
...@@ -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);
}) })
......
lib/ClueModel/page/ProjectDetails/ProjectDetailsPage.dart
View file @ 21f25c43
...@@ -13,17 +13,22 @@ import 'package:gm_flutter/commonModel/base/BaseState.dart'; ...@@ -13,17 +13,22 @@ 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;
ProjectDetailsPage(this._planId);
@override @override
State<StatefulWidget> createState() => ProjectDetailsState(); State<StatefulWidget> createState() => _ProjectDetailsState();
} }
class ProjectDetailsState extends BaseState<ProjectDetailsPage> { class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
ProjectDetailsModel _model = new ProjectDetailsModel(); ProjectDetailsModel _model;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_model.init(); _model = new ProjectDetailsModel();
_model.init(widget._planId);
} }
@override @override
...@@ -33,10 +38,7 @@ class ProjectDetailsState extends BaseState<ProjectDetailsPage> { ...@@ -33,10 +38,7 @@ class ProjectDetailsState extends BaseState<ProjectDetailsPage> {
} }
@override @override
Widget buildItem(BuildContext context) {} Widget buildItem(BuildContext context) {
@override
Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: baseAppBar( appBar: baseAppBar(
title: "项目说明", title: "项目说明",
...@@ -60,12 +62,24 @@ class ProjectDetailsState extends BaseState<ProjectDetailsPage> { ...@@ -60,12 +62,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,
......
lib/ClueModel/page/levelOne/LevelOneList.dart 0 → 100644
View file @ 21f25c43
/*
* @author lsy
* @date 2020/7/4
**/
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneListModel.dart';
import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'LevelOneItem.dart';
class LevelOneList extends StatefulWidget {
double topHeight;
int planId;
String tabName;
LevelOneList(this.planId, this.tabName, this.topHeight);
@override
State<StatefulWidget> createState() => LevelOneListState();
}
class LevelOneListState extends State<LevelOneList>
with AutomaticKeepAliveClientMixin{
LevelOneListModel _model = LevelOneListModel();
RefreshController refreshController = RefreshController();
Function(String str) refresh;
@override
void initState() {
super.initState();
_model.plan_id = widget.planId;
_model.tab_type = widget.tabName;
_model.refreshView(true);
refresh = (str) {
_model.stateLive.notifyView(LOADING);
_model.refreshView(true);
};
SimpleEventBus.instance().resignEvent("LevelOneList", refresh);
}
@override
void dispose() {
refreshController.dispose();
_model.dispose();
SimpleEventBus.instance().unResignEvent("LevelOneList", refresh);
super.dispose();
}
@override
Widget build(BuildContext context) {
super.build(context);
return baseStateView(MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height, _model.stateLive, pages(), () {
_model.refreshView(true);
}, paddingTop: widget.topHeight);
}
Widget pages() {
return baseRefreshView(refreshController, () {}, null, null,
customScrollView: CustomScrollView(
// physics: NeverScrollableScrollPhysics(),
physics: ClampingScrollPhysics(),
// shrinkWrap: true,
slivers: <Widget>[
// SliverOverlapInjector(
// handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
// ),
StreamBuilder<List<Cards>>(
stream: _model.cardsLive.stream,
initialData: _model.cardsLive.data ?? [],
builder: (c, data) {
if (data.data.isEmpty && _model.page > 1) {
refreshController.loadNoData();
} else {
refreshController.loadComplete();
}
return SliverList(
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
if(index==_model.data.length){
return Container(
height: 40,
color: Color(0xffF7F6FA),
);
}
return LevelOneItem(_model.data[index]);
},
childCount: _model.data.length+1,
),
);
},
),
StreamBuilder<List<Cards>>(
stream: _model.cardsLive.stream,
initialData: _model.data ?? [],
builder: (c, data) {
double totalHeight = 0;
_model.data.forEach((element) {
totalHeight += LevelOneItem.getCardTypeHeight(element);
});
double height = MediaQuery.of(context).size.height -
40 -
widget.topHeight -
totalHeight;
return SliverToBoxAdapter(
child: Container(
height: height < 0 ? 0 : height,
),
);
},
),
],
), onLoading: () {
_model.loadMore();
}, pullDown: false, pullUp: true);
}
@override
bool get wantKeepAlive => true;
}
lib/ClueModel/page/levelOne/LevelOneListModel.dart 0 → 100644
View file @ 21f25c43
/*
* @author lsy
* @date 2020/7/4
**/
import 'package:flutter_common/commonModel/live/BaseModel.dart';
import 'package:flutter_common/commonModel/live/LiveData.dart';
import 'package:flutter_common/commonModel/toast/NativeToast.dart';
import 'package:gm_flutter/ClueModel/server/api/ClueApi.serv.dart';
import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/net/DioUtil.dart';
import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
import 'package:gm_flutter/commonModel/util/PrintUtil.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
class LevelOneListModel extends BaseModel {
int plan_id;
String tab_type;
int page = 1;
LiveData<int> stateLive = LiveData();
LiveData<List<Cards>> cardsLive = LiveData();
List<Cards> data = [];
RxDispose rxDispose = RxDispose();
void refreshView(bool clear, {RefreshController refreshListener}) {
if (clear) {
data.clear();
page = 1;
}
ClueApiImpl.getInstance()
.getLevelOneList(
DioUtil.getInstance().getDio(), plan_id, tab_type, page)
.listen((event) {
if (event.error == 0) {
if ((event.data.cards == null || event.data.cards.isEmpty) &&
page == 1) {
stateLive.notifyView(EMPTY);
} else {
data.addAll(event.data.cards);
cardsLive.notifyView(data);
stateLive.notifyView(ENDLOADING);
}
} else {
NativeToast.showNativeToast(event.message);
stateLive.notifyView(FAIL);
}
})
.addToDispose(rxDispose)
.onError((err) {
PrintUtil.printBug(err);
stateLive.notifyView(FAIL);
});
}
@override
void dispose() {
rxDispose.dispose();
stateLive.dispost();
cardsLive.dispost();
}
void loadMore() {
page++;
refreshView(false);
}
}
lib/ClueModel/page/levelOne/LevelOneModel.dart
View file @ 21f25c43
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_common/commonModel/live/BaseModel.dart'; import 'package:flutter_common/commonModel/live/BaseModel.dart';
import 'package:flutter_common/commonModel/live/LiveData.dart'; import 'package:flutter_common/commonModel/live/LiveData.dart';
import 'package:flutter_common/commonModel/toast/NativeToast.dart';
import 'package:gm_flutter/ClueModel/server/api/ClueApi.serv.dart'; import 'package:gm_flutter/ClueModel/server/api/ClueApi.serv.dart';
import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart'; import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanOverViewBean.dart';
import 'package:gm_flutter/commonModel/GMBase.dart'; import 'package:gm_flutter/commonModel/GMBase.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart'; import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/rx/RxDispose.dart'; import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
...@@ -14,92 +16,43 @@ import 'package:gm_flutter/commonModel/util/PrintUtil.dart'; ...@@ -14,92 +16,43 @@ import 'package:gm_flutter/commonModel/util/PrintUtil.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';
class LevelOneModel extends BaseModel { class LevelOneModel extends BaseModel {
LiveData<double> appBarLive = LiveData(); LiveData<int> stateLive = LiveData();
LiveData<List<String>> rectLive = LiveData(); LiveData<double> textLive = LiveData();
LiveData<List<String>> explainLive = LiveData();
LiveData<bool> showTab = LiveData();
LiveData<int> topIndexLive = new LiveData();
LiveData<double> topScrollLive = new LiveData();
LiveData<bool> loadingLive = LiveData();
RxDispose rxDispose = RxDispose();
LiveData<Pair<int, List<Cards>>> cardsLive = LiveData();
Map<int, List<Cards>> data = new Map(); RxDispose rxDispose = RxDispose();
List list = ["plan", "hospital", "doctor", "diary"];
List pageList = [1, 1, 1, 1];
List pageHeightList = [118, 149, 118, 118];
void refreshView(bool clear, {RefreshController refreshListener}) { List<Tabs> tabsList = [];
Future.delayed(Duration(seconds: 1), () { int plan_id = 0;
Cards cards = Cards( PlanOverData planoverItem;
cardType: "plan",
plan: Plan(planName: "ww", minPrice: "50", maxPrice: "500"));
List<Cards> a = [
cards,
cards,
cards,
cards,
cards,
cards,
cards,
cards,
cards,
cards,
cards,
cards,
];
List<Cards> b = [cards];
print("INDEX ${currentIndex}");
if (currentIndex == 1) {
data[currentIndex] = b;
} else {
data[currentIndex] = a;
}
cardsLive.notifyView(Pair(ENDLOADING, data)); void init(VoidCallback callback) {
});
int index = currentIndex;
if (clear) {
data.clear();
pageList = [1, 1, 1, 1];
}
ClueApiImpl.getInstance() ClueApiImpl.getInstance()
.getLevelOneList( .getPlanOverView(DioUtil.getInstance().getDio(), plan_id)
DioUtil.getInstance().getDio(), 123, list[index], pageList[index]) .listen((event) {
.listen((event) {}) if (event.error == 0) {
planoverItem = event.data;
tabsList = event.data.tabs;
stateLive.notifyView(ENDLOADING);
callback();
} else {
NativeToast.showNativeToast(event.message);
stateLive.notifyView(FAIL);
}
})
.addToDispose(rxDispose) .addToDispose(rxDispose)
.onError((err) { .onError((err) {
PrintUtil.printBug(err); PrintUtil.printBug(err);
}); stateLive.notifyView(FAIL);
});
} }
int currentIndex = 0; int currentIndex = 0;
@override @override
void dispose() { void dispose() {
showTab.dispost(); stateLive.dispost();
cardsLive.dispost(); textLive.dispost();
appBarLive.dispost();
rectLive.dispost();
topIndexLive.dispost();
topScrollLive.dispost();
loadingLive.dispost();
}
void selectPage(int index) {
if (currentIndex == index) {
return;
}
currentIndex = index;
if (data[currentIndex] == null) {
cardsLive.notifyView(Pair(LOADING, null));
refreshView(true);
} else {
cardsLive.notifyView(Pair(ENDLOADING, data[currentIndex]));
}
} }
void loadMore() { void selectTab(int index) {}
}
} }
lib/ClueModel/page/top/TopList.dart 0 → 100644
View file @ 21f25c43
/*
* @author lsy
* @date 2020/7/2
**/
import 'package:flutter/material.dart';
import 'package:gm_flutter/ClueModel/page/plan/PlanItem.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'TopListModel.dart';
class TopList extends StatefulWidget {
final int id;
double topHeight;
TopList(this.id, this.topHeight);
@override
State<StatefulWidget> createState() => TopListState();
}
class TopListState extends State<TopList>
with AutomaticKeepAliveClientMixin{
RefreshController refreshController = RefreshController();
TopListModel _model = TopListModel();
Function(String str) refresh;
@override
void initState() {
super.initState();
_model.getData(true);
refresh = (str) {
_model.stateLive.notifyView(LOADING);
_model.getData(true);
};
SimpleEventBus.instance().resignEvent("TopList", refresh);
print("${this} INIT");
}
@override
void dispose() {
refreshController.dispose();
_model.dispose();
SimpleEventBus.instance().unResignEvent("TopList", refresh);
print("${this} QUIT");
super.dispose();
}
@override
Widget build(BuildContext context) {
super.build(context);
return baseStateView(MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height, _model.stateLive, home(), () {
_model.getData(true);
});
}
Widget home() {
return baseRefreshView(refreshController, () {}, null, null,
customScrollView: CustomScrollView(
// physics: NeverScrollableScrollPhysics(),
physics: ClampingScrollPhysics(),
// shrinkWrap: true,
slivers: <Widget>[
SliverToBoxAdapter(
child: Container(
height: widget.topHeight,
),
),
// extend.SliverOverlapInjector(
// handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
// ),
StreamBuilder<List<Plans>>(
stream: _model.datasLive.stream,
initialData: _model.datas ?? [],
builder: (c, data) {
if (data.data.isEmpty && _model.page > 1) {
refreshController.loadNoData();
} else {
refreshController.loadComplete();
}
return SliverFixedExtentList(
itemExtent: 100,
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
return PlanItem(_model.datas[index]);
},
childCount: _model.datas.length,
),
);
},
),
StreamBuilder<List<Plans>>(
stream: _model.datasLive.stream,
initialData: _model.datas ?? [],
builder: (c, data) {
double height = MediaQuery.of(context).size.height -
40 -
100 * _model.datas.length
;
return SliverToBoxAdapter(
child: Container(
height: height < 0 ? 0 : height,
),
);
},
),
],
), onLoading: () {
_model.loadMore();
}, pullDown: false, pullUp: true);
}
@override
bool get wantKeepAlive => true;
}
lib/ClueModel/page/top/TopListModel.dart 0 → 100644
View file @ 21f25c43
/*
* @author lsy
* @date 2020/7/3
**/
import 'package:flutter_common/commonModel/live/BaseModel.dart';
import 'package:flutter_common/commonModel/live/LiveData.dart';
import 'package:flutter_common/commonModel/toast/NativeToast.dart';
import 'package:gm_flutter/ClueModel/server/api/ClueApi.serv.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart';
import 'package:gm_flutter/commonModel/GMBase.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
import 'package:gm_flutter/commonModel/util/PrintUtil.dart';
class TopListModel extends BaseModel {
LiveData<int> stateLive = LiveData();
String tagId;
int page = 1;
RxDispose rxDispose = RxDispose();
LiveData<List<Plans>> datasLive = LiveData();
List<Plans> datas = [];
@override
void dispose() {
rxDispose.dispose();
stateLive.dispost();
}
void getData(bool clear) {
if (clear) {
page = 1;
datas.clear();
}
ClueApiImpl.getInstance()
.getPlanFeed(
DioUtil.getInstance().getDio(), tagId, "", "", "", "", "", page)
.listen((event) {
if (event.error == 0) {
if (event.data.plans == null || event.data.plans.isEmpty) {
if (page == 1) {
stateLive.notifyView(EMPTY);
} else {
datasLive.notifyView([]);
}
} else {
datas.addAll(event.data.plans);
datasLive.notifyView(datas);
}
if (page == 1) {
stateLive.notifyView(ENDLOADING);
}
} else {
NativeToast.showNativeToast(event.message);
stateLive.notifyView(FAIL);
}
})
.addToDispose(rxDispose)
.onError((err) {
PrintUtil.printBug(err);
stateLive.notifyView(FAIL);
});
}
void loadMore() {
page++;
getData(false);
}
}
lib/ClueModel/page/top/TopModel.dart
View file @ 21f25c43
...@@ -2,15 +2,38 @@ ...@@ -2,15 +2,38 @@
* @author lsy * @author lsy
* @date 2020/7/2 * @date 2020/7/2
**/ **/
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_common/commonModel/live/BaseModel.dart'; import 'package:flutter_common/commonModel/live/BaseModel.dart';
import 'package:flutter_common/commonModel/live/LiveData.dart'; import 'package:flutter_common/commonModel/live/LiveData.dart';
import 'package:flutter_common/commonModel/toast/NativeToast.dart';
import 'package:gm_flutter/ClueModel/server/api/ClueApi.serv.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanBarBean.dart';
import 'package:gm_flutter/commonModel/GMBase.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
import 'package:gm_flutter/commonModel/util/PrintUtil.dart';
class TopModel extends BaseModel { class TopModel extends BaseModel {
int tabIndex = 0; int tabIndex = 0;
List<String> tabs = ["全部", "眼部", "自体脂肪", "轮廓骨骼"]; List<Tabs> tabs = [];
LiveData<String> titleLive = new LiveData();
LiveData<String> imageLive = LiveData();
LiveData<double> textLive = LiveData();
LiveData<int> stateLive = LiveData();
RxDispose rxDispose = RxDispose();
String rank_type;
String imageUrl;
@override @override
void dispose() {} void dispose() {
rxDispose.dispose();
titleLive.dispost();
imageLive.dispost();
stateLive.dispost();
textLive.dispost();
}
void selectTab(int index) { void selectTab(int index) {
if (tabIndex == index) { if (tabIndex == index) {
...@@ -18,4 +41,25 @@ class TopModel extends BaseModel { ...@@ -18,4 +41,25 @@ class TopModel extends BaseModel {
} }
tabIndex = index; tabIndex = index;
} }
void init(VoidCallback back) {
ClueApiImpl.getInstance()
.getPlanBar(DioUtil.getInstance().getDio(), rank_type)
.listen((event) {
if (event.error == 0) {
stateLive.notifyView(ENDLOADING);
imageUrl = event.data.bannerImage;
tabs = event.data.tabs;
back();
} else {
NativeToast.showNativeToast(event.message);
stateLive.notifyView(FAIL);
}
})
.addToDispose(rxDispose)
.onError((error) {
PrintUtil.printBug(error);
stateLive.notifyView(FAIL);
});
}
} }
lib/ClueModel/page/top/TopPage.dart
View file @ 21f25c43
...@@ -2,15 +2,26 @@ ...@@ -2,15 +2,26 @@
* @author lsy * @author lsy
* @date 2020/7/2 * @date 2020/7/2
**/ **/
import 'dart:async';
import 'dart:ui';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'
as extend;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gm_flutter/ClueModel/page/levelTwo/LevelTwoPage.dart'; import 'package:gm_flutter/ClueModel/page/levelTwo/LevelTwoPage.dart';
import 'package:gm_flutter/ClueModel/page/top/TopModel.dart'; import 'package:gm_flutter/ClueModel/page/top/TopModel.dart';
import 'package:gm_flutter/ClueModel/util/PosUtil.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart'; import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/commonModel/base/BaseState.dart'; import 'package:gm_flutter/commonModel/base/BaseState.dart';
import 'package:gm_flutter/commonModel/view/baseTabIndicator.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';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'TopList.dart';
class TopPage extends StatefulWidget { class TopPage extends StatefulWidget {
@override @override
State<StatefulWidget> createState() => TopPageState(); State<StatefulWidget> createState() => TopPageState();
...@@ -18,84 +29,156 @@ class TopPage extends StatefulWidget { ...@@ -18,84 +29,156 @@ class TopPage extends StatefulWidget {
class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin { class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
RefreshController refreshController = RefreshController(); RefreshController refreshController = RefreshController();
TabController tabController;
TopModel _model = TopModel(); TopModel _model = TopModel();
int index = 0;
TabController tabController;
@override @override
void initState() { void initState() {
tabController = TabController(length: 4, vsync: this); init();
super.initState(); super.initState();
} }
void init() {
_model.init(() {
_initTabBar();
});
}
@override @override
void dispose() { void dispose() {
_model.dispose();
tabController?.removeListener(tabControlerListener);
tabController?.dispose();
refreshController.dispose(); refreshController.dispose();
super.dispose(); super.dispose();
} }
void _initTabBar() {
if (tabController != null) {
tabController.removeListener(tabControlerListener);
}
tabController = TabController(
initialIndex: index, length: _model.tabs.length, vsync: this);
tabController.addListener(tabControlerListener);
setState(() {});
}
@override @override
Widget buildItem(BuildContext context) { Widget buildItem(BuildContext context) {
return Scaffold( return Scaffold(
body: home(), body: baseStateView(
MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height,
_model.stateLive,
Container(
child: BaseNestedScrollViewRefreshIndicator(
onRefresh: () async {
Completer completer = new Completer();
_model.init(() {
_initTabBar();
SimpleEventBus.instance().notifyListener("TopList", "");
completer.complete();
});
return completer.future;
},
child: homeWarp()),
), () {
init();
}),
); );
} }
Widget home() { Widget homeWarp() {
return baseRefreshView(refreshController, () {}, null, null, return Stack(
customScrollView: CustomScrollView(slivers: <Widget>[ children: <Widget>[
SliverAppBar( Container(
pinned: true, width: MediaQuery.of(context).size.width,
elevation: 0, height: MediaQuery.of(context).size.height,
expandedHeight: 0, child: NotificationListener(
flexibleSpace: FlexibleSpaceBar(title: Text('二级方案')), onNotification: (scrollNotification) {
), if (scrollNotification is KeepAliveNotification ||
SliverToBoxAdapter( scrollNotification is OverscrollIndicatorNotification) {
child: Column( return false;
crossAxisAlignment: CrossAxisAlignment.start, }
mainAxisSize: MainAxisSize.max, if (scrollNotification is ScrollUpdateNotification &&
children: <Widget>[ scrollNotification.metrics.axisDirection.index == 2) {}
Container( if (scrollNotification.depth == 0) {
height: 50, if (scrollNotification.metrics.pixels > 80) {
color: Colors.pink, _model.textLive.notifyView(
) (scrollNotification.metrics.pixels - 80) / 40 > 1.0
], ? 1.0
)), : (scrollNotification.metrics.pixels - 80) / 40);
SliverPersistentHeader( } else {
pinned: true, _model.textLive.notifyView(0.0);
delegate: StickyTabBarDelegate( }
child: Container( } else if (scrollNotification.depth == 2) {
height: 40, if (scrollNotification.metrics.pixels < 50 &&
color: Colors.white, scrollNotification.metrics.pixels > 0) {
child: baseTabBar(tabController, getTabs(), (index) { _model.textLive.notifyView(1.0);
_model.selectTab(index); }
}), }
)), return false;
},
child: home(),
), ),
SliverFillRemaining( ),
child: TabBarView(controller: tabController, children: <Widget>[ baseSliverBack(() {
Container( Navigator.of(context).pop();
color: Colors.red, }),
), baseSliverTitle(
Container( "title", MediaQuery.of(context).size.width, _model.textLive)
color: Colors.red, ],
), );
Container( }
color: Colors.red,
Widget home() {
List<Widget> list = [];
var d = MediaQueryData.fromWindow(window).padding.top;
for (int i = 0; i < _model.tabs.length; i++) {
list.add(extend.NestedScrollViewInnerScrollPositionKeyWidget(Key("Tab${i}"),
TopList(_model.tabs[i].id, kToolbarHeight + d)));
}
return extend.NestedScrollView(
innerScrollPositionKeyBuilder: () {
String index = 'Tab${tabController.index.toString()}';
return Key(index);
},
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
SliverOverlapAbsorber(
handle: extend.NestedScrollView.sliverOverlapAbsorberHandleFor(
context),
sliver: baseSliverAppBar(_model.imageUrl)),
SliverPersistentHeader(
pinned: true,
delegate: StickyTabBarDelegate(
child: Container(
height: 40,
color: Colors.white,
child: baseTabBar(tabController, getTabs(), (index) {
_model.selectTab(index);
}),
)),
), ),
Container( ];
color: Colors.blue, },
) body: TabBarView(controller: tabController, children: list));
]))
]));
} }
List<Widget> getTabs() { List<Widget> getTabs() {
List<Widget> list = []; List<Widget> list = [];
for (int i = 0; i < _model.tabs.length; i++) { for (int i = 0; i < _model.tabs.length; i++) {
list.add(baseTabBarItem(_model.tabs[i], list.add(baseTabBarItem(_model.tabs[i].name,
leftPadding: i == 0 ? 24 : 28, leftPadding: i == 0 ? 24 : 28,
rightPadding: i == _model.tabs.length - 1 ? 24 : 28)); rightPadding: i == _model.tabs.length - 1 ? 24 : 28));
} }
return list; return list;
} }
void tabControlerListener() {
if (index != tabController.index) {
index = tabController.index;
}
}
} }
lib/ClueModel/server/api/ClueApi.dart
View file @ 21f25c43
...@@ -8,29 +8,32 @@ import 'package:flutter_common/Annotations/anno/Query.dart'; ...@@ -8,29 +8,32 @@ import 'package:flutter_common/Annotations/anno/Query.dart';
import 'package:flutter_common/Annotations/anno/ServiceCenter.dart'; import 'package:flutter_common/Annotations/anno/ServiceCenter.dart';
import 'package:gm_flutter/ClueModel/server/entity/ConsultQuestionsBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/ConsultQuestionsBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart'; import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanBarBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanCompareDetail.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanCompareDetail.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanConsultBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanConsultBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanOverviewBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanOverViewBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlansCompareFeed.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlansCompareFeed.dart';
import 'package:gm_flutter/ClueModel/server/entity/ProjectDetailsItem.dart'; import 'package:gm_flutter/ClueModel/server/entity/ProjectDetailsItem.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceModelBean.dart';
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,
@Query("tab_type") String tab_type, @Query("page") int page); @Query("tab_type") String tab_type, @Query("page") int page);
@Get("api/janus/plans/compare") @Get("api/janus/plans/compare")
PlanCompareDetail getPlanCompareDetail(@Query("plan_ids") List<int> plan_ids); PlanCompareDetail getPlanCompareDetail(@Query("plan_ids") List<int> planIds);
@Get("api/janus/plans/options") @Get("api/janus/plans/options")
PlanBean getPlan(); PlanBean getPlan();
...@@ -46,13 +49,27 @@ abstract class ClueApi { ...@@ -46,13 +49,27 @@ abstract class ClueApi {
@Query("page") int page, @Query("page") int page,
); );
@Get("/api/janus/plans/plan_overview")
PlanOverviewBean getPlanOverviewBean(@Query("plan_id") int plan_id);
@Get("/api/janus/plans/consult_questions") @Get("/api/janus/plans/consult_questions")
ConsultQuestionsBean getConsultQuestions(@Query("plan_id") int plan_id); ConsultQuestionsBean getConsultQuestions(@Query("plan_id") int plan_id);
@Post("/api/janus/plans/plan_consult") @Post("api/janus/plans/plan_consult")
PlanConsultBean sendMessage(@Query("doctor_ids") List<int> doctor_ids, PlanConsultBean sendMessage(@Query("doctor_ids") List<int> doctor_ids,
@Query("question") String question, @Query("plan_id") int plan_id); @Query("question") String question, @Query("plan_id") int plan_id);
@Get("api/janus/plans/rank")
PlanBarBean getPlanBar(@Query("rank_type") String rank_type);
@Get("api/janus/plans/plan_phone_authorize")
DiscussLowPriceModelBean getPopviewData(
@Query("plan_id") String planId,
@Query("hospital_id") String hospitalId,
@Query("doctor_id") String doctorId,
);
@Get("api/janus/plans/agree_phone_authorize")
DiscussLowPriceAuthBean givePhoneAuth(
@Query("lead_phone_request_id") int leadPhoneRequestId);
@Get("api/janus/plans/plan_overview")
PlanOverViewBean getPlanOverView(@Query("plan_id") int plan_id);
} }
lib/ClueModel/server/api/ClueApi.serv.dart
View file @ 21f25c43
...@@ -20,9 +20,12 @@ import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart'; ...@@ -20,9 +20,12 @@ import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanCompareDetail.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanCompareDetail.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanOverviewBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/ConsultQuestionsBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/ConsultQuestionsBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanConsultBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanConsultBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanBarBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceModelBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceAuthBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanOverViewBean.dart';
const bool inProduction = const bool.fromEnvironment("dart.vm.product"); const bool inProduction = const bool.fromEnvironment("dart.vm.product");
...@@ -40,7 +43,7 @@ class ClueApiImpl { ...@@ -40,7 +43,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) {
...@@ -55,7 +58,7 @@ class ClueApiImpl { ...@@ -55,7 +58,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,
...@@ -87,9 +90,9 @@ class ClueApiImpl { ...@@ -87,9 +90,9 @@ class ClueApiImpl {
}); });
} }
Stream<PlanCompareDetail> getPlanCompareDetail(Dio _dio, List<int> plan_ids) { Stream<PlanCompareDetail> getPlanCompareDetail(Dio _dio, List<int> planIds) {
return Stream.fromFuture(get(_dio, 'api/janus/plans/compare', data: { return Stream.fromFuture(get(_dio, 'api/janus/plans/compare', data: {
'plan_ids': plan_ids, 'plan_ids': planIds,
})).flatMap((value) { })).flatMap((value) {
if (value != null && if (value != null &&
(value.statusCode >= 200 && value.statusCode < 300)) { (value.statusCode >= 200 && value.statusCode < 300)) {
...@@ -142,46 +145,93 @@ class ClueApiImpl { ...@@ -142,46 +145,93 @@ class ClueApiImpl {
}); });
} }
Stream<PlanOverviewBean> getPlanOverviewBean(Dio _dio, int plan_id) { Stream<ConsultQuestionsBean> getConsultQuestions(Dio _dio, int plan_id) {
return Stream.fromFuture(get(_dio, '/api/janus/plans/plan_overview', data: { return Stream.fromFuture(
get(_dio, '/api/janus/plans/consult_questions', data: {
'plan_id': plan_id, 'plan_id': plan_id,
})).flatMap((value) { })).flatMap((value) {
if (value != null && if (value != null &&
(value.statusCode >= 200 && value.statusCode < 300)) { (value.statusCode >= 200 && value.statusCode < 300)) {
return Stream.fromFuture( return Stream.fromFuture(
compute(parsePlanOverviewBean, value.toString())); compute(parseConsultQuestionsBean, value.toString()));
} else { } else {
throw Exception("--未知网络错误--"); throw Exception("--未知网络错误--");
} }
}); });
} }
Stream<ConsultQuestionsBean> getConsultQuestions(Dio _dio, int plan_id) { Stream<PlanConsultBean> sendMessage(
return Stream.fromFuture( Dio _dio, List<int> doctor_ids, String question, int plan_id) {
get(_dio, '/api/janus/plans/consult_questions', data: { return Stream.fromFuture(post(_dio, 'api/janus/plans/plan_consult', data: {
'doctor_ids': doctor_ids,
'question': question,
'plan_id': plan_id, 'plan_id': plan_id,
})).flatMap((value) { })).flatMap((value) {
if (value != null && if (value != null &&
(value.statusCode >= 200 && value.statusCode < 300)) { (value.statusCode >= 200 && value.statusCode < 300)) {
return Stream.fromFuture( return Stream.fromFuture(
compute(parseConsultQuestionsBean, value.toString())); compute(parsePlanConsultBean, value.toString()));
} else { } else {
throw Exception("--未知网络错误--"); throw Exception("--未知网络错误--");
} }
}); });
} }
Stream<PlanConsultBean> sendMessage( Stream<PlanBarBean> getPlanBar(Dio _dio, String rank_type) {
Dio _dio, List<int> doctor_ids, String question, int plan_id) { return Stream.fromFuture(get(_dio, 'api/janus/plans/rank', data: {
return Stream.fromFuture(post(_dio, '/api/janus/plans/plan_consult', data: { 'rank_type': rank_type,
'doctor_ids': doctor_ids, })).flatMap((value) {
'question': question, if (value != null &&
(value.statusCode >= 200 && value.statusCode < 300)) {
return Stream.fromFuture(compute(parsePlanBarBean, value.toString()));
} else {
throw Exception("--未知网络错误--");
}
});
}
Stream<DiscussLowPriceModelBean> getPopviewData(
Dio _dio, String planId, String hospitalId, String doctorId) {
return Stream.fromFuture(
get(_dio, 'api/janus/plans/plan_phone_authorize', data: {
'plan_id': planId,
'hospital_id': hospitalId,
'doctor_id': doctorId,
})).flatMap((value) {
if (value != null &&
(value.statusCode >= 200 && value.statusCode < 300)) {
return Stream.fromFuture(
compute(parseDiscussLowPriceModelBean, value.toString()));
} else {
throw Exception("--未知网络错误--");
}
});
}
Stream<DiscussLowPriceAuthBean> givePhoneAuth(
Dio _dio, int leadPhoneRequestId) {
return Stream.fromFuture(
get(_dio, 'api/janus/plans/agree_phone_authorize', data: {
'lead_phone_request_id': leadPhoneRequestId,
})).flatMap((value) {
if (value != null &&
(value.statusCode >= 200 && value.statusCode < 300)) {
return Stream.fromFuture(
compute(parseDiscussLowPriceAuthBean, value.toString()));
} else {
throw Exception("--未知网络错误--");
}
});
}
Stream<PlanOverViewBean> getPlanOverView(Dio _dio, int plan_id) {
return Stream.fromFuture(get(_dio, 'api/janus/plans/plan_overview', data: {
'plan_id': plan_id, 'plan_id': plan_id,
})).flatMap((value) { })).flatMap((value) {
if (value != null && if (value != null &&
(value.statusCode >= 200 && value.statusCode < 300)) { (value.statusCode >= 200 && value.statusCode < 300)) {
return Stream.fromFuture( return Stream.fromFuture(
compute(parsePlanConsultBean, value.toString())); compute(parsePlanOverViewBean, value.toString()));
} else { } else {
throw Exception("--未知网络错误--"); throw Exception("--未知网络错误--");
} }
...@@ -349,10 +399,6 @@ PlanFeedBean parsePlanFeedBean(String value) { ...@@ -349,10 +399,6 @@ PlanFeedBean parsePlanFeedBean(String value) {
return PlanFeedBean.fromJson(json.decode(value)); return PlanFeedBean.fromJson(json.decode(value));
} }
PlanOverviewBean parsePlanOverviewBean(String value) {
return PlanOverviewBean.fromJson(json.decode(value));
}
ConsultQuestionsBean parseConsultQuestionsBean(String value) { ConsultQuestionsBean parseConsultQuestionsBean(String value) {
return ConsultQuestionsBean.fromJson(json.decode(value)); return ConsultQuestionsBean.fromJson(json.decode(value));
} }
...@@ -360,3 +406,19 @@ ConsultQuestionsBean parseConsultQuestionsBean(String value) { ...@@ -360,3 +406,19 @@ ConsultQuestionsBean parseConsultQuestionsBean(String value) {
PlanConsultBean parsePlanConsultBean(String value) { PlanConsultBean parsePlanConsultBean(String value) {
return PlanConsultBean.fromJson(json.decode(value)); return PlanConsultBean.fromJson(json.decode(value));
} }
PlanBarBean parsePlanBarBean(String value) {
return PlanBarBean.fromJson(json.decode(value));
}
DiscussLowPriceModelBean parseDiscussLowPriceModelBean(String value) {
return DiscussLowPriceModelBean.fromJson(json.decode(value));
}
DiscussLowPriceAuthBean parseDiscussLowPriceAuthBean(String value) {
return DiscussLowPriceAuthBean.fromJson(json.decode(value));
}
PlanOverViewBean parsePlanOverViewBean(String value) {
return PlanOverViewBean.fromJson(json.decode(value));
}
lib/ClueModel/server/entity/DiscussLowPriceAuthBean.dart 0 → 100644
View file @ 21f25c43
/*
* @Author: zx
* @Date: 2020-07-04 11:51:02
* @Last Modified by: zx
* @Last Modified time: 2020-07-04 12:52:22
*/
class DiscussLowPriceAuthBean {
int error;
String message;
Null extra;
Null errorExtra;
UserType userType;
Data data;
DiscussLowPriceAuthBean(
{this.error,
this.message,
this.extra,
this.errorExtra,
this.userType,
this.data});
DiscussLowPriceAuthBean.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;
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['error'] = this.error;
data['message'] = this.message;
data['extra'] = this.extra;
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) {}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
return data;
}
}
class Data {
bool success;
Data({this.success});
Data.fromJson(Map<String, dynamic> json) {
success = json['success'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['success'] = this.success;
return data;
}
}
lib/ClueModel/server/entity/DiscussLowPriceModelBean.dart 0 → 100644
View file @ 21f25c43
/*
* @Author: zx
* @Date: 2020-07-03 20:56:15
* @Last Modified by: zx
* @Last Modified time: 2020-07-03 20:57:44
*/
class DiscussLowPriceModelBean {
int error;
String message;
Null extra;
Null errorExtra;
UserType userType;
Data data;
DiscussLowPriceModelBean(
{this.error,
this.message,
this.extra,
this.errorExtra,
this.userType,
this.data});
DiscussLowPriceModelBean.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;
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['error'] = this.error;
data['message'] = this.message;
data['extra'] = this.extra;
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) {}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
return data;
}
}
class Data {
int leadPhoneRequestId;
int authorizeType;
String icon;
String tip;
String title;
String authorizePhone;
Data(
{this.leadPhoneRequestId,
this.authorizeType,
this.icon,
this.tip,
this.title,
this.authorizePhone});
Data.fromJson(Map<String, dynamic> json) {
leadPhoneRequestId = json['lead_phone_request_id'];
authorizeType = json['authorize_type'];
icon = json['icon'];
tip = json['tip'];
title = json['title'];
authorizePhone = json['authorize_phone'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['lead_phone_request_id'] = this.leadPhoneRequestId;
data['authorize_type'] = this.authorizeType;
data['icon'] = this.icon;
data['tip'] = this.tip;
data['title'] = this.title;
data['authorize_phone'] = this.authorizePhone;
return data;
}
}
lib/ClueModel/server/entity/PlanBarBean.dart 0 → 100644
View file @ 21f25c43
/*
* @author lsy
* @date 2020/7/3
**/
class PlanBarBean {
int error;
String message;
Null extra;
Null errorExtra;
UserType userType;
Data data;
PlanBarBean({this.error, this.message, this.extra, this.errorExtra, this.userType, this.data});
PlanBarBean.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;
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['error'] = this.error;
data['message'] = this.message;
data['extra'] = this.extra;
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) {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
return data;
}
}
class Data {
String bannerImage;
List<Tabs> tabs;
Data({this.bannerImage, this.tabs});
Data.fromJson(Map<String, dynamic> json) {
bannerImage = json['banner_image'];
if (json['tabs'] != null) {
tabs = new List<Tabs>();
json['tabs'].forEach((v) { tabs.add(new Tabs.fromJson(v)); });
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['banner_image'] = this.bannerImage;
if (this.tabs != null) {
data['tabs'] = this.tabs.map((v) => v.toJson()).toList();
}
return data;
}
}
class Tabs {
bool selected;
int id;
String name;
Tabs({this.selected, this.id, this.name});
Tabs.fromJson(Map<String, dynamic> json) {
selected = json['selected'];
id = json['id'];
name = json['name'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['selected'] = this.selected;
data['id'] = this.id;
data['name'] = this.name;
return data;
}
}
lib/ClueModel/server/entity/PlanOverViewBean.dart 0 → 100644
View file @ 21f25c43
/*
* @author lsy
* @date 2020/7/3
**/
class PlanOverViewBean {
int error;
String message;
Null extra;
Null errorExtra;
UserType userType;
PlanOverData data;
PlanOverViewBean(
{this.error,
this.message,
this.extra,
this.errorExtra,
this.userType,
this.data});
PlanOverViewBean.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;
data = json['data'] != null ? new PlanOverData.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['error'] = this.error;
data['message'] = this.message;
data['extra'] = this.extra;
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) {}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
return data;
}
}
class PlanOverData {
Banner banner;
String name;
String positiveRate;
String salesCount;
String planDescription;
String guidePrice;
List<OverviewAttrs> overviewAttrs;
List<ExplanationAttrs> explanationAttrs;
List<Tabs> tabs;
PlanOverData(
{this.banner,
this.name,
this.positiveRate,
this.salesCount,
this.planDescription,
this.guidePrice,
this.overviewAttrs,
this.explanationAttrs,
this.tabs});
PlanOverData.fromJson(Map<String, dynamic> json) {
banner =
json['banner'] != null ? new Banner.fromJson(json['banner']) : null;
name = json['name'];
positiveRate = json['positive_rate'];
salesCount = json['sales_count'];
planDescription = json['plan_description'];
guidePrice = json['guide_price'];
if (json['overview_attrs'] != null) {
overviewAttrs = new List<OverviewAttrs>();
json['overview_attrs'].forEach((v) {
overviewAttrs.add(new OverviewAttrs.fromJson(v));
});
}
if (json['explanation_attrs'] != null) {
explanationAttrs = new List<ExplanationAttrs>();
json['explanation_attrs'].forEach((v) {
explanationAttrs.add(new ExplanationAttrs.fromJson(v));
});
}
if (json['tabs'] != null) {
tabs = new List<Tabs>();
json['tabs'].forEach((v) {
tabs.add(new Tabs.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.banner != null) {
data['banner'] = this.banner.toJson();
}
data['name'] = this.name;
data['positive_rate'] = this.positiveRate;
data['sales_count'] = this.salesCount;
data['plan_description'] = this.planDescription;
data['guide_price'] = this.guidePrice;
if (this.overviewAttrs != null) {
data['overview_attrs'] =
this.overviewAttrs.map((v) => v.toJson()).toList();
}
if (this.explanationAttrs != null) {
data['explanation_attrs'] =
this.explanationAttrs.map((v) => v.toJson()).toList();
}
if (this.tabs != null) {
data['tabs'] = this.tabs.map((v) => v.toJson()).toList();
}
return data;
}
}
class Banner {
String type;
String imageUrl;
String videoUrl;
Banner({this.type, this.imageUrl, this.videoUrl});
Banner.fromJson(Map<String, dynamic> json) {
type = json['type'];
imageUrl = json['image_url'];
videoUrl = json['video_url'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['type'] = this.type;
data['image_url'] = this.imageUrl;
data['video_url'] = this.videoUrl;
return data;
}
}
class OverviewAttrs {
int attrId;
String attrName;
String attrValue;
OverviewAttrs({this.attrId, this.attrName, this.attrValue});
OverviewAttrs.fromJson(Map<String, dynamic> json) {
attrId = json['attr_id'];
attrName = json['attr_name'];
attrValue = json['attr_value'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['attr_id'] = this.attrId;
data['attr_name'] = this.attrName;
data['attr_value'] = this.attrValue;
return data;
}
}
class Tabs {
String tabType;
String name;
Tabs({this.tabType, this.name});
Tabs.fromJson(Map<String, dynamic> json) {
tabType = json['tab_type'];
name = json['name'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['tab_type'] = this.tabType;
data['name'] = this.name;
return data;
}
}
class ExplanationAttrs {
int attrId;
String attrName;
String attrValue;
ExplanationAttrs({this.attrId, this.attrName, this.attrValue});
ExplanationAttrs.fromJson(Map<String, dynamic> json) {
attrId = json['attr_id'];
attrName = json['attr_name'];
attrValue = json['attr_value'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['attr_id'] = this.attrId;
data['attr_name'] = this.attrName;
data['attr_value'] = this.attrValue;
return data;
}
}
lib/ClueModel/server/entity/PlanOverviewBean.dart
View file @ 21f25c43
class PlanOverviewBean { /*
* @author lsy
* @date 2020/7/3
**/
class PlanOverViewBean {
int error; int error;
String message; String message;
Null extra; Null extra;
Null errorExtra; Null errorExtra;
UserType userType; UserType userType;
Data data; PlanOverData data;
PlanOverviewBean( PlanOverViewBean(
{this.error, {this.error,
this.message, this.message,
this.extra, this.extra,
...@@ -14,7 +18,7 @@ class PlanOverviewBean { ...@@ -14,7 +18,7 @@ class PlanOverviewBean {
this.userType, this.userType,
this.data}); this.data});
PlanOverviewBean.fromJson(Map<String, dynamic> json) { PlanOverViewBean.fromJson(Map<String, dynamic> json) {
error = json['error']; error = json['error'];
message = json['message']; message = json['message'];
extra = json['extra']; extra = json['extra'];
...@@ -22,7 +26,7 @@ class PlanOverviewBean { ...@@ -22,7 +26,7 @@ class PlanOverviewBean {
userType = json['user_type'] != null userType = json['user_type'] != null
? new UserType.fromJson(json['user_type']) ? new UserType.fromJson(json['user_type'])
: null; : null;
data = json['data'] != null ? new Data.fromJson(json['data']) : null; data = json['data'] != null ? new PlanOverData.fromJson(json['data']) : null;
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
...@@ -52,18 +56,18 @@ class UserType { ...@@ -52,18 +56,18 @@ class UserType {
} }
} }
class Data { class PlanOverData {
Banner banner; Banner banner;
String name; String name;
String positiveRate; String positiveRate;
String salesCount; String salesCount;
String planDescription; String planDescription;
String guidePrice; String guidePrice;
List<OverviewAttrsEntity> overviewAttrs; List<OverviewAttrs> overviewAttrs;
List<ExplanationAttrsEntity> explanationAttrs; List<ExplanationAttrs> explanationAttrs;
List<Tabs> tabs; List<Tabs> tabs;
Data( PlanOverData(
{this.banner, {this.banner,
this.name, this.name,
this.positiveRate, this.positiveRate,
...@@ -74,7 +78,7 @@ class Data { ...@@ -74,7 +78,7 @@ class Data {
this.explanationAttrs, this.explanationAttrs,
this.tabs}); this.tabs});
Data.fromJson(Map<String, dynamic> json) { PlanOverData.fromJson(Map<String, dynamic> json) {
banner = banner =
json['banner'] != null ? new Banner.fromJson(json['banner']) : null; json['banner'] != null ? new Banner.fromJson(json['banner']) : null;
name = json['name']; name = json['name'];
...@@ -83,15 +87,15 @@ class Data { ...@@ -83,15 +87,15 @@ class Data {
planDescription = json['plan_description']; planDescription = json['plan_description'];
guidePrice = json['guide_price']; guidePrice = json['guide_price'];
if (json['overview_attrs'] != null) { if (json['overview_attrs'] != null) {
overviewAttrs = new List<OverviewAttrsEntity>(); overviewAttrs = new List<OverviewAttrs>();
json['overview_attrs'].forEach((v) { json['overview_attrs'].forEach((v) {
overviewAttrs.add(new OverviewAttrsEntity.fromJson(v)); overviewAttrs.add(new OverviewAttrs.fromJson(v));
}); });
} }
if (json['explanation_attrs'] != null) { if (json['explanation_attrs'] != null) {
explanationAttrs = new List<ExplanationAttrsEntity>(); explanationAttrs = new List<ExplanationAttrs>();
json['explanation_attrs'].forEach((v) { json['explanation_attrs'].forEach((v) {
explanationAttrs.add(new ExplanationAttrsEntity.fromJson(v)); explanationAttrs.add(new ExplanationAttrs.fromJson(v));
}); });
} }
if (json['tabs'] != null) { if (json['tabs'] != null) {
...@@ -149,14 +153,14 @@ class Banner { ...@@ -149,14 +153,14 @@ class Banner {
} }
} }
class OverviewAttrsEntity { class OverviewAttrs {
int attrId; int attrId;
String attrName; String attrName;
String attrValue; String attrValue;
OverviewAttrsEntity({this.attrId, this.attrName, this.attrValue}); OverviewAttrs({this.attrId, this.attrName, this.attrValue});
OverviewAttrsEntity.fromJson(Map<String, dynamic> json) { OverviewAttrs.fromJson(Map<String, dynamic> json) {
attrId = json['attr_id']; attrId = json['attr_id'];
attrName = json['attr_name']; attrName = json['attr_name'];
attrValue = json['attr_value']; attrValue = json['attr_value'];
...@@ -171,43 +175,43 @@ class OverviewAttrsEntity { ...@@ -171,43 +175,43 @@ class OverviewAttrsEntity {
} }
} }
class ExplanationAttrsEntity { class Tabs {
int attrId; String tabType;
String attrName; String name;
String attrValue;
ExplanationAttrsEntity({this.attrId, this.attrName, this.attrValue}); Tabs({this.tabType, this.name});
ExplanationAttrsEntity.fromJson(Map<String, dynamic> json) { Tabs.fromJson(Map<String, dynamic> json) {
attrId = json['attr_id']; tabType = json['tab_type'];
attrName = json['attr_name']; name = json['name'];
attrValue = json['attr_value'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['attr_id'] = this.attrId; data['tab_type'] = this.tabType;
data['attr_name'] = this.attrName; data['name'] = this.name;
data['attr_value'] = this.attrValue;
return data; return data;
} }
} }
class Tabs { class ExplanationAttrs {
String tabType; int attrId;
String name; String attrName;
String attrValue;
Tabs({this.tabType, this.name}); ExplanationAttrs({this.attrId, this.attrName, this.attrValue});
Tabs.fromJson(Map<String, dynamic> json) { ExplanationAttrs.fromJson(Map<String, dynamic> json) {
tabType = json['tab_type']; attrId = json['attr_id'];
name = json['name']; attrName = json['attr_name'];
attrValue = json['attr_value'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['tab_type'] = this.tabType; data['attr_id'] = this.attrId;
data['name'] = this.name; data['attr_name'] = this.attrName;
data['attr_value'] = this.attrValue;
return data; return data;
} }
} }
lib/DemoPage.dart
View file @ 21f25c43
...@@ -19,7 +19,6 @@ class DemoState extends State<DemoPage> { ...@@ -19,7 +19,6 @@ class DemoState extends State<DemoPage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
flutterChannel.invokeMethod("method!!!", "wwww");
} }
@override @override
......
lib/MainRouter/MainRouter.dart
View file @ 21f25c43
...@@ -12,4 +12,6 @@ abstract class MainRouter extends RouterBaser { ...@@ -12,4 +12,6 @@ abstract class MainRouter extends RouterBaser {
void init(); void init();
Widget getTestPage(); Widget getTestPage();
void buriedEvent(String name, Map<String, dynamic> map);
} }
lib/MainRouter/MainRouterImpl.dart
View file @ 21f25c43
...@@ -18,4 +18,9 @@ class MainRouterImpl implements MainRouter { ...@@ -18,4 +18,9 @@ class MainRouterImpl implements MainRouter {
Widget getTestPage() { Widget getTestPage() {
return TestPage(); return TestPage();
} }
@override
void buriedEvent(String name, Map<String, dynamic> map) {
MainManager.getInstance().buriedEvent(name, map);
}
} }
lib/MainRouter/manager/MainManager.dart
View file @ 21f25c43
...@@ -4,9 +4,12 @@ ...@@ -4,9 +4,12 @@
**/ **/
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_boost/flutter_boost.dart'; import 'package:flutter_boost/flutter_boost.dart';
import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
class MainManager { class MainManager {
static const EventChannel _channel = EventChannel("flutter_plugin_event"); MethodChannel flutterChannel;
EventChannel flutterEvent;
bool isInit = false;
MainManager._() {} MainManager._() {}
...@@ -20,8 +23,24 @@ class MainManager { ...@@ -20,8 +23,24 @@ class MainManager {
} }
startInit() { startInit() {
_channel.receiveBroadcastStream().listen((data) { if (isInit) {
return;
}
isInit = true;
print("LSY STATEINIT METHOD AND CHANNEL ");
flutterChannel = MethodChannel('gm_method_channel');
flutterEvent = EventChannel('gm_method_event');
flutterEvent.receiveBroadcastStream().listen((data) {
print("LSY FLUTTER EVENT ${data}"); print("LSY FLUTTER EVENT ${data}");
}); });
} }
void buriedEvent(String name, Map<String, dynamic> map) {
if (!isInit) {
return;
}
if (flutterChannel != null) {
flutterChannel.invokeMethod("buried-${name}", map);
}
}
} }
lib/MainRouter/page/test/TestPage.dart
View file @ 21f25c43
...@@ -9,7 +9,7 @@ import 'package:gm_flutter/MainRouter/page/proxy/NetProxyPage.dart'; ...@@ -9,7 +9,7 @@ import 'package:gm_flutter/MainRouter/page/proxy/NetProxyPage.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart'; import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/commonModel/base/BaseState.dart'; import 'package:gm_flutter/commonModel/base/BaseState.dart';
import 'package:gm_flutter/main.mark.dart'; import 'package:gm_flutter/main.mark.dart';
import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart';
import 'TP.dart'; import 'TP.dart';
class TestPage extends StatefulWidget { class TestPage extends StatefulWidget {
...@@ -46,12 +46,15 @@ class TestState extends BaseState<TestPage> { ...@@ -46,12 +46,15 @@ class TestState extends BaseState<TestPage> {
context, RouterCenterImpl().findClueRouter().getProjectDetailsPage()); context, RouterCenterImpl().findClueRouter().getProjectDetailsPage());
})); }));
list.add(listItem("方案对比", () { list.add(listItem("方案对比", () {
JumpUtil.jumpToPageRight(context, RouterCenterImpl().findClueRouter().getPlansCompareFeed()); JumpUtil.jumpToPageRight(
context, RouterCenterImpl().findClueRouter().getPlansCompareFeed());
})); }));
list.add(listItem("榜单", () { list.add(listItem("榜单", () {
JumpUtil.jumpToPageRight(context, RouterCenterImpl().findClueRouter().getTopPage()); JumpUtil.jumpToPageRight(
context, RouterCenterImpl().findClueRouter().getTopPage());
}));
list.add(listItem("弹窗", () {
DiscussLowPricePopView.showPopView(context);
})); }));
return list; return list;
} }
......
lib/commonModel/base/BaseComponent.dart
View file @ 21f25c43
...@@ -8,11 +8,14 @@ import 'package:flutter/gestures.dart'; ...@@ -8,11 +8,14 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:flutter_common/commonModel/eventbus/GlobalEventBus.dart'; import 'package:flutter_common/commonModel/eventbus/GlobalEventBus.dart';
import 'package:flutter_common/commonModel/live/LiveData.dart';
import 'package:flutter_common/commonModel/view/iOSLoading.dart'; import 'package:flutter_common/commonModel/view/iOSLoading.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:gm_flutter/commonModel/GMBase.dart'; import 'package:gm_flutter/commonModel/GMBase.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart'; import 'package:gm_flutter/commonModel/util/DartUtil.dart';
import 'package:gm_flutter/commonModel/view/ImagesAnimation.dart'; import 'package:gm_flutter/commonModel/view/ImagesAnimation.dart';
import 'package:gm_flutter/commonModel/view/baseRefreshIndicator.dart';
import 'package:gm_flutter/commonModel/view/baseTabIndicator.dart'; import 'package:gm_flutter/commonModel/view/baseTabIndicator.dart';
import 'package:lottie/lottie.dart'; import 'package:lottie/lottie.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';
...@@ -141,42 +144,49 @@ Widget loadingItem({bool needBackground = false}) { ...@@ -141,42 +144,49 @@ Widget loadingItem({bool needBackground = false}) {
Widget netErrorItem() {} Widget netErrorItem() {}
Widget errorItem(double width, double height, VoidCallback retry, Widget errorItem(double width, double height, VoidCallback retry,
{String errorText, String retryText}) { {String errorText, String retryText,double paddingTop}) {
return Container( return Container(
width: width, width: width,
height: height, height: height,
color: Colors.white, padding: EdgeInsets.only(top: paddingTop),
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Container( child: Container(
width: 180, width: 180,
height: 315.5, height: 315.5,
margin: EdgeInsets.only(top: 62), margin: EdgeInsets.only(top: 62),
child: Stack( child: Column(
alignment: AlignmentDirectional.center, children: <Widget>[
children: <Widget>[ Container(
Positioned(
left: 0,
top: 0,
child: Container(
width: 180, width: 180,
height: 186.5, height: 186.5,
child: Image.asset("assets/error.png"), child: Stack(
), alignment: AlignmentDirectional.center,
), children: <Widget>[
Positioned( Positioned(
top: 166, left: 0,
child: Container( top: 0,
width: 180, child: Container(
alignment: Alignment.center, width: 180,
child: baseText( height: 186.5,
errorText ?? "原谅我一看到美人就不淡定", 15, Color(0xff666666)), child: Image.asset("assets/error.png"),
),
),
Positioned(
top: 166,
child: Container(
width: 180,
alignment: Alignment.center,
child: baseText(
errorText ?? "原谅我一看到美人就不淡定", 15, Color(0xff666666)),
),
),
],
),
), ),
), Container(
Positioned(
bottom: 60,
child: Container(
width: 150, width: 150,
height: 40, height: 40,
margin: EdgeInsets.only(top: 17),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
gradient: LinearGradient( gradient: LinearGradient(
...@@ -188,12 +198,10 @@ Widget errorItem(double width, double height, VoidCallback retry, ...@@ -188,12 +198,10 @@ Widget errorItem(double width, double height, VoidCallback retry,
).gestureDetector(() { ).gestureDetector(() {
retry(); retry();
}), }),
), Container(
Positioned(
bottom: 0,
child: Container(
width: 150, width: 150,
height: 40, height: 40,
margin: EdgeInsets.only(top: 20),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
border: Border.all(color: Color(0xffFF5963), width: 0.5)), border: Border.all(color: Color(0xffFF5963), width: 0.5)),
...@@ -202,10 +210,8 @@ Widget errorItem(double width, double height, VoidCallback retry, ...@@ -202,10 +210,8 @@ Widget errorItem(double width, double height, VoidCallback retry,
).gestureDetector(() { ).gestureDetector(() {
AppSettings.openWIFISettings(); AppSettings.openWIFISettings();
}), }),
) ],
], )));
),
));
} }
//TODO //TODO
...@@ -289,7 +295,7 @@ Widget baseRefreshView(RefreshController refreshController, ...@@ -289,7 +295,7 @@ Widget baseRefreshView(RefreshController refreshController,
bool pullDown = true, bool pullDown = true,
VoidCallback onLoading, VoidCallback onLoading,
ScrollController scrollController, ScrollController scrollController,
CustomScrollView customScrollView}) { Widget customScrollView}) {
return SmartRefresher( return SmartRefresher(
enablePullDown: pullDown, enablePullDown: pullDown,
enablePullUp: pullUp, enablePullUp: pullUp,
...@@ -307,9 +313,10 @@ Widget baseRefreshView(RefreshController refreshController, ...@@ -307,9 +313,10 @@ Widget baseRefreshView(RefreshController refreshController,
// body = baseText("加载中", 12, Color(0xff545454)); // body = baseText("加载中", 12, Color(0xff545454));
// } else if (mode == LoadStatus.failed) { // } else if (mode == LoadStatus.failed) {
// body = baseText("加载失败", 12, Color(0xff545454)); // body = baseText("加载失败", 12, Color(0xff545454));
// } else if (mode == LoadStatus.noMore) { // } else
// body = baseText("没有更多数据了", 12, Color(0xff545454)); if (mode == LoadStatus.noMore) {
// } body = baseText("没有更多数据了", 12, Color(0xff545454));
}
// else { // else {
// body = Container(); // body = Container();
// } // }
...@@ -370,8 +377,9 @@ Widget normalRefreshHeader() { ...@@ -370,8 +377,9 @@ Widget normalRefreshHeader() {
); );
} }
Widget emptyItem(double width, double height, {String detail}) { Widget emptyItem(double width, double height, {String detail,double paddingTop}) {
return Container( return Container(
padding: EdgeInsets.only(top: paddingTop??0),
width: width, width: width,
height: height, height: height,
color: Colors.white, color: Colors.white,
...@@ -380,20 +388,34 @@ Widget emptyItem(double width, double height, {String detail}) { ...@@ -380,20 +388,34 @@ Widget emptyItem(double width, double height, {String detail}) {
width: 175, width: 175,
height: 188, height: 188,
margin: EdgeInsets.only(top: 62.5), margin: EdgeInsets.only(top: 62.5),
child: Stack( child: Column(
alignment: AlignmentDirectional.bottomCenter, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Container( Container(
width: 175, width: 175,
height: 188, height: 188,
child: Image.asset("assets/empty.png"), child: Stack(
alignment: AlignmentDirectional.bottomCenter,
children: <Widget>[
Container(
width: 175,
height: 188,
child: Image.asset("assets/empty.png"),
),
Positioned(
bottom: 17,
child: baseText(detail ?? "此处太寂寥，转转别处吧", 15, Color(0xff666666)),
)
],
),
), ),
Positioned( Container(
bottom: 17, height:0,
child: baseText(detail ?? "此处太寂寥，转转别处吧", 15, Color(0xff666666)), color: Colors.white,
) )
], ],
), )
), ),
); );
} }
...@@ -422,7 +444,7 @@ Widget baseTabBarItem(String text, ...@@ -422,7 +444,7 @@ Widget baseTabBarItem(String text,
rightPadding = rightPadding ?? 28.0; rightPadding = rightPadding ?? 28.0;
double width = leftPadding + text.length * 16.0 + rightPadding; double width = leftPadding + text.length * 16.0 + rightPadding;
return Container( return Container(
height: 40, height: 40.0,
width: wantWidth ?? width, width: wantWidth ?? width,
alignment: Alignment.center, alignment: Alignment.center,
child: Tab( child: Tab(
...@@ -430,3 +452,77 @@ Widget baseTabBarItem(String text, ...@@ -430,3 +452,77 @@ Widget baseTabBarItem(String text,
), ),
); );
} }
Widget baseSliverAppBar(String url, {double height, double elevation}) {
return SliverAppBar(
pinned: true,
centerTitle: true,
elevation: elevation ?? 0,
expandedHeight: height ?? 200,
automaticallyImplyLeading: false,
flexibleSpace: FlexibleSpaceBar(
background: Image.network(
url ?? '',
fit: BoxFit.cover,
),
),
);
}
Widget baseSliverBack(VoidCallback tap) {
return Positioned(
top: 49,
left: 15,
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: tap,
child: Container(
width: 30,
height: 30,
decoration:
BoxDecoration(color: Color(0x99FFFFFF), shape: BoxShape.circle),
alignment: Alignment.center,
child: Container(
child: Image.asset("assets/left_arrow.png"),
),
)),
);
}
Widget baseSliverTitle(String text, double width, LiveData liveData) {
return Positioned(
top: 57,
child: StreamBuilder(
stream: liveData.stream,
initialData: liveData.data ?? 0.0,
builder: (c, data) {
return Opacity(
opacity: data.data,
child: Container(
alignment: Alignment.center,
width: width,
child: baseText(text, 18, Color(0xff333333)),
),
);
},
),
);
}
Widget baseStateView(double width, double height, LiveData<int> stateLive,
Widget home, VoidCallback retry,{double paddingTop}) {
return StreamBuilder(
stream: stateLive.stream,
initialData: stateLive.data ?? LOADING,
builder: (c, data) {
if (data.data == LOADING) {
return loadingItem();
} else if (data.data == FAIL) {
return errorItem(width, height, retry,paddingTop: paddingTop);
} else if (data.data == EMPTY) {
return emptyItem(width, height,paddingTop: paddingTop);
}
return home;
},
);
}
lib/commonModel/base/BaseUtil.dart
View file @ 21f25c43
...@@ -8,5 +8,4 @@ import 'dart:ui'; ...@@ -8,5 +8,4 @@ import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
const flutterChannel = const MethodChannel('gm_method_channel'); const bool isDebug = !const bool.fromEnvironment("dart.vm.product");
const bool isDebug = ! const bool.fromEnvironment("dart.vm.product");
lib/commonModel/bean/Pair.dart
View file @ 21f25c43
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
const LOADING = 0; const LOADING = 0;
const ENDLOADING = 1; const ENDLOADING = 1;
const FAIL = 2; const FAIL = 2;
const EMPTY = 3;
class Pair<T, S> { class Pair<T, S> {
dynamic first; dynamic first;
......
lib/commonModel/eventbus/SimpleEventBus.dart 0 → 100644
View file @ 21f25c43
/*
* @author lsy
* @date 2020/7/5
**/
import 'package:dio/dio.dart';
class SimpleEventBus{
static SimpleEventBus _eventBus;
SimpleEventBus._();
static SimpleEventBus instance(){
if(_eventBus==null){
_eventBus=SimpleEventBus._();
}
return _eventBus;
}
Map<String,List<Function(String str)>> map=Map();
void resignEvent(String name,Function(String str) func){
if(map[name]==null){
map[name]=[];
}
map[name].add(func);
}
void unResignEvent(String name,Function(String str) func){
if(map[name]==null){
return;
}
map[name].remove(func);
}
void notifyListener(String name,String str){
if(map[name]==null){
return;
}
map[name].forEach((element) {
element(str);
});
}
}
\ No newline at end of file
lib/commonModel/view/baseRefreshIndicator.dart 0 → 100755
View file @ 21f25c43
This diff is collapsed.
lib/main.dart
View file @ 21f25c43
import 'dart:async'; import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_boost/flutter_boost.dart'; import 'package:flutter_boost/flutter_boost.dart';
import 'package:flutter_common/Annotations/anno/RouterCenter.dart'; import 'package:flutter_common/Annotations/anno/RouterCenter.dart';
import 'package:flutter_common/commonModel/util/WindowUtil.dart'; import 'package:flutter_common/commonModel/util/WindowUtil.dart';
import 'package:flutter_screenutil/screenutil.dart';
import 'package:gm_flutter/main.mark.dart'; import 'package:gm_flutter/main.mark.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:gm_flutter/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart'; import 'package:gm_flutter/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart';
...@@ -37,7 +39,6 @@ void main() { ...@@ -37,7 +39,6 @@ void main() {
SharedPreferences.getInstance().then((value) { SharedPreferences.getInstance().then((value) {
sharedPreferences = value; sharedPreferences = value;
}); });
RouterCenterImpl().findMainRouter().init();
}, (Object error, StackTrace stack) { }, (Object error, StackTrace stack) {
//TODO //TODO
print("lsy EEEEEE ${error.toString()} ${stack.toString()}"); print("lsy EEEEEE ${error.toString()} ${stack.toString()}");
...@@ -58,7 +59,7 @@ class MyApp extends State<MyAppWidget> { ...@@ -58,7 +59,7 @@ class MyApp extends State<MyAppWidget> {
super.initState(); super.initState();
FlutterBoost.singleton.registerPageBuilders({ FlutterBoost.singleton.registerPageBuilders({
'demoPage': (pageName, params, _) { 'demoPage': (pageName, params, _) {
return DemoPage(); return RouterCenterImpl().findClueRouter().getLevelOnePage();
}, },
'demoPage1': (pageName, params, _) { 'demoPage1': (pageName, params, _) {
return DemoPage1(); return DemoPage1();
...@@ -67,30 +68,25 @@ class MyApp extends State<MyAppWidget> { ...@@ -67,30 +68,25 @@ class MyApp extends State<MyAppWidget> {
FlutterBoost.singleton FlutterBoost.singleton
.addBoostContainerLifeCycleObserver((state, settings) { .addBoostContainerLifeCycleObserver((state, settings) {
print("LSY ${state}"); print("LSY ${state}");
if (state == ContainerLifeCycle.Init) {
RouterCenterImpl().findMainRouter().init();
}
}); });
// FlutterBoost.singleton.addBoostNavigatorObserver(TestBoostNavigatorObserver()); // FlutterBoost.singleton.addBoostNavigatorObserver(TestBoostNavigatorObserver());
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
WindowUtil.setBarStatus(true); WindowUtil.setBarStatus(false);
return MaterialApp( return MaterialApp(
theme: ThemeData( theme: ThemeData(
primaryColor: Colors.white, primaryColor: Colors.white,
cursorColor: Color(0xff20BDBB), cursorColor: Color(0xff20BDBB),
highlightColor:Colors.transparent, highlightColor: Colors.transparent,
splashColor:Colors.transparent, splashColor: Colors.transparent,
canvasColor: Colors.white), canvasColor: Colors.white),
builder: FlutterBoost.init(postPush: _onRoutePushed), builder: FlutterBoost.init(postPush: _onRoutePushed),
home: isDebug home: Home());
? RouterCenterImpl().findMainRouter().getTestPage()
: Container(
color: Colors.white,
child: Center(
child: loadingItem(),
),
));
} }
void _onRoutePushed( void _onRoutePushed(
...@@ -101,3 +97,23 @@ class MyApp extends State<MyAppWidget> { ...@@ -101,3 +97,23 @@ class MyApp extends State<MyAppWidget> {
Future<dynamic> _, Future<dynamic> _,
) {} ) {}
} }
class Home extends StatefulWidget {
@override
State<StatefulWidget> createState() => HomeState();
}
class HomeState extends State<Home> {
@override
Widget build(BuildContext context) {
ScreenUtil.init(context, width: 375, height: 810);
return isDebug
? RouterCenterImpl().findMainRouter().getTestPage()
: Container(
color: Colors.white,
child: Center(
child: loadingItem(),
),
);
}
}
pubspec.lock
View file @ 21f25c43
...@@ -211,6 +211,13 @@ packages: ...@@ -211,6 +211,13 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.1.1" version: "1.1.1"
extended_nested_scroll_view:
dependency: "direct main"
description:
name: extended_nested_scroll_view
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.0"
file: file:
dependency: transitive dependency: transitive
description: description:
...@@ -255,6 +262,13 @@ packages: ...@@ -255,6 +262,13 @@ packages:
url: "https://github.com/asd451398533/flutter_common.git" url: "https://github.com/asd451398533/flutter_common.git"
source: git source: git
version: "0.0.1" version: "0.0.1"
flutter_screenutil:
dependency: "direct main"
description:
name: flutter_screenutil
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
flutter_svg: flutter_svg:
dependency: transitive dependency: transitive
description: description:
...@@ -738,7 +752,7 @@ packages: ...@@ -738,7 +752,7 @@ packages:
name: uuid name: uuid
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.0" version: "2.2.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
...@@ -783,4 +797,4 @@ packages: ...@@ -783,4 +797,4 @@ packages:
version: "2.2.1" version: "2.2.1"
sdks: sdks:
dart: ">=2.8.0 <3.0.0" dart: ">=2.8.0 <3.0.0"
flutter: ">=1.12.13+hotfix.5 <2.0.0" flutter: ">=1.17.0 <2.0.0"
pubspec.yaml
View file @ 21f25c43
...@@ -33,6 +33,9 @@ dependencies: ...@@ -33,6 +33,9 @@ dependencies:
shared_preferences: ^0.5.7+1 shared_preferences: ^0.5.7+1
lottie: ^0.4.0+1 lottie: ^0.4.0+1
app_settings: ^4.0.1+1 app_settings: ^4.0.1+1
extended_nested_scroll_view: ^1.0.0
#适配库
flutter_screenutil: ^1.1.0
dev_dependencies: dev_dependencies:
......
updateAar.sh 0 → 100755
View file @ 21f25c43
#!/usr/bin/env bash
echo START
projectDir=`pwd`
rootFlutter=`which flutter`
rootDir=${rootFlutter%/*}
#====clean
cd ${projectDir}
${rootFlutter} clean
export PUB_HOSTED_URL=https://pub.flutter-io.cn
export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn
${rootFlutter} packages get
rm -rf ${projectDir}/build
flutter build aar --release --target-platform android-arm
#rm -rf /Users/apple/lsy/gengmei_android/gm-flutter/libs/flutterApp.aar
cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/apple/lsy/gengmei_android/gm-flutter/libs/flutterApp.aar
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