build app v1.1.1

android/app/release/output-metadata.json

@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "vn.azteam.farmdemo",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "properties": [],
-      "versionCode": 6,
-      "versionName": "1.1.1",
-      "enabled": true,
-      "outputFile": "app-release.apk"
-    }
-  ]
-}

ios/Flutter/.last_build_id

@@ -1 +1 @@
-d91c957b2422e26116533c8dae89710a
+64f9f50cc502d50e4ed31a042f189058

ios/Podfile.lock

@@ -224,7 +224,7 @@ SPEC CHECKSUMS:
   FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
   FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
   FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   flutter_image_compress: 082f8daaf6c1b0c9fe798251c750ef0ecd98d7ae
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833

ios/Runner.xcodeproj/project.pbxproj

@@ -361,7 +361,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = C3DTD2JH94;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -377,7 +377,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -500,7 +500,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = C3DTD2JH94;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -516,7 +516,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -533,7 +533,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = C3DTD2JH94;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -549,7 +549,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

lib/custom_model/account.dart

@@ -1,27 +1,19 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'account.g.dart';
-
-@JsonSerializable()
 class Account {
-  Account();
-
-  num id;
+  int id;
   String login;
   String firstName;
   String lastName;
-  String midleName;
   String fullName;
   String phone;
+  String birthDay;
+  String gender;
+  String userId;
+  int roleId;
+  String roleName;
+  int customerId;
+  String customerName;
+  int addressId;
   String address;
-  String avartar;
-  num vaiTroId;
-  String tenVaiTro;
-  num donViCanhTacId;
-  String tenDonVi;
-  String email;
-  String imageUrl;
-  bool activated;
   int countryId;
   String countryName;
   int cityId;
@@ -30,9 +22,107 @@ class Account {
   String districtName;
   int wardId;
   String wardName;
-  List authorities;
+  String fcmToken;
+  String email;
+  String imageUrl;
+  bool activated;
+  String langKey;
+  List<String> authorities;
+
+  Account(
+      {this.id,
+      this.login,
+      this.firstName,
+      this.lastName,
+      this.fullName,
+      this.phone,
+      this.birthDay,
+      this.gender,
+      this.userId,
+      this.roleId,
+      this.roleName,
+      this.customerId,
+      this.customerName,
+      this.addressId,
+      this.address,
+      this.countryId,
+      this.countryName,
+      this.cityId,
+      this.cityName,
+      this.districtId,
+      this.districtName,
+      this.wardId,
+      this.wardName,
+      this.fcmToken,
+      this.email,
+      this.imageUrl,
+      this.activated,
+      this.langKey,
+      this.authorities});
+
+  Account.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    login = json['login'];
+    firstName = json['firstName'];
+    lastName = json['lastName'];
+    fullName = json['fullName'];
+    phone = json['phone'];
+    birthDay = json['birthDay'];
+    gender = json['gender'];
+    userId = json['userId'];
+    roleId = json['roleId'];
+    roleName = json['roleName'];
+    customerId = json['customerId'];
+    customerName = json['customerName'];
+    addressId = json['addressId'];
+    address = json['address'];
+    countryId = json['countryId'];
+    countryName = json['countryName'];
+    cityId = json['cityId'];
+    cityName = json['cityName'];
+    districtId = json['districtId'];
+    districtName = json['districtName'];
+    wardId = json['wardId'];
+    wardName = json['wardName'];
+    fcmToken = json['fcmToken'];
+    email = json['email'];
+    imageUrl = json['imageUrl'];
+    activated = json['activated'];
+    langKey = json['langKey'];
+    authorities = json['authorities'].cast<String>();
+  }
 
-  factory Account.fromJson(Map<String, dynamic> json) =>
-      _$AccountFromJson(json);
-  Map<String, dynamic> toJson() => _$AccountToJson(this);
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['id'] = this.id;
+    data['login'] = this.login;
+    data['firstName'] = this.firstName;
+    data['lastName'] = this.lastName;
+    data['fullName'] = this.fullName;
+    data['phone'] = this.phone;
+    data['birthDay'] = this.birthDay;
+    data['gender'] = this.gender;
+    data['userId'] = this.userId;
+    data['roleId'] = this.roleId;
+    data['roleName'] = this.roleName;
+    data['customerId'] = this.customerId;
+    data['customerName'] = this.customerName;
+    data['addressId'] = this.addressId;
+    data['address'] = this.address;
+    data['countryId'] = this.countryId;
+    data['countryName'] = this.countryName;
+    data['cityId'] = this.cityId;
+    data['cityName'] = this.cityName;
+    data['districtId'] = this.districtId;
+    data['districtName'] = this.districtName;
+    data['wardId'] = this.wardId;
+    data['wardName'] = this.wardName;
+    data['fcmToken'] = this.fcmToken;
+    data['email'] = this.email;
+    data['imageUrl'] = this.imageUrl;
+    data['activated'] = this.activated;
+    data['langKey'] = this.langKey;
+    data['authorities'] = this.authorities;
+    return data;
+  }
 }

lib/custom_model/account.g.dart

@@ -1,64 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'account.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Account _$AccountFromJson(Map<String, dynamic> json) {
-  return Account()
-    ..id = json['id'] as num
-    ..login = json['login'] as String
-    ..firstName = json['firstName'] as String
-    ..lastName = json['lastName'] as String
-    ..midleName = json['midleName'] as String
-    ..fullName = json['fullName'] as String
-    ..phone = json['phone'] as String
-    ..address = json['address'] as String
-    ..avartar = json['avartar'] as String
-    ..vaiTroId = json['vaiTroId'] as num
-    ..tenVaiTro = json['tenVaiTro'] as String
-    ..donViCanhTacId = json['donViCanhTacId'] as num
-    ..tenDonVi = json['tenDonVi'] as String
-    ..email = json['email'] as String
-    ..imageUrl = json['imageUrl'] as String
-    ..activated = json['activated'] as bool
-    ..countryId = json['countryId'] as num
-    ..countryName = json['countryName'] as String
-    ..cityId = json['cityId'] as num
-    ..cityName = json['cityName'] as String
-    ..districtId = json['districtId'] as num
-    ..districtName = json['districtName'] as String
-    ..wardId = json['wardId'] as num
-    ..wardName = json['wardName'] as String
-    ..authorities = json['authorities'] as List;
-}
-
-Map<String, dynamic> _$AccountToJson(Account instance) => <String, dynamic>{
-      'id': instance.id,
-      'login': instance.login,
-      'firstName': instance.firstName,
-      'lastName': instance.lastName,
-      'midleName': instance.midleName,
-      'fullName': instance.fullName,
-      'phone': instance.phone,
-      'address': instance.address,
-      'avartar': instance.avartar,
-      'vaiTroId': instance.vaiTroId,
-      'tenVaiTro': instance.tenVaiTro,
-      'donViCanhTacId': instance.donViCanhTacId,
-      'tenDonVi': instance.tenDonVi,
-      'email': instance.email,
-      'imageUrl': instance.imageUrl,
-      'activated': instance.activated,
-      'countryId': instance.countryId,
-      'countryName': instance.countryName,
-      'cityId': instance.cityId,
-      'cityName': instance.cityName,
-      'districtId': instance.districtId,
-      'districtName': instance.districtName,
-      'wardId': instance.wardId,
-      'wardName': instance.wardName,
-      'authorities': instance.authorities,
-    };

pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.3"
+    version: "2.5.0-nullsafety.1"
   auto_size_text:
     dependency: "direct main"
     description:
@@ -63,7 +63,7 @@ packages:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0-nullsafety.1"
   build:
     dependency: transitive
     description:
@@ -147,14 +147,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.5"
+    version: "1.1.0-nullsafety.3"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0-nullsafety.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -175,7 +175,7 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0-nullsafety.1"
   code_builder:
     dependency: transitive
     description:
@@ -189,7 +189,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.5"
+    version: "1.15.0-nullsafety.3"
   convert:
     dependency: transitive
     description:
@@ -245,7 +245,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0-nullsafety.1"
   ffi:
     dependency: transitive
     description:
@@ -355,7 +355,7 @@ packages:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.19.2+1"
+    version: "0.19.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -456,7 +456,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3-nullsafety.3"
+    version: "0.6.2"
   json_annotation:
     dependency: transitive
     description:
@@ -491,14 +491,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.3"
+    version: "0.12.10-nullsafety.1"
   meta:
     dependency: "direct main"
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.6"
+    version: "1.3.0-nullsafety.3"
   mime:
     dependency: "direct main"
     description:
@@ -554,7 +554,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.3"
+    version: "1.8.0-nullsafety.1"
   path_drawing:
     dependency: transitive
     description:
@@ -797,7 +797,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.4"
+    version: "1.8.0-nullsafety.2"
   sqflite:
     dependency: transitive
     description:
@@ -818,14 +818,14 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.6"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0-nullsafety.1"
   stream_transform:
     dependency: transitive
     description:
@@ -839,7 +839,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0-nullsafety.1"
   synchronized:
     dependency: transitive
     description:
@@ -853,14 +853,14 @@ packages:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0-nullsafety.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.6"
+    version: "0.2.19-nullsafety.2"
   timing:
     dependency: transitive
     description:
@@ -881,7 +881,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.5"
+    version: "1.3.0-nullsafety.3"
   uuid:
     dependency: transitive
     description:
@@ -895,7 +895,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.5"
+    version: "2.1.0-nullsafety.3"
   video_player:
     dependency: "direct main"
     description:
@@ -960,5 +960,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
-  flutter: ">=1.24.0-6.0.pre <2.0.0"
+  dart: ">=2.10.2 <2.11.0"
+  flutter: ">=1.22.2 <2.0.0"

pubspec.yaml

@@ -2,7 +2,7 @@ name: farm_tpf
 description: A new Flutter project.
 
 publish_to: 'none'
-version: 1.1.1+6
+version: 1.1.1+7
 
 environment:
   sdk: ">=2.7.0 <3.0.0"