Skip to content

G
gm_flutter
Commit 26f0dd26 authored by 林生雨's avatar 林生雨
Browse files
Options

commit

parent 42ecd946
Hide whitespace changes
Inline Side-by-side
Showing with 500 additions and 88 deletions
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ 26f0dd26
......@@ -4,7 +4,6 @@
**/
import 'dart:math';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
......@@ -205,27 +204,9 @@ class LevelOneState extends BaseState<LevelOnePage>
},
),
),
Positioned(
top: 49,
left: 15,
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
//TODO
print("TAP");
Navigator.pop(context);
},
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"),
),
)),
)
baseSliverBack(() {
Navigator.of(context).pop();
})
],
),
),
......
lib/ClueModel/page/top/TopList.dart 0 → 100644
View file @ 26f0dd26
/*
* @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: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> {
RefreshController refreshController = RefreshController();
TopListModel _model = TopListModel();
@override
void initState() {
super.initState();
_model.getData(true);
print("${this} INIT");
}
@override
void dispose() {
refreshController.dispose();
_model.dispose();
print("${this} QUIT");
super.dispose();
}
@override
Widget build(BuildContext 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>[
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
StreamBuilder<List<Plans>>(
stream: _model.datasLive.stream,
initialData: _model.datas ?? [],
builder: (c, data) {
print("LLDATA ${data.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 -
widget.topHeight -
100 * _model.datas.length;
return SliverToBoxAdapter(
child: Container(
height: height < 0 ? 0 : height,
),
);
},
),
],
), onLoading: () {
_model.loadMore();
}, pullDown: false, pullUp: true);
}
}
lib/ClueModel/page/top/TopListModel.dart 0 → 100644
View file @ 26f0dd26
/*
* @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 @ 26f0dd26
......@@ -4,13 +4,32 @@
**/
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/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 {
int tabIndex = 0;
List<String> tabs = ["全部", "眼部", "自体脂肪", "轮廓骨骼"];
List<Tabs> tabs = [];
LiveData<String> titleLive = new LiveData();
LiveData<String> imageLive = LiveData();
LiveData<int> stateLive = LiveData();
RxDispose rxDispose = RxDispose();
String rank_type;
String imageUrl;
@override
void dispose() {}
void dispose() {
rxDispose.dispose();
titleLive.dispost();
imageLive.dispost();
stateLive.dispost();
}
void selectTab(int index) {
if (tabIndex == index) {
......@@ -18,4 +37,25 @@ class TopModel extends BaseModel {
}
tabIndex = index;
}
void init(Function(int size) 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(tabs.length);
} 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 @ 26f0dd26
......@@ -2,15 +2,20 @@
* @author lsy
* @date 2020/7/2
**/
import 'dart:ui';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:gm_flutter/ClueModel/page/levelTwo/LevelTwoPage.dart';
import 'package:gm_flutter/ClueModel/page/top/TopModel.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/commonModel/base/BaseState.dart';
import 'package:gm_flutter/commonModel/view/baseTabIndicator.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'TopList.dart';
class TopPage extends StatefulWidget {
@override
State<StatefulWidget> createState() => TopPageState();
......@@ -23,12 +28,20 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
@override
void initState() {
tabController = TabController(length: 4, vsync: this);
init();
super.initState();
}
void init() {
_model.init((i) {
tabController = TabController(length: i, vsync: this);
setState(() {});
});
}
@override
void dispose() {
_model.dispose();
refreshController.dispose();
super.dispose();
}
......@@ -36,63 +49,73 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
@override
Widget buildItem(BuildContext context) {
return Scaffold(
body: home(),
body: baseStateView(
MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height,
_model.stateLive,
Stack(
children: <Widget>[
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
child: NotificationListener(
onNotification: (scrollNotification) {
if (scrollNotification is ScrollUpdateNotification &&
scrollNotification.metrics.axisDirection.index == 2) {
print("${scrollNotification}");
}
return false;
},
child: home(),
),
),
baseSliverBack(() {
Navigator.of(context).pop();
}),
baseSliverTitle("title", MediaQuery.of(context).size.width),
],
), () {
init();
}),
);
}
Widget home() {
return baseRefreshView(refreshController, () {}, null, null,
customScrollView: CustomScrollView(slivers: <Widget>[
SliverAppBar(
pinned: true,
elevation: 0,
expandedHeight: 0,
flexibleSpace: FlexibleSpaceBar(title: Text('二级方案')),
),
SliverToBoxAdapter(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: <Widget>[
Container(
height: 50,
color: Colors.pink,
)
],
)),
SliverPersistentHeader(
pinned: true,
delegate: StickyTabBarDelegate(
child: Container(
height: 40,
color: Colors.white,
child: baseTabBar(tabController, getTabs(), (index) {
_model.selectTab(index);
}),
)),
),
SliverFillRemaining(
child: TabBarView(controller: tabController, children: <Widget>[
Container(
color: Colors.red,
),
Container(
color: Colors.red,
),
Container(
color: Colors.red,
),
Container(
color: Colors.blue,
)
]))
]));
List<Widget> list = [];
var d = MediaQueryData.fromWindow(window).padding.top;
for (int i = 0; i < _model.tabs.length; i++) {
list.add(TopList(_model.tabs[i].id, 48 +d).toActive());
}
return DefaultTabController(
length: _model.tabs.length,
child: NestedScrollView(
headerSliverBuilder:
(BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(
context),
sliver: baseSliverAppBar(_model.imageUrl)),
SliverPersistentHeader(
pinned: true,
delegate: StickyTabBarDelegate(
child: Container(
height: 40,
color: Colors.white,
child: baseTabBar(null, getTabs(), (index) {
_model.selectTab(index);
}),
)),
),
];
},
body: TabBarView(children: list)));
}
List<Widget> getTabs() {
List<Widget> list = [];
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,
rightPadding: i == _model.tabs.length - 1 ? 24 : 28));
}
......
lib/ClueModel/server/api/ClueApi.dart
View file @ 26f0dd26
......@@ -6,11 +6,13 @@ import 'package:flutter_common/Annotations/anno/Get.dart';
import 'package:flutter_common/Annotations/anno/Query.dart';
import 'package:flutter_common/Annotations/anno/ServiceCenter.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/PlansCompareFeed.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/PlanFeedBean.dart';
@ServiceCenter()
abstract class ClueApi {
@Get("/api/janus/plans/plan_detail")
......@@ -32,12 +34,15 @@ abstract class ClueApi {
@Get("api/janus/plans/feed")
PlanFeedBean getPlanFeed(
@Query("tag_id")String tag_id,
@Query("order_by")String order_by,
@Query("current_city_id")String current_city_id,
@Query("min_price")String min_price,
@Query("max_price")String max_price,
@Query("rank_type")String rank_type,
@Query("page")int page,
);
@Query("tag_id") String tag_id,
@Query("order_by") String order_by,
@Query("current_city_id") String current_city_id,
@Query("min_price") String min_price,
@Query("max_price") String max_price,
@Query("rank_type") String rank_type,
@Query("page") int page,
);
@Get("api/janus/plans/rank")
PlanBarBean getPlanBar(@Query("rank_type") String rank_type);
}
lib/ClueModel/server/api/ClueApi.serv.dart
View file @ 26f0dd26
......@@ -20,6 +20,7 @@ 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/PlanBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanBarBean.dart';
const bool inProduction = const bool.fromEnvironment("dart.vm.product");
......@@ -139,6 +140,19 @@ class ClueApiImpl {
});
}
Stream<PlanBarBean> getPlanBar(Dio _dio, String rank_type) {
return Stream.fromFuture(get(_dio, 'api/janus/plans/rank', data: {
'rank_type': rank_type,
})).flatMap((value) {
if (value != null &&
(value.statusCode >= 200 && value.statusCode < 300)) {
return Stream.fromFuture(compute(parsePlanBarBean, value.toString()));
} else {
throw Exception("--未知网络错误--");
}
});
}
///==================base method==================
Future<Response> get(Dio _dio, url, {data, options, cancelToken}) async {
......@@ -299,3 +313,7 @@ PlanBean parsePlanBean(String value) {
PlanFeedBean parsePlanFeedBean(String value) {
return PlanFeedBean.fromJson(json.decode(value));
}
PlanBarBean parsePlanBarBean(String value) {
return PlanBarBean.fromJson(json.decode(value));
}
lib/ClueModel/server/entity/PlanBarBean.dart 0 → 100644
View file @ 26f0dd26
/*
* @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/commonModel/base/BaseComponent.dart
View file @ 26f0dd26
......@@ -8,9 +8,11 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.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_svg/svg.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/view/ImagesAnimation.dart';
import 'package:gm_flutter/commonModel/view/baseTabIndicator.dart';
......@@ -289,7 +291,7 @@ Widget baseRefreshView(RefreshController refreshController,
bool pullDown = true,
VoidCallback onLoading,
ScrollController scrollController,
CustomScrollView customScrollView}) {
Widget customScrollView}) {
return SmartRefresher(
enablePullDown: pullDown,
enablePullUp: pullUp,
......@@ -307,9 +309,10 @@ Widget baseRefreshView(RefreshController refreshController,
// body = baseText("加载中", 12, Color(0xff545454));
// } else if (mode == LoadStatus.failed) {
// body = baseText("加载失败", 12, Color(0xff545454));
// } else if (mode == LoadStatus.noMore) {
// body = baseText("没有更多数据了", 12, Color(0xff545454));
// }
// } else
if (mode == LoadStatus.noMore) {
body = baseText("没有更多数据了", 12, Color(0xff545454));
}
// else {
// body = Container();
// }
......@@ -422,7 +425,7 @@ Widget baseTabBarItem(String text,
rightPadding = rightPadding ?? 28.0;
double width = leftPadding + text.length * 16.0 + rightPadding;
return Container(
height: 40,
height: 40.0,
width: wantWidth ?? width,
alignment: Alignment.center,
child: Tab(
......@@ -430,3 +433,68 @@ 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) {
return Positioned(
top: 57,
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) {
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);
} else if (data.data == EMPTY) {
return emptyItem(width, height);
}
return home;
},
);
}
lib/commonModel/bean/Pair.dart
View file @ 26f0dd26
......@@ -5,6 +5,7 @@
const LOADING = 0;
const ENDLOADING = 1;
const FAIL = 2;
const EMPTY = 3;
class Pair<T, S> {
dynamic first;
......
pubspec.lock
View file @ 26f0dd26
......@@ -211,6 +211,13 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
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:
dependency: transitive
description:
......@@ -783,4 +790,4 @@ packages:
version: "2.2.1"
sdks:
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 @ 26f0dd26
......@@ -33,6 +33,7 @@ dependencies:
shared_preferences: ^0.5.7+1
lottie: ^0.4.0+1
app_settings: ^4.0.1+1
extended_nested_scroll_view: ^1.0.0
dev_dependencies:
......
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