smartfarm
/
mobile-app
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

fix Bug #7754 reload list action

master
daivph 5 years ago
parent
22e0483874
commit
d8bf400cd5
3 changed files with 116 additions and 166 deletions
Split View Show Diff Stats
  1. +1
    -1
      ios/Flutter/.last_build_id
  2. +6
    -1
      lib/presentation/screens/plot_detail/bloc/plot_detail_bloc.dart
  3. +109
    -164
      lib/presentation/screens/plot_detail/sc_plot_action.dart

+ 1
- 1
ios/Flutter/.last_build_id View File

@@ -1 +1 @@
dab672e712362fdbbfa98386624f95d6
48197743e3d78b3769f70bac9a76e7e0

+ 6
- 1
lib/presentation/screens/plot_detail/bloc/plot_detail_bloc.dart View File

@@ -86,8 +86,13 @@ class PlotDetailBloc extends Bloc<PlotDetailEvent, PlotDetailState> {
response = await repository.getPlotDetailByCode(event.cropCode,
page: 0, size: pageSize);
}
var listActivities = List<Activities>();
CropPlot cropPlot = response as CropPlot;
cropPlot.activities.forEach((element) {
listActivities.add(Activities.clone(element));
});
yield PlotDetailSuccess(
items: response.activities,
items: listActivities,
page: 0,
hasReachedMax:
response.activities.length < pageSize ? true : false);

+ 109
- 164
lib/presentation/screens/plot_detail/sc_plot_action.dart View File

@@ -37,16 +37,21 @@ class PlotActionScreen extends StatefulWidget {
class _PlotActionScreenState extends State<PlotActionScreen> {
List<ActionType> actions = new List<ActionType>();
ScrollController _scrollController;
var changeToRefresh = Get.put(ChangeToRefreshLists());
var blocPlotDetail = PlotDetailBloc(repository: Repository());

@override
void initState() {
super.initState();
changeToRefresh.initValue();
_scrollController = ScrollController()..addListener(() => setState(() {}));
_initActionButtons();
}

@override
void dispose() {
blocPlotDetail.close();
super.dispose();
}

_initActionButtons() {
//type: 0- Trồng, 1- ướm
if (widget.cropType == 1) {
@@ -111,48 +116,49 @@ class _PlotActionScreenState extends State<PlotActionScreen> {
}

Widget _createActionButtons(ActionType actionType, BuildContext _context) {
return BlocProvider<PlotDetailBloc>(
create: (context) => PlotDetailBloc(repository: Repository()),
child: GestureDetector(
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(
builder: (context) => actionType.listScreen))
.then((value) {
if (1 == 1) {
try {
//TODO: refresh list
} catch (e) {
print(e.toString());
}
}
});
},
child: Container(
margin: EdgeInsets.all(2.5),
decoration: BoxDecoration(
color: COLOR_CONST.WHITE,
borderRadius: BorderRadius.all(Radius.circular(4.0)),
boxShadow: <BoxShadow>[
BoxShadow(
color: COLOR_CONST.GRAY1.withOpacity(0.2),
offset: Offset(1.1, 1.1),
blurRadius: 4.0),
],
),
child: Align(
alignment: Alignment.center,
child: Text(
actionType.actionName,
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 11,
color: COLOR_CONST.BLACK2,
),
)),
)),
);
return BlocBuilder<PlotDetailBloc, PlotDetailState>(
cubit: blocPlotDetail,
builder: (context, state) {
return GestureDetector(
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(
builder: (context) => actionType.listScreen))
.then((value) {
if (value != null) {
try {
blocPlotDetail.add(OnRefresh(cropId: widget.cropId));
} catch (e) {
print(e);
}
}
});
},
child: Container(
margin: EdgeInsets.all(2.5),
decoration: BoxDecoration(
color: COLOR_CONST.WHITE,
borderRadius: BorderRadius.all(Radius.circular(4.0)),
boxShadow: <BoxShadow>[
BoxShadow(
color: COLOR_CONST.GRAY1.withOpacity(0.2),
offset: Offset(1.1, 1.1),
blurRadius: 4.0),
],
),
child: Align(
alignment: Alignment.center,
child: Text(
actionType.actionName,
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 11,
color: COLOR_CONST.BLACK2,
),
)),
));
});
}

bool _showTitle(BuildContext context) {
@@ -163,67 +169,53 @@ class _PlotActionScreenState extends State<PlotActionScreen> {

@override
Widget build(BuildContext context) {
return NestedScrollView(
controller: _scrollController,
headerSliverBuilder: (context, innerBoxScrolled) => [
SliverAppBar(
floating: false,
pinned: false,
backgroundColor: Colors.white,
leading: Container(),
title: null,
// title: _showTitle(context) ? Text(plot_detail_title) : null,
//Height flexibleSpace : WidthScreen /2 * 4/16 * 5(row) + 8(space) *3
expandedHeight: MediaQuery.of(context).size.width * 0.625 + 24,
flexibleSpace: _showTitle(context)
? null
: BlocProvider<PlotDetailBloc>(
create: (context) => PlotDetailBloc(repository: Repository()),
child: BlocBuilder<PlotDetailBloc, PlotDetailState>(
builder: (contextB, state) {
return FlexibleSpaceBar(
centerTitle: true,
title: GridView.count(
shrinkWrap: true,
crossAxisCount: 2,
childAspectRatio: 16 / 4,
children: actions.map(
(item) {
return _createActionButtons(item, contextB);
},
).toList()),
);
}),
),
),
],
body: BlocProvider(
create: (context) => PlotDetailBloc(repository: Repository())
..add(DataFetched(cropId: widget.cropId, cropCode: widget.cropCode)),
child: HoldInfinityWidget(
cropId: widget.cropId,
cropCode: widget.cropCode,
parentScroll: _scrollController,
),
),
);
}
}

class HoldInfinityWidget extends StatelessWidget {
int cropId;
String cropCode;
ScrollController parentScroll;
HoldInfinityWidget({this.cropId, this.cropCode, @required this.parentScroll});
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
@override
Widget build(BuildContext context) {
return Scaffold(
key: _scaffoldKey,
body: InfinityView(
cropId: cropId,
parentScroll: parentScroll,
));
return BlocBuilder<PlotDetailBloc, PlotDetailState>(
cubit: blocPlotDetail,
builder: (context, state) {
return NestedScrollView(
controller: _scrollController,
headerSliverBuilder: (context, innerBoxScrolled) => [
SliverAppBar(
floating: false,
pinned: false,
backgroundColor: Colors.white,
leading: Container(),
title: null,
// title: _showTitle(context) ? Text(plot_detail_title) : null,
//Height flexibleSpace : WidthScreen /2 * 4/16 * 5(row) + 8(space) *3
expandedHeight:
MediaQuery.of(context).size.width * 0.625 + 24,
flexibleSpace: _showTitle(context)
? null
: BlocBuilder<PlotDetailBloc, PlotDetailState>(
cubit: blocPlotDetail,
builder: (contextB, state) {
return FlexibleSpaceBar(
centerTitle: true,
title: GridView.count(
shrinkWrap: true,
crossAxisCount: 2,
childAspectRatio: 16 / 4,
children: actions.map(
(item) {
return _createActionButtons(
item, contextB);
},
).toList()),
);
})),
],
body: BlocBuilder<PlotDetailBloc, PlotDetailState>(
cubit: blocPlotDetail,
builder: (context, state) {
return InfinityView(
cropId: widget.cropId,
parentScroll: _scrollController,
plotDetailBloc: blocPlotDetail,
);
}),
);
});
}
}

@@ -231,7 +223,12 @@ class InfinityView extends StatefulWidget {
int cropId;
String cropCode;
ScrollController parentScroll;
InfinityView({this.cropId, this.cropCode, @required this.parentScroll});
PlotDetailBloc plotDetailBloc;
InfinityView(
{this.cropId,
this.cropCode,
@required this.parentScroll,
@required this.plotDetailBloc});
@override
_InfinityViewState createState() => _InfinityViewState();
}
@@ -239,27 +236,27 @@ class InfinityView extends StatefulWidget {
class _InfinityViewState extends State<InfinityView> {
final _scrollController = ScrollController();
final _scrollThreshold = 250.0;
PlotDetailBloc _plotDetailBloc;
var a = Get.put(ChangeToRefreshLists());
var heightOfActionButton = Get.width * 0.625 + 24;

@override
void initState() {
widget.plotDetailBloc
.add(DataFetched(cropId: widget.cropId, cropCode: widget.cropCode));
_scrollController.addListener(() {
final maxScroll = _scrollController.position.maxScrollExtent;
final currentScroll = _scrollController.position.pixels;
if (maxScroll - currentScroll < _scrollThreshold) {
_plotDetailBloc
widget.plotDetailBloc
.add(DataFetched(cropId: widget.cropId, cropCode: widget.cropCode));
}
});
_plotDetailBloc = BlocProvider.of<PlotDetailBloc>(context);
super.initState();
}

@override
Widget build(BuildContext context) {
return BlocBuilder<PlotDetailBloc, PlotDetailState>(
cubit: widget.plotDetailBloc,
builder: (context, state) {
if (state is PlotDetailFailure) {
return Center(child: Text(state.errorString));
@@ -269,8 +266,6 @@ class _InfinityViewState extends State<InfinityView> {
return Center(child: Text(label_list_empty));
}
List<Activities> currentItems = List<Activities>.from(state.items);
Get.find<ChangeToRefreshLists>()
.updateValue(currentItems, state.page, state.hasReachedMax);
return RefreshIndicator(
child: Column(
children: [
@@ -334,7 +329,7 @@ class _InfinityViewState extends State<InfinityView> {
],
),
onRefresh: () async {
_plotDetailBloc.add(OnRefresh(
widget.plotDetailBloc.add(OnRefresh(
cropId: widget.cropId, cropCode: widget.cropCode));
});
}
@@ -373,8 +368,6 @@ class ItemInfinityWidget extends StatelessWidget {
child: ListTile(
title: Text(item.activityTypeDescription ?? ''),
subtitle: Text(item.executeDate.format_DDMMYY_HHmm()),
//TODO: remove when release
// trailing: Text(item.id.toString()),
),
),
onTap: () {
@@ -383,34 +376,7 @@ class ItemInfinityWidget extends StatelessWidget {
cropId: item.cropId,
activityId: item.id,
isEdit: true,
)).then((value) {
if (value != null) {
try {
//TODO: refresh when edit activity
// BlocProvider.of<PlotDetailBloc>(context)
// .add(OnRefresh(cropId: item.cropId));
// var updatedItem = Activities.fromJson(value);

// List<Activities> updatedItems = new List<Activities>();
// currentItems.forEach((e) {
// if (e.id == updatedItem.id) {
// e.executeDate = updatedItem.executeDate;
// } else {
// //
// }
// updatedItems.add(Activities.clone(e));
// });

// BlocProvider.of<PlotDetailBloc>(context).add(
// OnUpdate<Activities>(
// currentItems: updatedItems,
// currentPage: currentPage,
// hasReachedMax: currentReachedMax));
} catch (e) {
print(e.toString());
}
}
});
));
} else if (item.activityTypeName == "ACTIVE_TYPE_STATUS_CROP") {
Get.to(EditActionCropStatusScreen(
cropId: item.cropId,
@@ -485,7 +451,6 @@ class ItemInfinityWidget extends StatelessWidget {
isEdit: true,
));
} else {
//TODO: Check other types
Get.to(EditActionOtherScreen(
cropId: item.cropId,
activityId: item.id,
@@ -504,23 +469,3 @@ class ActionType {
this.listScreen = listScreen;
}
}

class ChangeToRefreshLists extends GetxController {
List<Activities> currentItems;
int currentPage;
bool currentReachedMax;

void initValue() {
currentItems = List<Activities>();
currentPage = 0;
currentReachedMax = true;
update();
}

void updateValue(List<Activities> updateItems, int page, bool reachedMax) {
currentItems = updateItems;
currentPage = page;
currentReachedMax = reachedMax;
update();
}
}

Write Preview
Loading…
Cancel
Save