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

25-5-30/1

Browse Source
This commit is contained in:
Hamza-Ayed
2025-05-30 16:58:17 +03:00
parent bdf380b925
commit cf8966ea29
41 changed files with 538 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,12 +544,12 @@ class MapPassengerController extends GetxController {
void sendSMS(String to) async {
// Get the driver's phone number.
String driverPhone = EncryptionHelper.instance.decryptData(
dataCarsLocationByPassenger['message'][carsOrder]['phone'].toString());
String driverPhone =
(dataCarsLocationByPassenger['message'][carsOrder]['phone'].toString());
// Format the message.
String message =
'Hi! This is ${EncryptionHelper.instance.decryptData(box.read(BoxName.name).toString().split(' ')[0]).toString()}.\n I am using ${box.read(AppInformation.appName)} to ride with $passengerName as the driver. $passengerName \nis driving a $model\n with license plate $licensePlate.\n I am currently located at $passengerLocation.\n If you need to reach me, please contact the driver directly at\n\n $driverPhone.';
'Hi! This is ${(box.read(BoxName.name).toString().split(' ')[0]).toString()}.\n I am using ${box.read(AppInformation.appName)} to ride with $passengerName as the driver. $passengerName \nis driving a $model\n with license plate $licensePlate.\n I am currently located at $passengerLocation.\n If you need to reach me, please contact the driver directly at\n\n $driverPhone.';
// Launch the URL to send the SMS.
launchCommunication('sms', to, message);
@@ -561,7 +561,7 @@ class MapPassengerController extends GetxController {
// Format the message.
String message =
'${'${'Hi! This is'.tr} ${EncryptionHelper.instance.decryptData(box.read(BoxName.name).toString().split(' ')[0]).toString()}.\n${' I am using'.tr}'} ${AppInformation.appName}${' to ride with'.tr} $passengerName${' as the driver.'.tr} $passengerName \n${'is driving a '.tr}$model\n${' with license plate '.tr}$licensePlate.\n${' I am currently located at '.tr} https://www.google.com/maps/place/${passengerLocation.latitude},${passengerLocation.longitude}.\n${' If you need to reach me, please contact the driver directly at'.tr}\n\n $driverPhone.';
'${'${'Hi! This is'.tr} ${(box.read(BoxName.name).toString().split(' ')[0]).toString()}.\n${' I am using'.tr}'} ${AppInformation.appName}${' to ride with'.tr} $passengerName${' as the driver.'.tr} $passengerName \n${'is driving a '.tr}$model\n${' with license plate '.tr}$licensePlate.\n${' I am currently located at '.tr} https://www.google.com/maps/place/${passengerLocation.latitude},${passengerLocation.longitude}.\n${' If you need to reach me, please contact the driver directly at'.tr}\n\n $driverPhone.';
// Launch the URL to send the WhatsApp message.
launchCommunication('whatsapp', to, message);
@@ -1956,12 +1956,11 @@ class MapPassengerController extends GetxController {
(distanceToDriverInMeters * 1.25).toStringAsFixed(0);
Future.delayed(const Duration(microseconds: 10));
final body = constructNotificationBody(driverData);
// Log.print('body:ww ${body}');
Log.print('body:ww ${body}');
Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
'Order'.tr,
endNameAddress,
EncryptionHelper.instance
.decryptData(driverData['token'].toString()),
(driverData['token'].toString()),
body,
'order.wav');
}
@@ -1982,16 +1981,13 @@ class MapPassengerController extends GetxController {
distance.toStringAsFixed(2),
driverData['driver_id'].toString(),
box.read(BoxName.passengerID).toString(),
EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[0])
.toString(),
EncryptionHelper.instance
.decryptData(box.read(BoxName.tokenFCM).toString()),
EncryptionHelper.instance.decryptData(box.read(BoxName.phone).toString()),
(box.read(BoxName.name).toString().split(' ')[0]).toString(),
(box.read(BoxName.tokenFCM).toString()),
(box.read(BoxName.phone).toString()),
durationToPassenger.toStringAsFixed(0) ?? '120',
distanceByPassenger.toString() ?? '2000',
paymentController.isWalletChecked.toString(),
EncryptionHelper.instance.decryptData(driverData['token'].toString()),
(driverData['token'].toString()),
durationToPassenger.toString(),
rideId.toString(),
rideTimerBegin.toString(),
@@ -2023,9 +2019,10 @@ class MapPassengerController extends GetxController {
StreamController<String>.broadcast();
Stream<String> get rideStatusStream => _rideStatusStreamController.stream;
int maxAttempts = 15;
Future<void> delayAndFetchRideStatusForAllDriverAvailable(
String rideId) async {
const int maxAttempts = 15;
int attemptCounter = 0;
bool isApplied = false;
tick = 0;
@@ -2042,7 +2039,7 @@ class MapPassengerController extends GetxController {
try {
var res = await getRideStatus(rideId);
Log.print('res:2022 $res');
Log.print('res:2047 $res');
String rideStatusDelayed = res.toString();
Log.print('rideStatusDelayed: $rideStatusDelayed');
@@ -2068,11 +2065,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
@@ -2172,7 +2169,7 @@ class MapPassengerController extends GetxController {
link: "${AppLink.endPoint}/ride/rides/getRideStatus.php",
payload: {'id': rideId});
print(response);
print('2140');
print('2176');
return jsonDecode(response)['data'];
}
@@ -2189,21 +2186,16 @@ class MapPassengerController extends GetxController {
var response = jsonDecode(res);
Log.print('getUpdatedRideForDriverApply: $response');
driverId = response['data']['driver_id'];
driverPhone =
EncryptionHelper.instance.decryptData(response['data']['phone']);
driverPhone = (response['data']['phone']);
driverCarMake = response['data']['make'];
model = response['data']['model'];
colorHex = response['data']['color_hex'];
carColor = response['data']['color'];
make = response['data']['make'];
licensePlate =
EncryptionHelper.instance.decryptData(response['data']['car_plate']);
passengerName = EncryptionHelper.instance
.decryptData(response['data']['passengerName']);
driverName = EncryptionHelper.instance
.decryptData(response['data']['driverName'].toString());
driverToken =
EncryptionHelper.instance.decryptData(response['data']['token']);
licensePlate = (response['data']['car_plate']);
passengerName = (response['data']['passengerName']);
driverName = (response['data']['driverName'].toString());
driverToken = (response['data']['token']);
// Log.print('driverToken updated: $driverToken');
carYear = response['data']['year'];
driverRate = response['data']['ratingDriver'].toString();
@@ -2456,10 +2448,9 @@ class MapPassengerController extends GetxController {
latitude <= maxLatitude &&
longitude >= minLongitude &&
longitude <= maxLongitude) {
box.write(BoxName.serverChosen,
EncryptionHelper.instance.decryptData(locationData['server_link']));
box.write(BoxName.serverChosen, (locationData['server_link']));
// Log.print(
// 'locationData----server_link: ${EncryptionHelper.instance.decryptData(locationData['server_link'])}');
// 'locationData----server_link: ${(locationData['server_link'])}');
return locationData['name'];
}
}
@@ -2614,7 +2605,7 @@ class MapPassengerController extends GetxController {
_getIconForCar(json),
);
driversToken.add(EncryptionHelper.instance.decryptData(json['token']));
driversToken.add((json['token']));
}
// Add fake car markers
@@ -2926,8 +2917,7 @@ class MapPassengerController extends GetxController {
Get.back();
}));
} else if (res1['status'] == 'success') {
var tokenParent =
EncryptionHelper.instance.decryptData(res1['data'][0]['token']);
var tokenParent = (res1['data'][0]['token']);
Get.snackbar("The invitation was sent successfully".tr, '',
backgroundColor: AppColor.greenColor);
Get.find<FirebaseMessagesController>().sendNotificationToPassengerToken(
@@ -5178,8 +5168,7 @@ class MapPassengerController extends GetxController {
.sendNotificationToDriverMAP(
'OrderVIP',
rideId.toString(),
EncryptionHelper.instance
.decryptData(driver['token'].toString()),
(driver['token'].toString()),
[
id,
rideId,
@@ -5187,17 +5176,13 @@ class MapPassengerController extends GetxController {
passengerLocation.latitude.toString(),
startNameAddress.toString(),
passengerLocation.longitude.toString(),
EncryptionHelper.instance
.decryptData(
box.read(BoxName.name).toString().split(' ')[0])
.toString(),
(box.read(BoxName.name).toString().split(' ')[0]).toString(),
box.read(BoxName.passengerID).toString(),
box.read(BoxName.phone).toString(),
box.read(BoxName.email).toString(),
box.read(BoxName.passengerPhotoUrl).toString(),
box.read(BoxName.tokenFCM).toString(),
EncryptionHelper.instance
.decryptData(driver['token'].toString()),
(driver['token'].toString()),
],
'order.wav');
if (response['message'] == "Trip updated successfully") {

7
lib/controller/home/profile/invit_controller.dart
View File

@@ -179,9 +179,9 @@ Download the Tripz app now and enjoy your ride!
int.parse(driverInvitationDataToPassengers[index]['countOfInvitDriver']
.toString()) <
2
? '${'When'.tr} ${EncryptionHelper.instance.decryptData(driverInvitationDataToPassengers[index]['passengerName'].toString())} ${"complete, you can claim your gift".tr} '
? '${'When'.tr} ${(driverInvitationDataToPassengers[index]['passengerName'].toString())} ${"complete, you can claim your gift".tr} '
: 'You deserve the gift'.tr,
'${EncryptionHelper.instance.decryptData(driverInvitationDataToPassengers[index]['passengerName'].toString())} ${driverInvitationDataToPassengers[index]['countOfInvitDriver'].toString()} / 2 ${'Trip'.tr}',
'${(driverInvitationDataToPassengers[index]['passengerName'].toString())} ${driverInvitationDataToPassengers[index]['countOfInvitDriver'].toString()} / 2 ${'Trip'.tr}',
() async {
if (int.parse(driverInvitationDataToPassengers[index]
['countOfInvitDriver']
@@ -270,8 +270,7 @@ Download the Tripz app now and enjoy your ride!
var response =
await CRUD().post(link: AppLink.addInvitationPassenger, payload: {
"driverId": box.read(BoxName.passengerID),
"inviterPassengerPhone":
EncryptionHelper.instance.encryptData('+2$phoneNumber')
"inviterPassengerPhone": ('+2$phoneNumber')
});
if (response != 'failure') {

6
lib/controller/home/vip_waitting_page.dart
View File

@@ -287,11 +287,7 @@ class VipWaittingPage extends StatelessWidget {
? MyElevatedButton(
title: "Click here to begin your trip\n\nGood luck, "
.tr +
EncryptionHelper.instance
.decryptData(box
.read(BoxName.name)
.toString()
.split(' ')[0])
(box.read(BoxName.name).toString().split(' ')[0])
.toString(),
kolor: AppColor.greenColor,
onPressed: () {