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

1/24/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-01-24 01:58:52 +03:00
parent 8aaca3630d
commit 1eab187076
13 changed files with 299 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,9 +213,7 @@ class FirebaseMessagesController extends GetxController {
'notification': <String, dynamic>{
'title': title,
'body': body,
'sound': Platform.isAndroid
? 'android/app/src/main/res/raw/tone1.mp3'
: 'tone2.wav'
'sound': 'tone2.wav'
},
'priority': 'high',
'data': <String, dynamic>{
@@ -273,9 +271,7 @@ class FirebaseMessagesController extends GetxController {
'notification': <String, dynamic>{
'title': title,
'body': body,
'sound': Platform.isAndroid
? 'android/app/src/main/res/raw/tone1.mp3'
: 'tone2.wav'
'sound': 'tone2.wav'
},
'data': {
'passengerList': map,
@@ -312,7 +308,7 @@ class FirebaseMessagesController extends GetxController {
'notification': <String, dynamic>{
'title': title,
'body': body,
'sound': Platform.isAndroid ? 'tone2' : 'tone2.wav'
'sound': 'tone2.wav'
},
'data': <String, dynamic>{
'click_action': 'FLUTTER_NOTIFICATION_CLICK',
@@ -352,9 +348,7 @@ class FirebaseMessagesController extends GetxController {
'title': title,
'body': body,
// 'sound': 'tone2.wav',
'sound': Platform.isAndroid
? 'android/app/src/main/res/raw/tone1.mp3'
: 'tone2.wav'
'sound': 'order.wav'
},
'data': {
'DriverList': data,

5
lib/controller/functions/location_controller.dart
View File

@@ -15,7 +15,7 @@ class LocationController extends GetxController {
late Location location;
bool isLoading = false;
bool isActive = false;
LatLng myLocation = const LatLng(32.3, 36.3);
late LatLng myLocation;
String totalPoints = '0';
LocationData? get currentLocation => _currentLocation;
Timer? _locationTimer;
@@ -24,9 +24,10 @@ class LocationController extends GetxController {
void onInit() async {
super.onInit();
location = Location();
getLocation();
// myLocation=getLocation();
totalPoints = Get.find<CaptainWalletController>().totalPoints;
getLocation();
}
void startLocationUpdates() async {

14
lib/controller/home/captin/home_captain_controller.dart
View File

@@ -27,7 +27,7 @@ class HomeCaptainController extends GetxController {
String totalMoneyInSEFER = '0';
String totalDurationToday = '0';
Timer? timer;
late LatLng myLocation;
late LatLng myLocation = const LatLng(32, 36);
String totalPoints = '0';
String countRefuse = '0';
bool mapType = false;
@@ -179,11 +179,19 @@ class HomeCaptainController extends GetxController {
timer?.cancel();
}
getlocation() async {
isLoading = true;
print('isLoading $isLoading');
update();
await Get.find<LocationController>().getLocation();
isLoading = false;
update();
}
@override
void onInit() async {
await addToken();
// await Get.find<LocationController>().getLocation();
await getlocation();
onButtonSelected();
getPaymentToday();
getAllPayment();

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

@@ -26,6 +26,9 @@ class MapDriverController extends GetxController {
List dataDestination = [];
LatLngBounds? boundsData;
BitmapDescriptor carIcon = BitmapDescriptor.defaultMarker;
BitmapDescriptor passengerIcon = BitmapDescriptor.defaultMarker;
BitmapDescriptor startIcon = BitmapDescriptor.defaultMarker;
BitmapDescriptor endIcon = BitmapDescriptor.defaultMarker;
final List<LatLng> polylineCoordinates = [];
final List<LatLng> polylineCoordinatesDestination = [];
List<Polyline> polyLines = [];
@@ -75,6 +78,8 @@ class MapDriverController extends GetxController {
String? mapAPIKEY;
final zones = <Zone>[];
String canelString = 'yet';
late LatLng latLngpassengerLocation;
late LatLng latLngPassengerDestination;
void onMapCreated(GoogleMapController controller) async {
myLocation = Get.find<LocationController>().location as LatLng;
@@ -229,6 +234,8 @@ class MapDriverController extends GetxController {
'driverID': box.read(BoxName.driverID).toString(),
});
var d = jsonDecode(res);
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 18));
update();
print('...................');
print(d);
print('...................');
@@ -337,17 +344,55 @@ class MapDriverController extends GetxController {
}
void addCustomCarIcon() {
ImageConfiguration config = const ImageConfiguration(
size: Size(20, 20),
ImageConfiguration config = ImageConfiguration(
size: const Size(30, 30), devicePixelRatio: Get.pixelRatio
// scale: 1.0,
);
BitmapDescriptor.fromAssetImage(config, 'assets/images/car.png')
BitmapDescriptor.fromAssetImage(config, 'assets/images/car.png',
mipmaps: false)
.then((value) {
carIcon = value;
update();
});
}
void addCustomStartIcon() async {
// Create the marker with the resized image
ImageConfiguration config = ImageConfiguration(
size: const Size(30, 30), devicePixelRatio: Get.pixelRatio);
BitmapDescriptor.fromAssetImage(config, 'assets/images/A.png',
mipmaps: false)
.then((value) {
startIcon = value;
update();
});
}
void addCustomEndIcon() {
ImageConfiguration config = ImageConfiguration(
size: const Size(30, 30), devicePixelRatio: Get.pixelRatio);
BitmapDescriptor.fromAssetImage(config, 'assets/images/b.png',
mipmaps: false)
.then((value) {
endIcon = value;
update();
});
}
void addCustomPassengerIcon() {
ImageConfiguration config = ImageConfiguration(
size: const Size(30, 30), devicePixelRatio: Get.pixelRatio
// scale: 1.0,
);
BitmapDescriptor.fromAssetImage(config, 'assets/images/picker.png',
mipmaps: false)
.then((value) {
passengerIcon = value;
update();
});
}
getMap(String origin, destination) async {
isLoading = false;
@@ -384,7 +429,7 @@ class MapDriverController extends GetxController {
width: 10,
color: AppColor.blueColor,
);
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 14));
polyLines.add(polyline);
// rideConfirm = false;
update();
@@ -406,7 +451,7 @@ class MapDriverController extends GetxController {
polylineCoordinatesDestination.add(LatLng(lat, lng));
}
if (polyLinesDestination.isNotEmpty) {
clearPolyline();
// clearPolyline();
var polyline = Polyline(
polylineId: PolylineId(response["routes"][0]["summary"]),
points: polylineCoordinatesDestination,
@@ -462,6 +507,19 @@ class MapDriverController extends GetxController {
step2 = Get.arguments['step2'];
step3 = Get.arguments['step3'];
step4 = Get.arguments['step4'];
var coords = passengerLocation.split(',');
var coordDestination = passengerDestination.split(',');
// Parse to double
double latPassengerLocation = double.parse(coords[0]);
double lngPassengerLocation = double.parse(coords[1]);
double latPassengerDestination = double.parse(coordDestination[0]);
double lngPassengerDestination = double.parse(coordDestination[1]);
latLngpassengerLocation =
LatLng(latPassengerLocation, lngPassengerLocation);
latLngPassengerDestination =
LatLng(latPassengerDestination, lngPassengerDestination);
String lat = Get.find<LocationController>().myLocation.latitude.toString();
String lng = Get.find<LocationController>().myLocation.longitude.toString();
String origin = '$lat,$lng';
@@ -476,6 +534,9 @@ class MapDriverController extends GetxController {
)
: await getMapDestination(passengerLocation, passengerDestination);
addCustomCarIcon();
addCustomPassengerIcon();
addCustomStartIcon();
addCustomEndIcon();
// updateMarker();
startTimerToShowPassengerInfoWindowFromDriver();
// cancelCheckRidefromPassenger();

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

@@ -23,6 +23,7 @@ import '../../views/widgets/elevated_btn.dart';
import '../firebase/firbase_messge.dart';
import '../functions/crud.dart';
import '../functions/launch.dart';
import '../functions/location_controller.dart';
import '../functions/secure_storage.dart';
import '../payment/payment_controller.dart';
@@ -59,7 +60,7 @@ class MapPassengerController extends GetxController {
LatLngBounds? boundsdata;
List<Marker> markers = [];
List<Polyline> polyLines = [];
late LatLng myLocation;
late LatLng passengerLocation = const LatLng(32, 34);
late LatLng newMyLocation = const LatLng(32.115295, 36.064773);
late LatLng newStartPointLocation = const LatLng(32.115295, 36.064773);
late LatLng newPointLocation0 = const LatLng(32.115295, 36.064773);
@@ -205,8 +206,8 @@ class MapPassengerController extends GetxController {
currentLocationToFormPlaces = true;
currentLocationString = 'Waiting for your location'.tr;
await getLocation();
currentLocationString = myLocation.toString();
newStartPointLocation = myLocation;
currentLocationString = passengerLocation.toString();
newStartPointLocation = passengerLocation;
update();
}
@@ -215,6 +216,7 @@ class MapPassengerController extends GetxController {
clearPolyline();
isWayPointStopsSheetUtilGetMap = false;
durationToRide = 0;
distanceOfDestnation = 0;
wayPointSheetHeight = 0;
for (var i = 0; i < Get.find<WayPointController>().wayPoints.length; i++) {
if (placesCoordinate[i + 1].toString() != '') {
@@ -374,7 +376,7 @@ class MapPassengerController extends GetxController {
// Format the message.
String message =
'Hi! This is ${box.read(BoxName.name)}. I am using ${box.read(AppInformation.appName)} to ride with ${dataCarsLocationByPassenger['message'][carsOrder]['first_name'].toString()} as the driver. ${dataCarsLocationByPassenger['message'][carsOrder]['first_name'].toString()} is driving a ${dataCarsLocationByPassenger['message'][carsOrder]['model'].toString()} with license plate ${dataCarsLocationByPassenger['message'][carsOrder]['license_plate'].toString()}. I am currently located at $myLocation. If you need to reach me, please contact the driver directly at $driverPhone.';
'Hi! This is ${box.read(BoxName.name)}. I am using ${box.read(AppInformation.appName)} to ride with ${dataCarsLocationByPassenger['message'][carsOrder]['first_name'].toString()} as the driver. ${dataCarsLocationByPassenger['message'][carsOrder]['first_name'].toString()} is driving a ${dataCarsLocationByPassenger['message'][carsOrder]['model'].toString()} with license plate ${dataCarsLocationByPassenger['message'][carsOrder]['license_plate'].toString()}. I am currently located at $passengerLocation. If you need to reach me, please contact the driver directly at $driverPhone.';
// Launch the URL to send the SMS.
launchCommunication('sms', to, message);
@@ -387,7 +389,7 @@ class MapPassengerController extends GetxController {
// Format the message.
String message =
'Hi! This is ${box.read(BoxName.name)}.\n I am using ${box.read(AppInformation.appName)} to ride with ${dataCarsLocationByPassenger['message'][carsOrder]['first_name'].toString()} as the driver. ${dataCarsLocationByPassenger['message'][carsOrder]['first_name'].toString()} \nis driving a ${dataCarsLocationByPassenger['message'][carsOrder]['model'].toString()}\n with license plate ${dataCarsLocationByPassenger['message'][carsOrder]['license_plate'].toString()}.\n I am currently located at $myLocation.\n If you need to reach me, please contact the driver directly at\n\n $driverPhone.';
'Hi! This is ${box.read(BoxName.name)}.\n I am using ${box.read(AppInformation.appName)} to ride with ${dataCarsLocationByPassenger['message'][carsOrder]['first_name'].toString()} as the driver. ${dataCarsLocationByPassenger['message'][carsOrder]['first_name'].toString()} \nis driving a ${dataCarsLocationByPassenger['message'][carsOrder]['model'].toString()}\n with license plate ${dataCarsLocationByPassenger['message'][carsOrder]['license_plate'].toString()}.\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('whatsapp', to, message);
@@ -727,8 +729,8 @@ class MapPassengerController extends GetxController {
Future getCarsLocationByPassenger() async {
// if (rideConfirm == false) {
carsLocationByPassenger = [];
LatLngBounds bounds =
calculateBounds(myLocation.latitude, myLocation.longitude, 8000);
LatLngBounds bounds = calculateBounds(
passengerLocation.latitude, passengerLocation.longitude, 8000);
print(
'Southwest: ${bounds.southwest.latitude}, ${bounds.southwest.longitude}');
print(
@@ -852,7 +854,7 @@ class MapPassengerController extends GetxController {
shouldFetch = false;
isPassengerChosen = false;
isCashConfirmPageShown = false;
totalStepDurations = 0;
// totalStepDurations = 0;
isCashSelectedBeforeConfirmRide = false;
timeToPassengerFromDriverAfterApplied = 0;
changeCancelRidePageShow();
@@ -883,7 +885,9 @@ class MapPassengerController extends GetxController {
isPassengerChosen = false;
isCashSelectedBeforeConfirmRide = false;
isPickerShown = false;
totalStepDurations = 0;
haveSteps = false;
isMarkersShown = false;
// totalStepDurations = 0;
timeToPassengerFromDriverAfterApplied = 0;
update();
} else {
@@ -900,10 +904,12 @@ class MapPassengerController extends GetxController {
rideConfirm = false;
shouldFetch = false;
isPassengerChosen = false;
haveSteps = false;
isMarkersShown = false;
isCashConfirmPageShown = false;
isCashSelectedBeforeConfirmRide = false;
timeToPassengerFromDriverAfterApplied = 0;
totalStepDurations = 0;
// totalStepDurations = 0;
changeCancelRidePageShow();
clearPolyline();
remainingTime = 0;
@@ -1040,7 +1046,7 @@ class MapPassengerController extends GetxController {
Future getPlaces() async {
var url =
// '${AppLink.googleMapsLink}place/nearbysearch/json?location=${mylocation.longitude}&radius=25000&language=ar&keyword=&key=${placeController.text}${AK.mapAPIKEY}';
'${AppLink.googleMapsLink}place/nearbysearch/json?keyword=${placeDestinationController.text}&location=${myLocation.latitude},${myLocation.longitude}&radius=50000&language=en&key=${AK.mapAPIKEY.toString()}';
'${AppLink.googleMapsLink}place/nearbysearch/json?keyword=${placeDestinationController.text}&location=${passengerLocation.latitude},${passengerLocation.longitude}&radius=50000&language=en&key=${AK.mapAPIKEY.toString()}';
var response = await CRUD().getGoogleApi(link: url, payload: {});
@@ -1052,7 +1058,7 @@ class MapPassengerController extends GetxController {
Future getPlacesStart() async {
var url =
// '${AppLink.googleMapsLink}place/nearbysearch/json?location=${mylocation.longitude}&radius=25000&language=ar&keyword=&key=${placeController.text}${AK.mapAPIKEY}';
'${AppLink.googleMapsLink}place/nearbysearch/json?keyword=${placeStartController.text}&location=${myLocation.latitude},${myLocation.longitude}&radius=50000&language=en&key=${AK.mapAPIKEY.toString()}';
'${AppLink.googleMapsLink}place/nearbysearch/json?keyword=${placeStartController.text}&location=${passengerLocation.latitude},${passengerLocation.longitude}&radius=50000&language=en&key=${AK.mapAPIKEY.toString()}';
var response = await CRUD().getGoogleApi(link: url, payload: {});
@@ -1063,7 +1069,7 @@ class MapPassengerController extends GetxController {
Future getPlacesListsWayPoint(int index) async {
var url =
'${AppLink.googleMapsLink}place/nearbysearch/json?keyword=${wayPoint0Controller.text}&location=${myLocation.latitude},${myLocation.longitude}&radius=50000&language=en&key=${AK.mapAPIKEY.toString()}';
'${AppLink.googleMapsLink}place/nearbysearch/json?keyword=${wayPoint0Controller.text}&location=${passengerLocation.latitude},${passengerLocation.longitude}&radius=50000&language=en&key=${AK.mapAPIKEY.toString()}';
var response = await CRUD().getGoogleApi(link: url, payload: {});
@@ -1176,7 +1182,7 @@ class MapPassengerController extends GetxController {
// Get the current location
LocationData _locationData = await location.getLocation();
myLocation =
passengerLocation =
(_locationData.latitude != null && _locationData.longitude != null
? LatLng(_locationData.latitude!, _locationData.longitude!)
: null)!;
@@ -1209,10 +1215,12 @@ class MapPassengerController extends GetxController {
GoogleMapController? mapController;
void onMapCreated(GoogleMapController controller) {
// myLocation = Get.find<LocationController>().location as LatLng;
// myLocation = myLocation;
mapController = controller;
controller.getVisibleRegion();
controller.animateCamera(
CameraUpdate.newLatLng(myLocation),
CameraUpdate.newLatLng(passengerLocation),
);
update();
}
@@ -1275,7 +1283,7 @@ class MapPassengerController extends GetxController {
// Update the map with the new markers
mapController?.animateCamera(CameraUpdate.newLatLng(
LatLng(myLocation.latitude, myLocation.longitude)));
LatLng(passengerLocation.latitude, passengerLocation.longitude)));
}
String durationByPassenger = '';
@@ -1288,6 +1296,7 @@ class MapPassengerController extends GetxController {
if (polyLines.isEmpty || data.isEmpty) {
if (rideConfirm == false) {
double nearestDistance = double.infinity;
if (dataCarsLocationByPassenger != 'failure') {
if (dataCarsLocationByPassenger['message'].length > 0) {
for (var i = 0;
i < dataCarsLocationByPassenger['message'].length;
@@ -1314,8 +1323,9 @@ class MapPassengerController extends GetxController {
update();
// Make API request to get exact distance and duration
String apiUrl =
'${AppLink.googleMapsLink}distancematrix/json?destinations=${carLocation['latitude']},${carLocation['longitude']}&origins=${myLocation.latitude},${myLocation.longitude}&units=metric&key=${AK.mapAPIKEY}';
var response = await CRUD().getGoogleApi(link: apiUrl, payload: {});
'${AppLink.googleMapsLink}distancematrix/json?destinations=${carLocation['latitude']},${carLocation['longitude']}&origins=${passengerLocation.latitude},${passengerLocation.longitude}&units=metric&key=${AK.mapAPIKEY}';
var response =
await CRUD().getGoogleApi(link: apiUrl, payload: {});
if (response['status'] == "OK") {
var data = response;
// Extract distance and duration from the response and handle accordingly
@@ -1358,6 +1368,7 @@ class MapPassengerController extends GetxController {
}
}
}
}
print(nearestCar!.distance);
print(nearestCar!.duration);
print(nearestCar!.latitude);
@@ -1369,6 +1380,11 @@ class MapPassengerController extends GetxController {
getMap(String origin, destination) async {
await getCarsLocationByPassenger();
// print(carsLocationByPassenger);
var coordDestination = destination.split(',');
double latPassengerDestination = double.parse(coordDestination[0]);
double lngPassengerDestination = double.parse(coordDestination[1]);
myDestination = LatLng(latPassengerDestination, lngPassengerDestination);
isLoading = false;
update();
var url =
@@ -1405,17 +1421,23 @@ class MapPassengerController extends GetxController {
// Animate the camera to the adjusted bounds
if (distanceOfDestnation <= 5) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 14));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newStartPointLocation, 14));
} else if (distanceOfDestnation > 5 && distanceOfDestnation <= 8) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 13));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newStartPointLocation, 13));
} else if (distanceOfDestnation > 8 && distanceOfDestnation < 16) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 12));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newStartPointLocation, 12));
} else if (distanceOfDestnation >= 16 && distanceOfDestnation < 30) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 11));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newStartPointLocation, 11));
} else if (distanceOfDestnation >= 30 && distanceOfDestnation < 100) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 10));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newStartPointLocation, 10));
} else if (distanceOfDestnation >= 100) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 7));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newStartPointLocation, 7));
}
if (polyLines.isNotEmpty) {
clearPolyline();
@@ -1434,25 +1456,30 @@ class MapPassengerController extends GetxController {
}
}
int totalStepDurations = 0;
getMapPoints(String origin, String destination, int index) async {
double distanceOfDestnation = 0;
bool haveSteps = false;
getMapPoints(String originSteps, String destinationSteps, int index) async {
isWayPointStopsSheetUtilGetMap = false;
haveSteps = true;
await getCarsLocationByPassenger();
isLoading = false;
// isLoading = true;
update();
var url =
('${AppLink.googleMapsLink}directions/json?&language=en&avoid=tolls|ferries&destination=$destination&origin=$origin&key=${AK.mapAPIKEY}');
('${AppLink.googleMapsLink}directions/json?&language=en&avoid=tolls|ferries&destination=$destinationSteps&origin=$originSteps&key=${AK.mapAPIKEY}');
// print(url);
var response = await CRUD().getGoogleApi(link: url, payload: {});
data = response['routes'][0]['legs'];
// print(data);
isLoading = false;
// isLoading = false;
int durationToRide0 = data[0]['duration']['value'];
durationToRide = durationToRide + durationToRide0;
print('durationToRide is ${data[0]['duration']['value']}');
print('totalStepDurations is $durationToRide');
double distanceToRide0 = (data[0]['distance']['value']) / 1000;
distanceOfDestnation = distanceOfDestnation + distanceToRide0;
print('distanceToRide is $distanceToRide0');
print('totalStepdistance is $distanceOfDestnation');
update();
final points =
decodePolyline(response["routes"][0]["overview_polyline"]["points"]);
@@ -1474,22 +1501,28 @@ class MapPassengerController extends GetxController {
// Calculate the zoom level based on the distance and screen size
double distanceOfDestnation =
getDistanceFromText(data[0]['distance']['text']);
// double distanceOfDestnation =
// getDistanceFromText(data[0]['distance']['text']);
// Animate the camera to the adjusted bounds
if (distanceOfDestnation <= 5) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 15));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newPointLocation0, 14));
} else if (distanceOfDestnation > 5 && distanceOfDestnation <= 8) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 14));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newPointLocation0, 13));
} else if (distanceOfDestnation > 8 && distanceOfDestnation < 16) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 13));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newPointLocation0, 12));
} else if (distanceOfDestnation >= 16 && distanceOfDestnation < 30) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 11));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newPointLocation0, 8));
} else if (distanceOfDestnation >= 30 && distanceOfDestnation < 100) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 9));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newPointLocation0, 6));
} else if (distanceOfDestnation >= 100) {
mapController!.animateCamera(CameraUpdate.newLatLngZoom(myLocation, 7));
mapController!
.animateCamera(CameraUpdate.newLatLngZoom(newPointLocation0, 5));
}
if (polyLines.isNotEmpty) {
// clearPolyline();
@@ -1503,7 +1536,7 @@ class MapPassengerController extends GetxController {
polyLines.add(polyline);
rideConfirm = false;
isMarkersShown = true;
// isMarkersShown = true;
update();
}
}

3
lib/controller/home/points_for_rider_controller.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/controller/home/map_passenger_controller.dart';
import '../../constant/api_key.dart';
import '../../constant/links.dart';
@@ -121,7 +122,7 @@ class WayPointController extends GetxController {
void onInit() {
Get.put(LocationController());
addWayPoints();
myLocation = Get.find<LocationController>().myLocation;
myLocation = Get.find<MapPassengerController>().passengerLocation;
super.onInit();
}
}

12
lib/views/home/Captin/home_captain/home_captin.dart
View File

@@ -3,6 +3,7 @@ import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:ride/views/home/Captin/home_captain/drawer_captain.dart';
import 'package:ride/views/widgets/mycircular.dart';
import '../../../../constant/colors.dart';
import '../../../../constant/info.dart';
@@ -19,14 +20,14 @@ import '../../../widgets/circle_container.dart';
class HomeCaptain extends StatelessWidget {
HomeCaptain({super.key});
final LocationController locationController = LocationController();
final LocationController locationController = Get.put(LocationController());
// final HomeCaptainController homeCaptainController = HomeCaptainController();
// final LocationController locationController=LocationController();
@override
Widget build(BuildContext context) {
Get.put(OrderRequestController());
Get.put(HomeCaptainController());
// Get.put(HomeCaptainController());
Get.put(LocationController());
print('local is ${Get.find<LocaleController>().language!.countryCode}');
return Scaffold(
appBar: AppBar(
@@ -64,7 +65,9 @@ class HomeCaptain extends StatelessWidget {
body: Stack(
children: [
GetBuilder<HomeCaptainController>(
builder: (controller) => GoogleMap(
builder: (controller) => controller.isLoading
? const MyCircularProgressIndicator()
: GoogleMap(
onMapCreated: controller.onMapCreated,
// cameraTargetBounds: CameraTargetBounds(controller.boundsdata),
minMaxZoomPreference: const MinMaxZoomPreference(6, 18),
@@ -74,7 +77,8 @@ class HomeCaptain extends StatelessWidget {
zoom: 15,
),
mapType: controller.mapType ? MapType.satellite : MapType.normal,
mapType:
controller.mapType ? MapType.satellite : MapType.normal,
myLocationButtonEnabled: true,
// liteModeEnabled: true, tiltGesturesEnabled: false,

25
lib/views/home/Captin/mapDriverWidgets/google_driver_map_page.dart
View File

@@ -25,10 +25,10 @@ class GoogleDriverMap extends StatelessWidget {
target: locationController.myLocation,
zoom: 15,
),
// onCameraMove: (position) {
// locationController.myLocation = position.target;
// print(position);
// },
onCameraMove: (position) {
locationController.myLocation = position.target;
print(position);
},
minMaxZoomPreference: const MinMaxZoomPreference(6, 18),
buildingsEnabled: true,
mapToolbarEnabled: true,
@@ -40,7 +40,7 @@ class GoogleDriverMap extends StatelessWidget {
endCap: Cap.buttCap,
startCap: Cap.buttCap,
visible: true,
polylineId: const PolylineId('route'),
polylineId: const PolylineId('route1'),
points: controller.polylineCoordinates,
color: AppColor.greenColor,
width: 5,
@@ -64,11 +64,18 @@ class GoogleDriverMap extends StatelessWidget {
position: locationController.myLocation,
draggable: true,
icon: controller.carIcon,
infoWindow: const InfoWindow(
title: 'Time',
// snippet: controller.durationFromDriverToPassenger
// .toString(),
),
Marker(
markerId: MarkerId('start'.tr),
position: controller.latLngpassengerLocation,
draggable: true,
icon: controller.startIcon,
),
Marker(
markerId: MarkerId('end'.tr),
position: controller.latLngPassengerDestination,
draggable: true,
icon: controller.endIcon,
),
},
),

2
lib/views/home/map_widget.dart/form_search_places.dart
View File

@@ -82,7 +82,7 @@ GetBuilder<MapPassengerController> formSearchPlaces() {
controller.changeHeightPlaces();
controller.myLocation = controller.newMyLocation;
controller.passengerLocation = controller.newMyLocation;
controller.convertHintTextDestinationNewPlaces(index);
controller.placesDestination = [];

4
lib/views/home/map_widget.dart/form_serch_multiy_point.dart
View File

@@ -87,9 +87,9 @@ GetBuilder<MapPassengerController> formSearchPlaces(int index) {
if (controller.currentLocationToFormPlacesAll[index] ==
true) {
controller.newStartPointLocation =
controller.myLocation;
controller.passengerLocation;
} else {
controller.myLocation =
controller.passengerLocation =
controller.newStartPointLocation;
}

65
lib/views/home/map_widget.dart/google_map_passenger_widget.dart
View File

@@ -37,7 +37,7 @@ class GoogleMapPassengerWidget extends StatelessWidget {
controller.clearPolyline();
if (controller.dataCarsLocationByPassenger != null) {
await controller.getMap(
'${controller.myLocation.latitude},${controller.myLocation.longitude}',
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${argument.latitude.toString()},${argument.longitude.toString()}');
Get.back();
@@ -131,7 +131,7 @@ class GoogleMapPassengerWidget extends StatelessWidget {
// controller.bottomSheet();
},
initialCameraPosition: CameraPosition(
target: controller.myLocation,
target: controller.passengerLocation,
zoom: 15,
),
markers: {
@@ -154,43 +154,44 @@ class GoogleMapPassengerWidget extends StatelessWidget {
position: controller.newStartPointLocation,
draggable: true,
icon: controller.startIcon,
infoWindow: const InfoWindow(
title: 'Time',
anchor: Offset(0.5, 0.5), // Adjust the anchor as needed
// snippet: controller.durationFromDriverToPassenger
// .toString(),
),
onDragEnd: (value) {
print(value);
},
// infoWindow: InfoWindow(title: 'my location'.tr),
),
if (controller.isMarkersShown)
Marker(
markerId: MarkerId('Destination'.tr),
position: controller.newMyLocation,
position: controller.myDestination,
draggable: true,
icon: controller.endIcon,
infoWindow: InfoWindow(
anchor: const Offset(0.5, 0),
title: 'Time',
snippet: controller.durationByPassenger.toString()
// snippet: controller.durationFromDriverToPassenger
// .toString(),
),
onDragEnd: (value) {
print(value);
},
// infoWindow: InfoWindow(title: 'my location'.tr),
if (controller.haveSteps)
Marker(
markerId: MarkerId('StartSteps'.tr),
position: LatLng(
double.parse(
controller.placesCoordinate[0].split(',')[0]),
double.parse(
controller.placesCoordinate[0].split(',')[1])),
draggable: true,
icon: controller.startIcon,
),
if (controller.haveSteps)
Marker(
markerId: MarkerId('EndSteps'.tr),
position: controller.newPointLocation4 == ''
? LatLng(
double.parse(
controller.placesCoordinate[3].split(',')[0]),
double.parse(
controller.placesCoordinate[3].split(',')[1]))
: controller.newPointLocation3 == ''
? LatLng(
double.parse(controller.placesCoordinate[2]
.split(',')[0]),
double.parse(controller.placesCoordinate[2]
.split(',')[1]))
: controller.newPointLocation2,
draggable: true,
icon: controller.endIcon,
),
// Marker(
// markerId: MarkerId('Target'.tr),
// position: controller.myDestination,
// draggable: true,
// onDragEnd: (v) {
// print(v);
// },
// ),
},
polylines: {
Polyline(
@@ -283,7 +284,7 @@ class GoogleMapPassengerWidget extends StatelessWidget {
circles: <Circle>{
Circle(
circleId: const CircleId('circle_id'),
center: controller.myLocation,
center: controller.passengerLocation,
radius: 100,
fillColor: Colors.blue.withOpacity(0.3),
strokeColor: Colors.blue,

2
lib/views/home/map_widget.dart/main_bottom_Menu_map.dart
View File

@@ -348,7 +348,7 @@ class FavioratePlacesDialogu extends StatelessWidget {
Get.back();
await controller.getLocation();
await controller.getMap(
'${controller.myLocation.latitude},${controller.myLocation.longitude}',
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${favoritePlaces[index]['latitude']},${favoritePlaces[index]['longitude']}',
);
// controller.changePickerShown();

4
lib/views/home/map_widget.dart/picker_animation_container.dart
View File

@@ -135,7 +135,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
onPressed: () async {
await controller
.getMap(
'${controller.myLocation.latitude},${controller.myLocation.longitude}',
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${favoritePlaces[index]['latitude']},${favoritePlaces[index]['longitude']}',
);
controller
@@ -193,7 +193,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
title: 'Go to this Target'.tr,
onPressed: () async {
await controller.getMap(
'${controller.myLocation.latitude},${controller.myLocation.longitude}',
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${controller.newMyLocation.latitude},${controller.newMyLocation.longitude}',
);
controller.changePickerShown();