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

25-10-5/1

Browse Source
This commit is contained in:
Hamza-Ayed
2025-10-05 14:57:32 +03:00
parent 95fb065bdb
commit 1cc66029a3
28 changed files with 1347 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,7 +336,7 @@ class HomeCaptainController extends GetxController {
CRUD().post(link: AppLink.addTokensDriver, payload: payload);
await CRUD().post(
link: "${AppLink.seferPaymentServer}/ride/firebase/addDriver.php",
link: "${AppLink.paymentServer}/ride/firebase/addDriver.php",
payload: payload);
// MapDriverController().driverCallPassenger();
// box.write(BoxName.statusDriverLocation, 'off');

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

@@ -335,7 +335,7 @@ class MapDriverController extends GetxController {
// Get.find<HomeCaptainController>().changeToAppliedRide('Applied');
Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
'Driver Is Going To Passenger'.tr,
'Driver Is Going To Passenger',
box.read(BoxName.nameDriver).toString(), //todo name driver
tokenPassenger,
[],
@@ -431,7 +431,7 @@ class MapDriverController extends GetxController {
? Get.find<FirebaseMessagesController>()
: Get.put(FirebaseMessagesController());
fcm.sendNotificationToDriverMAP(
'Trip is Begin'.tr,
'Trip is Begin',
box.read(BoxName.nameDriver).toString(),
tokenPassenger,
[],
@@ -732,8 +732,7 @@ class MapDriverController extends GetxController {
));
apiCalls.add(CRUD().postWallet(
link:
"${AppLink.seferPaymentServer}/ride/payment/process_ride_payments.php",
link: "${AppLink.paymentServer}/ride/payment/process_ride_payments.php",
payload: paymentProcessingPayload,
));
@@ -754,7 +753,7 @@ class MapDriverController extends GetxController {
.sendSummaryToServer(driverId, rideId);
Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
"Driver Finish Trip".tr,
"Driver Finish Trip",
'${'you will pay to Driver'.tr} $paymentAmount \$',
tokenPassenger,
[
@@ -1619,7 +1618,7 @@ class MapDriverController extends GetxController {
if (distance < 300) {
// 300 متر قبل الوجهة
Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
"You are near the destination".tr,
"You are near the destination",
"You are near the destination".tr,
tokenPassenger,
[

11
lib/controller/home/captin/order_request_controller.dart
View File

@@ -1,4 +1,5 @@
import 'dart:convert';
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter_overlay_window/flutter_overlay_window.dart';
@@ -37,10 +38,13 @@ class OrderRequestController extends GetxController {
Future<void> onInit() async {
print('OrderRequestController onInit called');
await initializeOrderPage();
bool isOverlayActive = await FlutterOverlayWindow.isActive();
if (isOverlayActive) {
await FlutterOverlayWindow.closeOverlay();
if (Platform.isAndroid) {
bool isOverlayActive = await FlutterOverlayWindow.isActive();
if (isOverlayActive) {
await FlutterOverlayWindow.closeOverlay();
}
}
addCustomStartIcon();
addCustomEndIcon();
startTimer(
@@ -61,6 +65,7 @@ class OrderRequestController extends GetxController {
Future<void> initializeOrderPage() async {
final myListString = Get.arguments['myListString'];
Log.print('myListString0000: ${myListString}');
if (Get.arguments['DriverList'] == null ||
Get.arguments['DriverList'].isEmpty) {