Compare commits
No commits in common. "01e53128ee03b56dd78d9c14f501c1841f7424ca" and "7c946c7d27969b88e8b1b1261d3b1f43aafa97a8" have entirely different histories.
01e53128ee
...
7c946c7d27
|
|
@ -10,7 +10,6 @@ import 'package:intl/intl.dart';
|
||||||
import 'package:mobdr/config/constant.dart';
|
import 'package:mobdr/config/constant.dart';
|
||||||
import 'package:mobdr/main.dart';
|
import 'package:mobdr/main.dart';
|
||||||
import 'package:mobdr/service/shared_prefs.dart';
|
import 'package:mobdr/service/shared_prefs.dart';
|
||||||
import 'package:mobdr/service/logger_util.dart';
|
|
||||||
|
|
||||||
class ApiProvider {
|
class ApiProvider {
|
||||||
final Dio _dio;
|
final Dio _dio;
|
||||||
|
|
@ -200,30 +199,6 @@ class ApiProvider {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<bool> guidActif() async {
|
|
||||||
final url =
|
|
||||||
'${ApiConstants.baseUrl}${ApiConstants.mp4Endpoint}${ApiConstants.restEndpoint}/login/${SharedPrefs().login}/guidactif';
|
|
||||||
|
|
||||||
final headers = {
|
|
||||||
'Content-Type': 'application/x-www-form-urlencoded',
|
|
||||||
'Accept': 'application/json',
|
|
||||||
'Cookie': 'pguid=${SharedPrefs().guid};',
|
|
||||||
};
|
|
||||||
|
|
||||||
final response = await http.get(Uri.parse(url), headers: headers);
|
|
||||||
|
|
||||||
if (response.statusCode == 200) {
|
|
||||||
final jsonResponse = json.decode(response.body);
|
|
||||||
|
|
||||||
if (jsonResponse.containsKey('general') &&
|
|
||||||
jsonResponse['general']['actif'] == true) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Synchronize all informations about store, competitor, calendar
|
/// Synchronize all informations about store, competitor, calendar
|
||||||
Future<String> SyncCalendar() async {
|
Future<String> SyncCalendar() async {
|
||||||
DateTime now = DateTime.now();
|
DateTime now = DateTime.now();
|
||||||
|
|
@ -515,9 +490,6 @@ class ApiProvider {
|
||||||
|
|
||||||
if (data.containsKey('latest_version')) {
|
if (data.containsKey('latest_version')) {
|
||||||
if (data['latest_version'] != SharedPrefs().appVersion) {
|
if (data['latest_version'] != SharedPrefs().appVersion) {
|
||||||
LoggerUtil.logNStackInfo(
|
|
||||||
'A new version is available : ${data['latest_version']}');
|
|
||||||
|
|
||||||
// The versions differ
|
// The versions differ
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ import 'package:mobdr/main.dart';
|
||||||
import 'package:mobdr/events.dart';
|
import 'package:mobdr/events.dart';
|
||||||
import 'package:mobdr/ui/reusable/reusable_widget.dart';
|
import 'package:mobdr/ui/reusable/reusable_widget.dart';
|
||||||
import 'package:mobdr/ui/appstore/updatecheck.dart';
|
import 'package:mobdr/ui/appstore/updatecheck.dart';
|
||||||
import 'package:mobdr/ui/authentication/signin.dart';
|
|
||||||
import 'package:mobdr/service/shared_prefs.dart';
|
import 'package:mobdr/service/shared_prefs.dart';
|
||||||
import 'package:mobdr/network/api_provider.dart';
|
import 'package:mobdr/network/api_provider.dart';
|
||||||
import 'package:mobdr/db/box_visit_photo.dart';
|
import 'package:mobdr/db/box_visit_photo.dart';
|
||||||
|
|
@ -41,6 +40,7 @@ class _SynchronizationPageState extends State<SynchronizationPage>
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
||||||
_apiProvider = ApiProvider();
|
_apiProvider = ApiProvider();
|
||||||
|
|
||||||
_animationController = AnimationController(
|
_animationController = AnimationController(
|
||||||
vsync: this,
|
vsync: this,
|
||||||
duration: Duration(seconds: 2),
|
duration: Duration(seconds: 2),
|
||||||
|
|
@ -71,48 +71,42 @@ class _SynchronizationPageState extends State<SynchronizationPage>
|
||||||
} else {
|
} else {
|
||||||
_isInternetConnexion = true;
|
_isInternetConnexion = true;
|
||||||
|
|
||||||
// check if the guid is valid
|
// synchronization start
|
||||||
if (await _apiProvider.guidActif() == true) {
|
await startSync();
|
||||||
// synchronization start
|
|
||||||
await startSync();
|
|
||||||
|
|
||||||
// check is new version is available
|
// Vérifier si une mise à jour est disponible
|
||||||
if (await _apiProvider.checkAppVersion()) {
|
bool isUpdateAvailable = await _apiProvider.checkAppVersion();
|
||||||
// Display the update message
|
|
||||||
showDialog(
|
if (isUpdateAvailable) {
|
||||||
context: context,
|
// Afficher le message de mise à jour
|
||||||
builder: (BuildContext context) {
|
showDialog(
|
||||||
return AlertDialog(
|
context: context,
|
||||||
title: Text("New version available"),
|
builder: (BuildContext context) {
|
||||||
content: Text(
|
return AlertDialog(
|
||||||
"A new version is available. Would you like to install it?"),
|
title: Text("New version available"),
|
||||||
actions: [
|
content: Text(
|
||||||
TextButton(
|
"A new version is available. Would you like to install it?"),
|
||||||
child: Text("No"),
|
actions: [
|
||||||
onPressed: () {
|
TextButton(
|
||||||
Navigator.pop(context); // Closes the dialog box
|
child: Text("No"),
|
||||||
},
|
onPressed: () {
|
||||||
),
|
Navigator.pop(context); // Closes the dialog box
|
||||||
TextButton(
|
},
|
||||||
child: Text("Yes"),
|
),
|
||||||
onPressed: () {
|
TextButton(
|
||||||
Navigator.pop(context); // Closes the dialog box
|
child: Text("Yes"),
|
||||||
Navigator.push(
|
onPressed: () {
|
||||||
context,
|
Navigator.pop(context); // Closes the dialog box
|
||||||
MaterialPageRoute(
|
Navigator.push(
|
||||||
builder: (context) => UpdateCheckPage()),
|
context,
|
||||||
);
|
MaterialPageRoute(
|
||||||
},
|
builder: (context) => UpdateCheckPage()),
|
||||||
),
|
);
|
||||||
],
|
},
|
||||||
);
|
),
|
||||||
},
|
],
|
||||||
);
|
);
|
||||||
}
|
},
|
||||||
} else {
|
|
||||||
Navigator.push(
|
|
||||||
context,
|
|
||||||
MaterialPageRoute(builder: (context) => SigninPage()),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue