This commit is contained in:
Hamza-Ayed
2024-09-11 14:59:13 +03:00
parent 8df852ab66
commit 82298e7c62
2 changed files with 7 additions and 10 deletions

View File

@@ -54,8 +54,8 @@ android {
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23 minSdk = 23
targetSdk = flutter.targetSdkVersion targetSdk = flutter.targetSdkVersion
versionCode = 84 versionCode = 85
versionName = '1.5.84' versionName = '1.5.85'
multiDexEnabled =true multiDexEnabled =true
} }

View File

@@ -705,7 +705,7 @@ class MapDriverController extends GetxController {
await Future.delayed(const Duration(seconds: 1)); await Future.delayed(const Duration(seconds: 1));
recentDistanceToDash = Get.find<LocationController>().totalDistance; recentDistanceToDash = Get.find<LocationController>().totalDistance;
// rideTimerFromBegin = i; // rideTimerFromBegin = i;
if (int.parse(duration) > i) { if (int.parse(duration) + 300 > i) {
price = double.parse(totalCost); price = double.parse(totalCost);
} else { } else {
if (startNameLocation.toLowerCase().contains('airport') || if (startNameLocation.toLowerCase().contains('airport') ||
@@ -820,13 +820,10 @@ class MapDriverController extends GetxController {
? (i ~/ 60) * ? (i ~/ 60) *
(Get.find<HomeCaptainController>().latePrice + (Get.find<HomeCaptainController>().latePrice +
.5) + .5) +
(recentDistanceToDash * (price) -
Get.find<HomeCaptainController>().comfortPrice) int.parse(duration) *
: (i ~/ 60) * (Get.find<HomeCaptainController>().latePrice + .5)
(Get.find<HomeCaptainController>().latePrice + : price;
.5) +
(recentDistanceToDash *
Get.find<HomeCaptainController>().mashwariPrice);
} else if (currentTime.hour >= 14 && currentTime.hour <= 17) { } else if (currentTime.hour >= 14 && currentTime.hour <= 17) {
price = carType == 'Comfort' // || carType == 'Free Ride' price = carType == 'Comfort' // || carType == 'Free Ride'
? (i ~/ 60) * (Get.find<HomeCaptainController>().heavyPrice) + ? (i ~/ 60) * (Get.find<HomeCaptainController>().heavyPrice) +