Hamza/tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

24-12/25/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-12-25 16:28:08 +03:00
parent f5c84aad91
commit 970e444f4a
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@@ -61,8 +61,8 @@ android {
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23 minSdk = 23
targetSdk = flutter.targetSdkVersion targetSdk = flutter.targetSdkVersion
versionCode = 110 versionCode = 111
versionName = '1.6.110' versionName = '1.6.111'
multiDexEnabled =true multiDexEnabled =true
// manifestPlaceholders can be specified here if needed // manifestPlaceholders can be specified here if needed

4
ios/Runner/Info.plist
View File

@@ -41,11 +41,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>79</string> <string>80</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>4.3.79</string> <string>4.3.80</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string></string> <string></string>
<key>FirebaseAppDelegateProxyEnabled</key> <key>FirebaseAppDelegateProxyEnabled</key>

4
lib/controller/firebase/firbase_messge.dart
View File

@@ -133,8 +133,10 @@ class FirebaseMessagesController extends GetxController {
var passengerList = message.data['passengerList']; var passengerList = message.data['passengerList'];
var myList = jsonDecode(passengerList) as List<dynamic>; var myList = jsonDecode(passengerList) as List<dynamic>;
Log.print('myList: ${myList}');
driverID = myList[0].toString(); driverID = myList[0].toString();
Get.find<MapPassengerController>().driverToken = myList[2].toString(); // Get.find<MapPassengerController>().driverToken = myList[2].toString();
// Log.print('driverToken: ${myList[2]}');
Get.find<MapPassengerController>().statusRide = 'Apply'; Get.find<MapPassengerController>().statusRide = 'Apply';
Get.find<MapPassengerController>().isSearchingWindow = false; Get.find<MapPassengerController>().isSearchingWindow = false;
Get.find<MapPassengerController>().update(); Get.find<MapPassengerController>().update();

15
lib/controller/home/map_passenger_controller.dart
View File

@@ -1767,6 +1767,7 @@ class MapPassengerController extends GetxController {
} }
String driversStatusForSearchWindow = ''; String driversStatusForSearchWindow = '';
Future<void> confirmRideForAllDriverAvailable() async { Future<void> confirmRideForAllDriverAvailable() async {
bool driversFound = false; bool driversFound = false;
const maxAttempts = 8; const maxAttempts = 8;
@@ -1795,13 +1796,13 @@ class MapPassengerController extends GetxController {
update(); update();
await postRideDetailsToServer(); await postRideDetailsToServer();
driversStatusForSearchWindow = 'Your order sent to drivers'.tr; driversStatusForSearchWindow = 'Your order sent to drivers'.tr;
delayAndFetchRideStatusForAllDriverAvailable(rideId);
await notifyAvailableDrivers(); await notifyAvailableDrivers();
driversStatusForSearchWindow = 'The drivers are reviewing your request'.tr; driversStatusForSearchWindow = 'The drivers are reviewing your request'.tr;
Log.print('driversStatusForSearchWindow: $driversStatusForSearchWindow'); Log.print('driversStatusForSearchWindow: $driversStatusForSearchWindow');
update(); update();
delayAndFetchRideStatusForAllDriverAvailable(rideId);
// update(); // update();
} }
@@ -2061,11 +2062,11 @@ class MapPassengerController extends GetxController {
timer.cancel(); //todo timer.cancel(); //todo
// addRideToNotificationDriverString(); // addRideToNotificationDriverString();
// Show dialog to increase fee... // Show dialog to increase fee...
MyDialog().getDialog( // MyDialog().getDialog(
'Are you want to wait drivers to accept your order'.tr, '', () { // 'Are you want to wait drivers to accept your order'.tr, '', () {
Get.back(); // Get.back();
addRideToNotificationDriverAvailable(); // addRideToNotificationDriverAvailable();
}); // });
update(); update();
_rideStatusStreamController _rideStatusStreamController
.close(); // Close stream after max attempts .close(); // Close stream after max attempts