Merge branch 'master' of tzw/fcs into master

This commit is contained in:
2025-01-28 20:12:38 +06:30
committed by Gogs
2 changed files with 11 additions and 3 deletions

View File

@@ -10,6 +10,7 @@ List<Day> 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<String> 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<String, dynamic> 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'],

View File

@@ -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<AuthResult> sendSms(String phoneNumber,