7/10/2

lib/controller/home/captin/map_driver_controller.dart

@@ -166,23 +166,28 @@ class MapDriverController extends GetxController {
   }
 
   void startTimerToShowPassengerInfoWindowFromDriver() async {
-    isPassengerInfoWindow = true;
-    for (int i = 0; i <= int.parse(durationToPassenger); i++) {
-      await Future.delayed(const Duration(seconds: 1));
-      progressToPassenger = i / int.parse(durationToPassenger);
-      remainingTimeToPassenger = int.parse(durationToPassenger) - i;
-      if (remainingTimeToPassenger == 0) {
-        isBtnRideBegin = true;
+    if (box.read(BoxName.rideStatus) == 'Begin') {
+      isPassengerInfoWindow = false;
+    } else {
+      isPassengerInfoWindow = true;
+      for (int i = 0; i <= int.parse(durationToPassenger); i++) {
+        await Future.delayed(const Duration(seconds: 1));
+        progressToPassenger = i / int.parse(durationToPassenger);
+        remainingTimeToPassenger = int.parse(durationToPassenger) - i;
+        if (remainingTimeToPassenger == 0) {
+          isBtnRideBegin = true;
+          update();
+        }
+
+        int minutes = (remainingTimeToPassenger / 60).floor();
+        int seconds = remainingTimeToPassenger % 60;
+        stringRemainingTimeToPassenger =
+            '$minutes:${seconds.toString().padLeft(2, '0')}';
+
         update();
       }
-
-      int minutes = (remainingTimeToPassenger / 60).floor();
-      int seconds = remainingTimeToPassenger % 60;
-      stringRemainingTimeToPassenger =
-          '$minutes:${seconds.toString().padLeft(2, '0')}';
-
-      update();
     }
+
     // update();
     // startTimerToShowDriverToPassengerDuration();
   }
@@ -272,8 +277,19 @@ class MapDriverController extends GetxController {
     return d['message'][0]['count'];
   }
 
-  Position? currentPosition;
+  void startRideFromStartApp() {
+    changeRideToBeginToPassenger();
+    isPassengerInfoWindow = false;
+    isRideStarted = true;
+    isRideFinished = false;
+    remainingTimeInPassengerLocatioWait = 0;
+    timeWaitingPassenger = 0;
+    box.write(BoxName.statusDriverLocation, 'on');
+    update();
+    // rideIsBeginPassengerTimer();
+  }
 
+  Position? currentPosition;
   startRideFromDriver() async {
     double _distance =
         await calculateDistanceBetweenDriverAndPassengerLocation();
@@ -448,7 +464,9 @@ class MapDriverController extends GetxController {
             title: 'Ok'.tr,
             kolor: AppColor.greenColor,
             onPressed: () {
-              if (distanceToDestination > 1000) {
+              if (distanceToDestination > 900 ||
+                  (double.parse(distance) < 1000 &&
+                      distanceToDestination > 500)) {
                 Get.back();
                 finishRideFromDriver1();
               } else {
@@ -456,7 +474,9 @@ class MapDriverController extends GetxController {
                 if (distanceToDestination < 150) {
                   //   todo add scam from start point and dont move
                 }
-                MyDialog().getDialog('you are not moved yet !'.tr, '', () {});
+                MyDialog().getDialog('you are not moved yet !'.tr, '', () {
+                  Get.back();
+                });
               }
             }),
         cancel: MyElevatedButton(