3/31/6

lib/controller/home/map_passenger_controller.dart

@@ -1185,28 +1185,38 @@ class MapPassengerController extends GetxController {
     }
   }
 
+  void clearMarkersExceptStartEnd() {
+    Set<Marker> markersToRemove = markers
+        .where((marker) =>
+            marker.markerId != MarkerId("start") &&
+            marker.markerId != MarkerId("end"))
+        .toSet();
+
+    for (Marker marker in markersToRemove) {
+      markers.remove(marker);
+      update();
+    }
+  }
+
   void reloadMarkerDriverCarsLocationToPassengerAfterApplied() {
     // Clear existing markers
-    markers.clear();
+    // markers.clear();
-    update();
+    // update();
+    clearMarkersExceptStartEnd();
     // for (var i = 0; i < driverCarsLocationToPassengerAfterApplied.length; i++) {
-// }
+    final driverAcceptedMarker = Marker(
-//     for (var item in driverCarsLocationToPassengerAfterApplied) {
+      markerId: const MarkerId('driverToPassengers'),
-
+      position: LatLng(
-    // final driverAcceptedMarker = Marker(
+          double.parse(
-    //   onTap: () => print('marker pressed'),
+              datadriverCarsLocationToPassengerAfterApplied[0]['latitude']),
-    //   infoWindow: InfoWindow(
+          double.parse(
-    //       title:
+              datadriverCarsLocationToPassengerAfterApplied[0]['longitude'])),
-    //           '${driverCarsLocationToPassengerAfterApplied[i].latitude} minutes'),
+      rotation: double.parse(
-    //   markerId: MarkerId(
+          datadriverCarsLocationToPassengerAfterApplied['message'][0]
-    //       datadriverCarsLocationToPassengerAfterApplied['message'][0]['id']
+              ['heading']),
-    //           .toString()),
+      icon: carIcon,
-    //   position: LatLng(driverCarsLocationToPassengerAfterApplied[i].latitude,
+    );
-    //       driverCarsLocationToPassengerAfterApplied[i].longitude),
+    markers.add(driverAcceptedMarker);
-    //   rotation: datadriverCarsLocationToPassengerAfterApplied['message'][0]
-    //       ['heading'],
-    // );
-    // markers.add(driverAcceptedMarker);
     // update();
     mapController?.animateCamera(CameraUpdate.newLatLng(LatLng(
         driverCarsLocationToPassengerAfterApplied[0].latitude,
@@ -1916,14 +1926,14 @@ class MapPassengerController extends GetxController {
         data[0]["start_location"]['lat'], data[0]["start_location"]['lng']);
     markers.add(
       Marker(
-        markerId: MarkerId(startNameAddress),
+        markerId: MarkerId('start'),
         position: newStartPointLocation,
         icon: startIcon,
       ),
     );
     markers.add(
       Marker(
-        markerId: MarkerId(endNameAddress),
+        markerId: MarkerId('end'),
         position: LatLng(
             data[0]["end_location"]['lat'], data[0]["end_location"]['lng']),
         icon: endIcon,

lib/views/home/Captin/orderCaptin/order_speed_request.dart

@@ -356,15 +356,8 @@ class OrderSpeedRequest extends StatelessWidget {
                       onPressed: () async {
                         box.write(BoxName.statusDriverLocation, 'on');
 
-                        orderRequestController.changeApplied();
+                        // orderRequestController.changeApplied();
-                        await CRUD().postFromDialogue(
+
-                            link: AppLink.addDriverOrder,
-                            payload: {
-                              'driver_id': myList[6].toString(),
-                              // box.read(BoxName.driverID).toString(),
-                              'order_id': body.toString(),
-                              'status': 'Apply'
-                            });
                         var res = await CRUD()
                             .post(link: AppLink.updateStausFromSpeed, payload: {
                           'id': myList[16],
@@ -392,6 +385,14 @@ class OrderSpeedRequest extends StatelessWidget {
                             box.read(BoxName.nameDriver).toString(),
                             box.read(BoxName.tokenDriver).toString(),
                           ];
+                          await CRUD().postFromDialogue(
+                              link: AppLink.addDriverOrder,
+                              payload: {
+                                'driver_id': myList[6].toString(),
+                                // box.read(BoxName.driverID).toString(),
+                                'order_id': body.toString(),
+                                'status': 'Apply'
+                              });
                           // print(bodyToPassenger);
                           FirebaseMessagesController()
                               .sendNotificationToPassengerToken(