From 417b8ffd9419e7b91e1556d88a3318c9c2c30912 Mon Sep 17 00:00:00 2001
From: Hamza Aleghwairyeen <hamzaaleghwairyeen@Hamzas-MBP.lan>
Date: Tue, 2 Apr 2024 16:12:49 +0300
Subject: [PATCH] 4/2/2

---
 lib/controller/functions/crud.dart                     | 10 ++++------
 lib/controller/home/map_passenger_controller.dart      |  6 +++++-
 .../home/Captin/orderCaptin/order_speed_request.dart   |  7 ++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart
index 0dfd1a7..942c17e 100644
--- a/lib/controller/functions/crud.dart
+++ b/lib/controller/functions/crud.dart
@@ -180,15 +180,13 @@ class CRUD {
     // print(jsonData);
     if (response.statusCode == 200) {
       if (jsonData['status'] == 'success') {
-        // Get.snackbar(
-        //   jsonData['status'],
-        //   jsonData['message'],
-        // );
-        // print(response.body);
         return response.body;
+      } else {
+        return (jsonData['status']);
       }
+    } else {
+      return response.statusCode;
     }
-    return (jsonData['status']);
   }
 
   sendEmail(
diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart
index c5e78c5..7fb17de 100644
--- a/lib/controller/home/map_passenger_controller.dart
+++ b/lib/controller/home/map_passenger_controller.dart
@@ -1180,6 +1180,7 @@ class MapPassengerController extends GetxController {
     // If the trip duration is less than or equal to 50 minutes, then break the loop.
     for (var i = 0; i < loopCount; i++) {
       // Wait for 50 seconds.
+      print('loop is $i from $loopCount');
       await Future.delayed(const Duration(seconds: 4));
       await getDriverCarsLocationToPassengerAfterApplied();
       reloadMarkerDriverCarsLocationToPassengerAfterApplied();
@@ -1207,7 +1208,8 @@ class MapPassengerController extends GetxController {
             ['latitude']),
         double.parse(datadriverCarsLocationToPassengerAfterApplied['message'][0]
             ['longitude']));
-    final driverAcceptedMarker = Marker(
+            print('driver position $driverPosition')
+;    final driverAcceptedMarker = Marker(
       markerId: const MarkerId('driverToPassengers'),
       position: driverPosition,
       rotation: double.parse(
@@ -1665,6 +1667,8 @@ class MapPassengerController extends GetxController {
       //print('Reloading markers ($reloadCount)');
       if (!rideConfirm) {
         reloadMarkers();
+      }else{
+        runWhenRideIsBegin();
       }
 
       if (reloadCount >= 35) {
diff --git a/lib/views/home/Captin/orderCaptin/order_speed_request.dart b/lib/views/home/Captin/orderCaptin/order_speed_request.dart
index 570e0b0..5f058e4 100644
--- a/lib/views/home/Captin/orderCaptin/order_speed_request.dart
+++ b/lib/views/home/Captin/orderCaptin/order_speed_request.dart
@@ -317,7 +317,12 @@ class OrderSpeedRequest extends StatelessWidget {
                               titleStyle: AppStyle.title,
                               middleTextStyle: AppStyle.title,
                               confirm: MyElevatedButton(
-                                  title: 'Ok'.tr, onPressed: () => Get.back()));
+                                  title: 'Ok'.tr,
+                                  onPressed: () {
+                                    Get.back();
+                                    Get.back();
+                                    Get.back();
+                                  }));
                         } else if (jsonDecode(res)['status'] == "success") {
                           List<String> bodyToPassenger = [
                             box.read(BoxName.driverID).toString(),