26-1-20/1

lib/controller/firebase/firbase_messge.dart

@@ -20,6 +20,7 @@ import '../../views/home/Captin/orderCaptin/order_request_page.dart';
 import '../../views/home/Captin/orderCaptin/vip_order_page.dart';
 import '../auth/google_sign.dart';
 import '../functions/face_detect.dart';
+import '../home/captin/map_driver_controller.dart';
 import 'local_notification.dart';
 
 class FirebaseMessagesController extends GetxController {
@@ -80,7 +81,7 @@ class FirebaseMessagesController extends GetxController {
       AndroidNotification? android = notification?.android;
       // if (notification != null && android != null) {
 
-      if (message.data.isNotEmpty && message.notification != null) {
+      if (message.data.isNotEmpty) {
         fireBaseTitles(message);
       }
       // if (message.data.isNotEmpty && message.notification != null) {
@@ -90,7 +91,7 @@ class FirebaseMessagesController extends GetxController {
     FirebaseMessaging.onBackgroundMessage((RemoteMessage message) async {});
 
     FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
-      if (message.data.isNotEmpty && message.notification != null) {
+      if (message.data.isNotEmpty) {
         fireBaseTitles(message);
       }
     });
@@ -110,7 +111,7 @@ class FirebaseMessagesController extends GetxController {
       case 'ORDER':
       case 'Order': // Handle both cases for backward compatibility
         if (Platform.isAndroid) {
-          notificationController.showNotification(title, body, 'tone1', '');
+          notificationController.showNotification(title, body, 'order', '');
         }
         var myListString = message.data['DriverList'];
         if (myListString != null) {
@@ -118,7 +119,7 @@ class FirebaseMessagesController extends GetxController {
           driverToken = myList[14].toString();
           Get.put(HomeCaptainController()).changeRideId();
           update();
-          Get.to(() => OrderRequestPage(), arguments: {
+          Get.toNamed('/OrderRequestPage', arguments: {
             'myListString': myListString,
             'DriverList': myList,
             'body': body
@@ -147,7 +148,18 @@ class FirebaseMessagesController extends GetxController {
           notificationController.showNotification(
               title, 'Passenger Cancel Trip'.tr, 'cancel', '');
         }
-        cancelTripDialog();
+        Log.print("🔔 FCM: Ride Cancelled by Passenger received.");
+
+        // 1. استخراج السبب (أرسلناه من PHP باسم 'reason')
+        String reason = message.data['reason'] ?? 'No reason provided';
+
+        // 2. توجيه الأمر للكنترولر
+        if (Get.isRegistered<MapDriverController>()) {
+          // استدعاء الحارس (سيتجاهل الأمر إذا كان السوكيت قد سبقه)
+          Get.find<MapDriverController>()
+              .processRideCancelledByPassenger(reason, source: "FCM");
+        }
+
         break;
 
       case 'VIP Order Accepted':