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

5/23/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-05-23 02:10:42 +03:00
parent da6741e24e
commit 3ff0eace3f
10 changed files with 127 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/controller/auth/login_controller.dart
View File

@@ -66,28 +66,32 @@ class LoginController extends GetxController {
if (jsonDecoeded['status'] == 'success' &&
jsonDecoeded['data'][0]['verified'] == 1) {
//
box.write(BoxName.isVerified, 'true');
box.write(BoxName.email, jsonDecoeded['data'][0]['email']);
Get.offAll(() => const MapPagePassenger());
print(box.read(BoxName.tokenFCM));
var token = await CRUD().get(link: AppLink.getTokens, payload: {
'passengerID': box.read(BoxName.passengerID).toString()
});
print(token);
print(box.read(BoxName.tokenFCM));
if (token != 'failure') {
if (jsonDecode(token)['data'][0]['token'] !=
box.read(BoxName.tokenFCM)) {
Get.find<FirebaseMessagesController>()
Get.put(FirebaseMessagesController())
.sendNotificationToAnyWithoutData(
'token change',
'change device',
jsonDecode(token)['data'][0]['token'].toString(),
);
await CRUD().post(link: AppLink.addTokens, payload: {
'token': box.read(BoxName.tokenFCM),
'passengerID': box.read(BoxName.passengerID).toString()
}).then((value) => print('cccc'));
}
}
await CRUD().post(link: AppLink.addTokens, payload: {
'token': box.read(BoxName.tokenFCM),
'passengerID': box.read(BoxName.passengerID).toString()
}).then((value) => print('cccc'));
Get.offAll(() => const MapPagePassenger());
} else {
Get.offAll(() => SmsSignupEgypt());
// Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
@@ -238,7 +242,7 @@ class LoginController extends GetxController {
}
}
print('permisson is ${permissionGranted.toString()}');
if ('PermissionStatus.granted' == permissionGranted.toString()) {
if (permissionGranted.toString() == 'PermissionStatus.granted') {
box.write(BoxName.locationPermission, 'true');
}
update();

1
lib/controller/auth/register_controller.dart
View File

@@ -117,6 +117,7 @@ class RegisterController extends GetxController {
);
if (jsonDecode(res1)['status'] == 'success') {
box.write(BoxName.isVerified, 'true');
box.write(BoxName.phone, '+2${phoneController.text}');
Get.offAll(const MapPagePassenger());
}
} else {

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

@@ -143,6 +143,8 @@ class FirebaseMessagesController extends GetxController {
.showNotification('Promo', 'Show latest promo'.tr, 'promo');
Get.to(const PromosPassengerPage());
} else if (message.notification!.title! == 'token change') {
NotificationController()
.showNotification('token change', 'token change', 'cancel');
GoogleSignInHelper.signOut();
} else if (message.notification!.title! == 'DriverIsGoingToPassenger') {
Get.find<MapPassengerController>().isDriverInPassengerWay = true;

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

@@ -889,7 +889,7 @@ class MapPassengerController extends GetxController {
driverPhone =
dataCarsLocationByPassenger['message'][carsOrder]['phone'].toString();
firstName = dataCarsLocationByPassenger['message'][carsOrder]
['first_name']
['driverName']
.toString();
carColor =
dataCarsLocationByPassenger['message'][carsOrder]['color'].toString();
@@ -1002,8 +1002,14 @@ class MapPassengerController extends GetxController {
titleStyle: AppStyle.title,
middleText: 'Please Try anther time '.tr,
middleTextStyle: AppStyle.title.copyWith(color: AppColor.yellowColor),
confirm:
MyElevatedButton(title: 'Ok'.tr, onPressed: () => Get.back()));
confirm: MyElevatedButton(
title: 'Ok'.tr,
onPressed: () {
Get.back();
isSearchingWindow = false;
cancelRide();
update();
}));
}
}
@@ -2449,6 +2455,7 @@ class MapPassengerController extends GetxController {
totalCostPassenger = 20;
totalPassengerSpeed = 20;
totalPassengerComfort = 30;
totalPassengerLady = 30;
totalPassengerMotoDelivery = 18;
} else {
totalPassenger = totalCostPassenger;
@@ -2459,6 +2466,8 @@ class MapPassengerController extends GetxController {
(-1) * (double.parse(box.read(BoxName.passengerWalletTotal)));
totalPassengerComfort = totalPassengerComfort +
(-1) * (double.parse(box.read(BoxName.passengerWalletTotal)));
totalPassengerLady = totalPassengerLady +
(-1) * (double.parse(box.read(BoxName.passengerWalletTotal)));
totalPassengerMotoDelivery = totalPassengerMotoDelivery +
(-1) * (double.parse(box.read(BoxName.passengerWalletTotal)));
update();
@@ -2587,7 +2596,8 @@ class MapPassengerController extends GetxController {
payload: {'passenger_id': box.read(BoxName.passengerID)});
if (res != 'failure') {
print(jsonDecode(res)['message']['rating']);
passengerRate = jsonDecode(res)['message']['rating'] ?? 5;
passengerRate =
double.parse(jsonDecode(res)['message']['rating'].toString());
}
}
@@ -2602,7 +2612,7 @@ class MapPassengerController extends GetxController {
addCustomStartIcon();
addCustomEndIcon();
await getLocation();
await addToken();
// await addToken();
await getKazanPercent();
await getPassengerRate();
await getRideStatusFromStartApp();

2
lib/controller/home/splash_screen_controlle.dart
View File

@@ -50,7 +50,7 @@ class SplashScreenController extends GetxController
? Get.off(() => OnBoardingPage())
: box.read(BoxName.email) != null &&
box.read(BoxName.phone) != null &&
box.read(BoxName.isVerified) != 'true'
box.read(BoxName.isVerified) == 'true'
// ? Get.off(() => const MapPagePassenger())
? await Get.put(LoginController()).loginFromSignInGoogle(
box.read(BoxName.passengerID).toString(),