diff --git a/lib/domain/entities/setting.dart b/lib/domain/entities/setting.dart index 3a4ddaf..fa56660 100644 --- a/lib/domain/entities/setting.dart +++ b/lib/domain/entities/setting.dart @@ -10,6 +10,7 @@ List dayLists = [ class Setting { final int supportBuildNum; + final int androidSupportBuildNum; final String reportURL; final String reportProjectID; final String bucketName; @@ -32,7 +33,8 @@ class Setting { List shipmentTypes; Setting( - {this.supportBuildNum = 1, + {this.androidSupportBuildNum = 1, + this.supportBuildNum = 1, this.usaAddress, this.mmAddress, this.usaContactNumber, @@ -54,7 +56,8 @@ class Setting { factory Setting.fromMap(Map map) { return Setting( - supportBuildNum: map['support_build_number'], + androidSupportBuildNum: map['android_support_build_number'] ?? 1, + supportBuildNum: map['support_build_number'] ?? 1, inviteRequired: map['invite_required'], appUrl: map['app_url'], usaAddress: map['usa_address'], diff --git a/lib/pages/main/model/main_model.dart b/lib/pages/main/model/main_model.dart index 6494085..4761306 100644 --- a/lib/pages/main/model/main_model.dart +++ b/lib/pages/main/model/main_model.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'package:fcs/data/services/services.dart'; import 'package:fcs/domain/entities/auth_result.dart'; @@ -150,7 +151,11 @@ class MainModel extends ChangeNotifier { bool isSupport() { if (packageInfo == null || setting == null) return false; - return int.parse(packageInfo!.buildNumber) >= setting!.supportBuildNum; + + int buildNumber = Platform.isAndroid + ? setting!.androidSupportBuildNum + : setting!.supportBuildNum; + return int.parse(packageInfo!.buildNumber) >= buildNumber; } Future sendSms(String phoneNumber,