6/9/1

lib/controller/home/map_passenger_controller.dart

@@ -4,6 +4,7 @@ import 'dart:math' show cos;
 import 'dart:math' as math;
 
 import 'package:SEFER/controller/functions/tts.dart';
+import 'package:SEFER/views/home/map_page_passenger.dart';
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:get/get.dart';
@@ -25,6 +26,7 @@ import '../../models/model/locations.dart';
 import '../../views/home/map_widget.dart/car_details_widget_to_go.dart';
 import '../../views/widgets/elevated_btn.dart';
 import '../firebase/firbase_messge.dart';
+import '../functions/audio_record1.dart';
 import '../functions/crud.dart';
 import '../functions/launch.dart';
 import '../functions/secure_storage.dart';
@@ -880,6 +882,8 @@ class MapPassengerController extends GetxController {
   late String make = '';
   late String licensePlate = '';
   confirmRideForFirstDriver() async {
+    print('confirmRideForFirstDriver');
+    print('statusRide $statusRide');
     await getCarsLocationByPassengerAndReloadMarker();
     await getNearestDriverByPassengerLocationAPIGOOGLE();
 
@@ -1066,7 +1070,7 @@ class MapPassengerController extends GetxController {
     ];
     print('driversToken');
     print(driversToken);
-    for (var i = 0; i < driversToken.length; i++) {
+    for (var i = 1; i < driversToken.length; i++) {
       FirebaseMessagesController().sendNotificationToDriverMapPolyline(
           'OrderSpeed',
           rideId.toString(),
@@ -1450,26 +1454,27 @@ class MapPassengerController extends GetxController {
         FirebaseMessagesController().sendNotificationToDriverMAP(
             'Cancel Trip', 'Trip Cancelled'.tr, driverToken, []);
       }
-      rideConfirm = false;
-      shouldFetch = false;
-      isCashConfirmPageShown = false;
-      isSearchingWindow = false;
-      statusRide = 'Cancel';
-      isPassengerChosen = false;
-      isCashSelectedBeforeConfirmRide = false;
-      isPickerShown = false;
-      isMarkersShown = false;
-      haveSteps = false;
-      isMarkersShown = false;
-      driverToken = '';
-      driverId = '';
-      driverPhone = '';
-      driverName = '';
-      // totalStepDurations = 0;
-      timeToPassengerFromDriverAfterApplied = 0;
-      remainingTime = 0;
-      isWayPointStopsSheetUtilGetMap = false;
-      update();
+      // rideConfirm = false;
+      // shouldFetch = false;
+      // isCashConfirmPageShown = false;
+      // isSearchingWindow = false;
+      // statusRide = 'Cancel';
+      // isPassengerChosen = false;
+      // isCashSelectedBeforeConfirmRide = false;
+      // isPickerShown = false;
+      // isMarkersShown = false;
+      // haveSteps = false;
+      // isMarkersShown = false;
+      // driverToken = '';
+      // driverId = '';
+      // driverPhone = '';
+      // driverName = '';
+      // // totalStepDurations = 0;
+      // timeToPassengerFromDriverAfterApplied = 0;
+      // remainingTime = 0;
+      // isWayPointStopsSheetUtilGetMap = false;
+      // update();
+      Get.offAll(const MapPagePassenger());
     } else {
       clearPlacesDestination();
       clearPolyline();
@@ -1479,28 +1484,28 @@ class MapPassengerController extends GetxController {
         "order_id": rideId.toString(), // Convert to String
         "status": 'Cancel'
       });
-
-      isPickerShown = false;
-      isWayPointStopsSheetUtilGetMap = false;
-      rideConfirm = false;
-      shouldFetch = false;
-      driverToken = '';
-      driverId = '';
-      driverPhone = '';
-      driverName = '';
-      isCashConfirmPageShown = false;
-      isSearchingWindow = false;
-      isPassengerChosen = false;
-      isCashSelectedBeforeConfirmRide = false;
-      statusRide = 'Cancel';
-      haveSteps = false;
-      isMarkersShown = false;
-      timeToPassengerFromDriverAfterApplied = 0;
-      changeCancelRidePageShow();
-      clearPolyline();
-      remainingTime = 0;
-      durationTimer = 0;
-      update();
+      Get.offAll(const MapPagePassenger());
+      // isPickerShown = false;
+      // isWayPointStopsSheetUtilGetMap = false;
+      // rideConfirm = false;
+      // shouldFetch = false;
+      // driverToken = '';
+      // driverId = '';
+      // driverPhone = '';
+      // driverName = '';
+      // isCashConfirmPageShown = false;
+      // isSearchingWindow = false;
+      // isPassengerChosen = false;
+      // isCashSelectedBeforeConfirmRide = false;
+      // statusRide = 'Cancel';
+      // haveSteps = false;
+      // isMarkersShown = false;
+      // timeToPassengerFromDriverAfterApplied = 0;
+      // changeCancelRidePageShow();
+      // clearPolyline();
+      // remainingTime = 0;
+      // durationTimer = 0;
+      // update();
     }
   }
 
@@ -2623,7 +2628,7 @@ class MapPassengerController extends GetxController {
       if (jsonDecode(res)['message']['rating'] == null) {
         passengerRate = 5;
       } else {
-        passengerRate = jsonDecode(res)['message']['rating'];
+        passengerRate = jsonDecode(res)['message']['rating'].toDouble();
       }
     } else {
       passengerRate = 5;
@@ -2649,6 +2654,7 @@ class MapPassengerController extends GetxController {
     Get.put(TextToSpeechController());
     box.write(BoxName.carType, 'yet');
     box.write(BoxName.tipPercentage, '0');
+    Get.put(AudioRecorderController());
     // await getNearestDriverByPassengerLocation();
 
     initilizeGetStorage();