diff --git a/android/app/build.gradle b/android/app/build.gradle index 923e10f..767ba72 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -61,8 +61,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdk = 23 targetSdk = flutter.targetSdkVersion - versionCode = 110 - versionName = '1.6.110' + versionCode = 111 + versionName = '1.6.111' multiDexEnabled =true // manifestPlaceholders can be specified here if needed diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index c3253f4..141ac06 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -41,11 +41,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 79 + 80 CFBundleSignature ???? CFBundleVersion - 4.3.79 + 4.3.80 NSHumanReadableCopyright FirebaseAppDelegateProxyEnabled diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index a4d50b0..8dc26d6 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -133,8 +133,10 @@ class FirebaseMessagesController extends GetxController { var passengerList = message.data['passengerList']; var myList = jsonDecode(passengerList) as List; + Log.print('myList: ${myList}'); driverID = myList[0].toString(); - Get.find().driverToken = myList[2].toString(); + // Get.find().driverToken = myList[2].toString(); + // Log.print('driverToken: ${myList[2]}'); Get.find().statusRide = 'Apply'; Get.find().isSearchingWindow = false; Get.find().update(); diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 6001be3..0000b07 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -1767,6 +1767,7 @@ class MapPassengerController extends GetxController { } String driversStatusForSearchWindow = ''; + Future confirmRideForAllDriverAvailable() async { bool driversFound = false; const maxAttempts = 8; @@ -1795,13 +1796,13 @@ class MapPassengerController extends GetxController { update(); await postRideDetailsToServer(); driversStatusForSearchWindow = 'Your order sent to drivers'.tr; - delayAndFetchRideStatusForAllDriverAvailable(rideId); + await notifyAvailableDrivers(); driversStatusForSearchWindow = 'The drivers are reviewing your request'.tr; Log.print('driversStatusForSearchWindow: $driversStatusForSearchWindow'); update(); - + delayAndFetchRideStatusForAllDriverAvailable(rideId); // update(); } @@ -2061,11 +2062,11 @@ class MapPassengerController extends GetxController { timer.cancel(); //todo // addRideToNotificationDriverString(); // Show dialog to increase fee... - MyDialog().getDialog( - 'Are you want to wait drivers to accept your order'.tr, '', () { - Get.back(); - addRideToNotificationDriverAvailable(); - }); + // MyDialog().getDialog( + // 'Are you want to wait drivers to accept your order'.tr, '', () { + // Get.back(); + // addRideToNotificationDriverAvailable(); + // }); update(); _rideStatusStreamController .close(); // Close stream after max attempts