Initial commit for Intaleq Driver
This commit is contained in:
@@ -204,7 +204,7 @@ GetBuilder<MapDriverController> speedCircle() {
|
||||
? Positioned(
|
||||
// New: تم وضع دائرة السرعة في الأسفل يمينًا
|
||||
bottom: 25,
|
||||
left: 16,
|
||||
left: 3,
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
|
||||
@@ -1,117 +1,3 @@
|
||||
// import 'package:flutter/material.dart';
|
||||
// import 'package:get/get.dart';
|
||||
// import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
|
||||
// import '../../../../controller/functions/location_controller.dart';
|
||||
// import '../../../../controller/home/captin/map_driver_controller.dart';
|
||||
|
||||
// class GoogleDriverMap extends StatelessWidget {
|
||||
// const GoogleDriverMap({
|
||||
// super.key,
|
||||
// required this.locationController,
|
||||
// });
|
||||
|
||||
// final LocationController locationController;
|
||||
|
||||
// @override
|
||||
// Widget build(BuildContext context) {
|
||||
// Get.put(MapDriverController());
|
||||
// return Padding(
|
||||
// padding: const EdgeInsets.all(8.0),
|
||||
// child: GetBuilder<MapDriverController>(
|
||||
// builder: (controller) => Column(
|
||||
// children: [
|
||||
// SizedBox(
|
||||
// height: Get.height * .92,
|
||||
// child: GoogleMap(
|
||||
// onMapCreated: controller.onMapCreated,
|
||||
// zoomControlsEnabled: true,
|
||||
// // initialCameraPosition: CameraPosition(
|
||||
// // target: locationController.myLocation,
|
||||
// // zoom: 13,
|
||||
// // bearing: locationController.heading,
|
||||
// // tilt: 40,
|
||||
// // ),
|
||||
// initialCameraPosition: CameraPosition(
|
||||
// target: locationController.myLocation,
|
||||
// zoom: 17,
|
||||
// bearing: locationController.heading, // استخدام اتجاه السائق
|
||||
// tilt: 60, // زاوية ميل
|
||||
// ),
|
||||
// cameraTargetBounds:
|
||||
// CameraTargetBounds.unbounded, // Allow unrestricted movement
|
||||
// onCameraMove: (position) {
|
||||
// CameraPosition(
|
||||
// target: locationController.myLocation,
|
||||
// zoom: 13,
|
||||
// bearing: locationController.heading,
|
||||
// tilt: 40,
|
||||
// );
|
||||
// //todo
|
||||
// // locationController.myLocation = position.target;
|
||||
// //
|
||||
// // controller.mapController
|
||||
// // ?.animateCamera(CameraUpdate.newCameraPosition(position));
|
||||
// },
|
||||
// minMaxZoomPreference: const MinMaxZoomPreference(8, 15),
|
||||
// myLocationEnabled: true,
|
||||
// myLocationButtonEnabled: true,
|
||||
// compassEnabled: true,
|
||||
// mapType: MapType.terrain,
|
||||
// rotateGesturesEnabled: true,
|
||||
// scrollGesturesEnabled: true,
|
||||
// trafficEnabled: false,
|
||||
// buildingsEnabled: true,
|
||||
// mapToolbarEnabled: true,
|
||||
// fortyFiveDegreeImageryEnabled: true,
|
||||
// zoomGesturesEnabled: true,
|
||||
// polylines: {
|
||||
// Polyline(
|
||||
// zIndex: 2,
|
||||
// geodesic: true,
|
||||
// polylineId: const PolylineId('route1'),
|
||||
// points: controller.polylineCoordinates,
|
||||
// color: const Color.fromARGB(255, 163, 81, 246),
|
||||
// width: 5,
|
||||
// ),
|
||||
// Polyline(
|
||||
// zIndex: 2,
|
||||
// geodesic: true,
|
||||
// polylineId: const PolylineId('route'),
|
||||
// points: controller.polylineCoordinatesDestination,
|
||||
// color: const Color.fromARGB(255, 10, 29, 126),
|
||||
// width: 5,
|
||||
// ),
|
||||
// },
|
||||
// markers: {
|
||||
// Marker(
|
||||
// markerId: MarkerId('MyLocation'.tr),
|
||||
// position: locationController.myLocation,
|
||||
// draggable: true,
|
||||
// icon: controller.carIcon,
|
||||
// rotation: locationController.heading,
|
||||
// ),
|
||||
// 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,
|
||||
// ),
|
||||
// },
|
||||
// ),
|
||||
// ),
|
||||
// ],
|
||||
// ),
|
||||
// ),
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
@@ -179,15 +65,30 @@ class GoogleDriverMap extends StatelessWidget {
|
||||
startCap: Cap.roundCap,
|
||||
endCap: Cap.roundCap,
|
||||
),
|
||||
Polyline(
|
||||
zIndex: 2,
|
||||
// Polyline(
|
||||
// zIndex: 2,
|
||||
|
||||
polylineId: const PolylineId('route'),
|
||||
points: controller.polylineCoordinatesDestination,
|
||||
color: const Color.fromARGB(255, 10, 29, 126),
|
||||
width: 6, // Changed: زيادة عرض الخط
|
||||
startCap: Cap.roundCap,
|
||||
endCap: Cap.roundCap,
|
||||
// polylineId: const PolylineId('route'),
|
||||
// points: controller.polylineCoordinatesDestination,
|
||||
// color: const Color.fromARGB(255, 10, 29, 126),
|
||||
// width: 6, // Changed: زيادة عرض الخط
|
||||
// startCap: Cap.roundCap,
|
||||
// endCap: Cap.roundCap,
|
||||
// ),
|
||||
Polyline(
|
||||
polylineId: const PolylineId('upcoming_route'),
|
||||
points: controller.upcomingPathPoints,
|
||||
color: Colors.blue, // أو أي لون آخر تختاره للمسار
|
||||
width: 8,
|
||||
zIndex: 2,
|
||||
),
|
||||
// 2. الخط المقطوع (تحت)
|
||||
Polyline(
|
||||
polylineId: const PolylineId('traveled_route'),
|
||||
points: controller.traveledPathPoints,
|
||||
color: Colors.grey.withOpacity(0.8),
|
||||
width: 7,
|
||||
zIndex: 1,
|
||||
),
|
||||
},
|
||||
markers: {
|
||||
|
||||
@@ -14,7 +14,7 @@ class GoogleMapApp extends StatelessWidget {
|
||||
return GetBuilder<MapDriverController>(
|
||||
builder: (mapDriverController) => mapDriverController.isRideStarted
|
||||
? Positioned(
|
||||
left: 150,
|
||||
right: 3,
|
||||
bottom: 20,
|
||||
child: Container(
|
||||
decoration: AppStyle.boxDecoration,
|
||||
|
||||
@@ -144,6 +144,11 @@ class PassengerInfoWindow extends StatelessWidget {
|
||||
borderRadius: BorderRadius.circular(10)),
|
||||
),
|
||||
onPressed: () async {
|
||||
controller.getRoute(
|
||||
origin: controller.latLngPassengerLocation,
|
||||
destination: controller.latLngPassengerDestination,
|
||||
routeColor: Colors.blue // أو أي لون
|
||||
);
|
||||
if (await controller
|
||||
.calculateDistanceBetweenDriverAndPassengerLocation() <
|
||||
140) {
|
||||
|
||||
Reference in New Issue
Block a user