sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ptd/master'

Browse Source
This commit is contained in:
tzw
2021-09-13 08:47:01 +06:30
parent 086c09f522 a102369daf
commit a6617ae7e2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/pages/fcs_shipment/model/fcs_shipment_model.dart
View File

@@ -15,9 +15,9 @@ class FcsShipmentModel extends BaseModel {
List<FcsShipment> _fcsShipments = [];
List<FcsShipment> get fcsShipments => _selectedIndex == 1
? _fcsShipments
: List<FcsShipment>.from(_shipped.values);
: List<FcsShipment>.from(_shipped!.values);
late Paginator _shipped;
Paginator? _shipped;
bool isLoading = false;
int _selectedIndex = 1;
set selectedIndex(int index) {
@@ -37,9 +37,9 @@ class FcsShipmentModel extends BaseModel {
_selectedIndex = 1;
_loadFcsShipments();
if (_shipped != null) _shipped.close();
if (_shipped != null) _shipped!.close();
_shipped = _getShipped();
_shipped.load();
_shipped!.load();
}
Future<void> _loadFcsShipments() async {
@@ -84,10 +84,10 @@ class FcsShipmentModel extends BaseModel {
}
Future<void> loadMore() async {
if (_shipped.ended || _selectedIndex == 1) return;
if (_shipped!.ended || _selectedIndex == 1) return;
isLoading = true;
notifyListeners();
await _shipped.load(onFinished: () {
await _shipped!.load(onFinished: () {
isLoading = false;
notifyListeners();
});
@@ -95,7 +95,7 @@ class FcsShipmentModel extends BaseModel {
Future<void> refresh() async {
if (_selectedIndex == 1) return;
await _shipped.refresh(onFinished: () {
await _shipped!.refresh(onFinished: () {
notifyListeners();
});
}
@@ -158,7 +158,7 @@ class FcsShipmentModel extends BaseModel {
@override
logout() async {
if (listener != null) await listener!.cancel();
if (_shipped != null) _shipped.close();
if (_shipped != null) _shipped!.close();
_fcsShipments = [];
}