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

fix null safety

Browse Source
This commit is contained in:
sainw
2021-09-11 16:56:20 +06:30
parent a4d3777e8a
commit fe799ad820
32 changed files with 125 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/pages/package/model/package_model.dart
View File

@@ -16,9 +16,9 @@ import 'package:path/path.dart' as Path;
class PackageModel extends BaseModel {
final log = Logger('PackageModel');
late PaginatorListener<Package> packages;
late PaginatorListener<Package> customerPackages;
late PaginatorListener<Package> activePackages;
PaginatorListener<Package>? packages;
PaginatorListener<Package>? customerPackages;
PaginatorListener<Package>? activePackages;
bool isLoading = false;
int _menuSelectedIndex = 1;
@@ -63,9 +63,9 @@ class PackageModel extends BaseModel {
@override
logout() async {
if (customerPackages != null) customerPackages.close();
if (packages != null) packages.close();
if (activePackages != null) activePackages.close();
if (customerPackages != null) customerPackages!.close();
if (packages != null) packages!.close();
if (activePackages != null) activePackages!.close();
}
Future<void> _loadPackages(bool isDelivered) async {
@@ -84,7 +84,7 @@ class PackageModel extends BaseModel {
.where("is_delivered", isEqualTo: isDelivered);
pageQuery = pageQuery.orderBy("update_time", descending: true);
packages.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
packages!.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) {
log.warning("Error!! $e");
}
@@ -105,8 +105,8 @@ class PackageModel extends BaseModel {
.where("user_id", isEqualTo: user!.id)
.orderBy("update_time", descending: true);
customerPackages.refresh(
listeningQuery: listenerQuery, pageQuery: pageQuery);
customerPackages!
.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) {
log.warning("Error!! $e");
}
@@ -128,8 +128,8 @@ class PackageModel extends BaseModel {
.where("is_delivered", isEqualTo: false);
pageQuery = pageQuery.orderBy("update_time", descending: true);
activePackages.refresh(
listeningQuery: listenerQuery, pageQuery: pageQuery);
activePackages!
.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) {
log.warning("Error!! $e");
}
@@ -163,8 +163,7 @@ class PackageModel extends BaseModel {
.get(const GetOptions(source: Source.server));
if (snaps.docs.length == 1) {
var snap = snaps.docs[0];
var package =
Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
var package = Package.fromMap(snap.data(), snap.id);
return package;
}
} catch (e) {