This commit is contained in:
Hamza Aleghwairyeen
2024-04-12 03:13:24 +03:00
parent 40ec1a5362
commit a84a304c72
7 changed files with 92 additions and 46 deletions

View File

@@ -76,7 +76,7 @@ class MapDriverController extends GetxController {
bool isRideFinished = false;
bool isRideStarted = false;
bool isPriceWindow = false;
double passengerInfoWindowHeight = Get.height * .4;
double passengerInfoWindowHeight = Get.height * .35;
double driverEndPage = 100;
double progress = 0;
double progressToPassenger = 0;
@@ -880,8 +880,8 @@ class MapDriverController extends GetxController {
? (
await getMapDestination(step0, step1),
await getMapDestination(step1, step2),
await getMapDestination(step2, step3),
await getMapDestination(step3, step4),
step3 == '' ? await getMapDestination(step2, step3) : () {},
step4 == '' ? await getMapDestination(step3, step4) : () {},
)
: await getMapDestination(passengerLocation, passengerDestination);
addCustomCarIcon();

View File

@@ -252,7 +252,7 @@ class MapPassengerController extends GetxController {
isWayPointStopsSheetUtilGetMap = false;
isWayPointSheet = false;
durationToRide = 0;
distanceOfDestnation = 0;
distanceOfDestination = 0;
wayPointSheetHeight = 0;
remainingTime = 25;
haveSteps = true;
@@ -960,7 +960,7 @@ class MapPassengerController extends GetxController {
placesCoordinate[2],
placesCoordinate[3],
placesCoordinate[4],
costDistance.toStringAsFixed(2),
costForDriver.toStringAsFixed(2),
double.parse(box.read(BoxName.passengerWalletTotal)) < 0
? double.parse(box.read(BoxName.passengerWalletTotal))
.toStringAsFixed(2)
@@ -1038,7 +1038,7 @@ class MapPassengerController extends GetxController {
placesCoordinate[2],
placesCoordinate[3],
placesCoordinate[4],
costDistance.toStringAsFixed(2),
costForDriver.toStringAsFixed(2),
double.parse(box.read(BoxName.passengerWalletTotal)) < 0
? double.parse(box.read(BoxName.passengerWalletTotal))
.toStringAsFixed(2)
@@ -2002,8 +2002,8 @@ class MapPassengerController extends GetxController {
}
late LatLngBounds boundsData;
late String startNameAddress;
late String endNameAddress;
late String startNameAddress = '';
late String endNameAddress = '';
getMap(String origin, destination) async {
remainingTime = 25; //to make cancel every call
await getCarsLocationByPassengerAndReloadMarker();
@@ -2094,7 +2094,7 @@ class MapPassengerController extends GetxController {
}
}
double distanceOfDestnation = 0;
double distanceOfDestination = 0;
bool haveSteps = false;
late LatLng latestPosition;
// getMapPoints(String originSteps, String destinationSteps, int index) async {
@@ -2172,7 +2172,7 @@ class MapPassengerController extends GetxController {
durationToRide = durationToRide + durationToRide0;
print(durationToRide0);
print('durationToRide = $durationToRide');
distance = distanceOfDestnation + (data[0]['distance']['value']) / 1000;
distance = distanceOfDestination + (data[0]['distance']['value']) / 1000;
update();
final points =
@@ -2308,6 +2308,7 @@ class MapPassengerController extends GetxController {
return distance;
}
double costForDriver = 0;
Future bottomSheet() async {
if (data.isNotEmpty) {
durationToAdd = Duration(seconds: durationToRide);
@@ -2361,6 +2362,7 @@ class MapPassengerController extends GetxController {
totalDriver = totalDriver1 + (totalDriver1 * kazan / 100);
tax = totalCostPassenger * kazan / 100;
totalME = totalCostPassenger - tax;
costForDriver = fuelPrice * 12;
if (totalCostPassenger < 1) {
totalCostPassenger = 1;