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

4/7/9

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-04-08 18:22:19 +03:00
parent de4c16b249
commit e59e94a04e
5 changed files with 88 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/constant/box_name.dart
View File

@@ -8,6 +8,7 @@ class BoxName {
static const String carPlate = "carPlate"; static const String carPlate = "carPlate";
static const String statusDriverLocation = "statusDriverLocation"; static const String statusDriverLocation = "statusDriverLocation";
static const String password = "password"; static const String password = "password";
static const String arrivalTime = "arrivalTime";
static const String passwordDriver = "passwordDriver"; static const String passwordDriver = "passwordDriver";
static const String agreeTerms = "agreeTerms"; static const String agreeTerms = "agreeTerms";
static const String addWork = 'addWork'; static const String addWork = 'addWork';

3
lib/controller/home/captin/map_driver_controller.dart
View File

@@ -434,7 +434,8 @@ class MapDriverController extends GetxController {
await CRUD().post(link: AppLink.updateRides, payload: { await CRUD().post(link: AppLink.updateRides, payload: {
'id': rideId, 'id': rideId,
'rideTimeFinish': DateTime.now().toString(), 'rideTimeFinish': DateTime.now().toString(),
'status': 'Finished' 'status': 'Finished',
'price': totalCost,
}); });
print('walletChecked is $walletChecked'); print('walletChecked is $walletChecked');
if (walletChecked == 'true') { if (walletChecked == 'true') {

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

@@ -584,7 +584,7 @@ class MapPassengerController extends GetxController {
DateTime now = DateTime.now(); DateTime now = DateTime.now();
DateTime arrivalTime1 = now.add(Duration(seconds: durationToRide)); DateTime arrivalTime1 = now.add(Duration(seconds: durationToRide));
arrivalTime = DateFormat('hh:mm').format(arrivalTime1); arrivalTime = DateFormat('hh:mm').format(arrivalTime1);
box.write(BoxName.arrivalTime, arrivalTime);
for (int i = 0; i <= durationToRide; i++) { for (int i = 0; i <= durationToRide; i++) {
await Future.delayed(const Duration(seconds: 1)); await Future.delayed(const Duration(seconds: 1));
progressTimerRideBegin = i / durationToRide; progressTimerRideBegin = i / durationToRide;
@@ -659,6 +659,7 @@ class MapPassengerController extends GetxController {
void tripFinishedFromDriver() async { void tripFinishedFromDriver() async {
isRideFinished = true; isRideFinished = true;
rideTimerBegin = false; rideTimerBegin = false;
box.write(BoxName.arrivalTime, '');
remainingTimeTimerRideBegin = 0; remainingTimeTimerRideBegin = 0;
update(); update();
} }
@@ -706,6 +707,9 @@ class MapPassengerController extends GetxController {
print(rideStatusFromStartApp['data']['status']); print(rideStatusFromStartApp['data']['status']);
if (rideStatusFromStartApp['data']['status'] == 'Begin') { if (rideStatusFromStartApp['data']['status'] == 'Begin') {
statusRide = 'Begin'; statusRide = 'Begin';
driverId = rideStatusFromStartApp['data']['driver_id'];
firstName = rideStatusFromStartApp['data']['driverName'];
driverRate = rideStatusFromStartApp['data']['rateDriver'].toString();
statusRideFromStart = true; statusRideFromStart = true;
// DateTime endTime = // DateTime endTime =
// DateTime.parse(rideStatusFromStartApp['data']['endtime']); // DateTime.parse(rideStatusFromStartApp['data']['endtime']);

30
lib/views/home/map_widget.dart/ride_begin_passenger.dart
View File

@@ -29,7 +29,7 @@ class RideBeginPassenger extends StatelessWidget {
bottom: 4, bottom: 4,
child: Container( child: Container(
decoration: AppStyle.boxDecoration, decoration: AppStyle.boxDecoration,
height: controller.rideTimerBegin ? 200 : 0, height: controller.rideTimerBegin ? Get.height * .3 : 0,
// width: 100, // width: 100,
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
@@ -107,6 +107,34 @@ class RideBeginPassenger extends StatelessWidget {
), ),
], ],
), ),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
CircleAvatar(
radius: 30,
backgroundImage: NetworkImage(
// '',
// ),
'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'),
),
Text(
controller.firstName,
style: AppStyle.title,
),
Column(
children: [
Text(
'${controller.driverRate} 📈',
style: AppStyle.title,
),
// Text(
// '${controller.rideStatusFromStartApp['data']['carType']}',
// style: AppStyle.title,
// ),
],
),
],
),
Stack( Stack(
children: [ children: [
// StreamCounter(), // StreamCounter(),

61
lib/views/home/map_widget.dart/ride_from_start_app.dart
View File

@@ -24,7 +24,7 @@ class RideFromStartApp extends StatelessWidget {
bottom: 4, bottom: 4,
child: Container( child: Container(
decoration: AppStyle.boxDecoration1, decoration: AppStyle.boxDecoration1,
height: 200, height: Get.height * .3,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -32,17 +32,58 @@ class RideFromStartApp extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
Text( Container(
'${controller.rideStatusFromStartApp['data']['endtime']} ⏱️', width: Get.width * .15,
style: AppStyle.title, decoration: AppStyle.boxDecoration1,
child: Column(
children: [
Text(
'⏱️',
style: AppStyle.title,
),
Text(
// controller.rideStatusFromStartApp['data']
// ['endtime'],
box.read(BoxName.arrivalTime),
style: AppStyle.title,
),
],
),
), ),
Text( Container(
'${controller.rideStatusFromStartApp['data']['distance']} 📍', width: Get.width * .15,
style: AppStyle.title, decoration: AppStyle.boxDecoration1,
child: Column(
children: [
Text(
'📍',
style: AppStyle.title,
),
Text(
controller.rideStatusFromStartApp['data']
['distance']
.toString(),
style: AppStyle.title,
),
],
),
), ),
Text( Container(
'${controller.rideStatusFromStartApp['data']['price']} 💵', width: Get.width * .15,
style: AppStyle.title, decoration: AppStyle.boxDecoration1,
child: Column(
children: [
Text(
'💵 ',
style: AppStyle.title,
),
Text(
controller.rideStatusFromStartApp['data']
['price'],
style: AppStyle.title,
),
],
),
), ),
], ],
), ),