25-10-2/1

2025-10-02 01:20:16 +03:00
parent 7595be8067
commit c48627a175
342 changed files with 15825 additions and 14862 deletions
--- a/lib/controller/auth/google_sign.dart
+++ b/lib/controller/auth/google_sign.dart
@@ -1,204 +1,149 @@
 import 'dart:io';
-
-import 'package:Intaleq/constant/box_name.dart';
-import 'package:Intaleq/controller/auth/login_controller.dart';
-import 'package:Intaleq/controller/functions/encrypt_decrypt.dart';
-import 'package:Intaleq/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:url_launcher/url_launcher.dart';

+import '../../constant/box_name.dart';
 import '../../constant/links.dart';
-import '../../onbording_page.dart';
-import '../../print.dart';
+import '../../main.dart';
 import '../functions/crud.dart';
+import '../../onbording_page.dart';
+import 'login_controller.dart';

 class GoogleSignInHelper {
-  static final GoogleSignIn _googleSignIn = GoogleSignIn(
-    scopes: [
-      'email',
-      'profile',
-    ],
-  );
+  // ✅ GoogleSignIn singleton
+  static final GoogleSignIn _signIn = GoogleSignIn.instance;

-  // Method to handle Google Sign-In
+  static GoogleSignInAccount? _lastUser;
+
+  /// 👇 استدعها في main() مرة واحدة
+  static Future<void> init() async {
+    await _signIn.initialize(
+      serverClientId:
+          '594687661098-2u640akrb3k7sak5t0nqki6f4v6hq1bq.apps.googleusercontent.com',
+    );
+
+    // Events listener
+    _signIn.authenticationEvents.listen((event) async {
+      if (event is GoogleSignInAuthenticationEventSignIn) {
+        _lastUser = event.user;
+        await _handleSignUp(event.user);
+      } else if (event is GoogleSignInAuthenticationEventSignOut) {
+        _lastUser = null;
+      }
+    });
+
+    // silent login if possible
+    try {
+      await _signIn.attemptLightweightAuthentication();
+    } catch (_) {}
+  }
+
+  /// ✅ تسجيل دخول عادي
  static Future<GoogleSignInAccount?> signIn() async {
    try {
-      final GoogleSignInAccount? googleUser = await _googleSignIn.signIn();
-      if (googleUser != null) {
-        await _handleSignUp(googleUser);
-        // if (box.read(BoxName.countryCode) == 'Egypt') {
-        //   Get.to(() => EgyptCardAI());
-        // } else if (box.read(BoxName.countryCode) == 'Jordan') {
-        //   Get.to(() => AiPage());
-        // }
+      final user =
+          await _signIn.authenticate(scopeHint: const ['email', 'profile']);
+      if (user != null) {
+        _lastUser = user;
+        await _handleSignUp(user);
+
+        // اطبع القيم (للتأكد)
+        print("Google ID: ${user.id}");
+        print("Email: ${user.email}");
+        print("Name: ${user.displayName}");
+        print("Photo: ${user.photoUrl}");
      }
-      return googleUser;
-    } catch (error) {
+      return user;
+    } on PlatformException catch (e) {
+      if (e.code == 'sign_in_required') {
+        await showGooglePlayServicesError();
+      }
+      return null;
+    } catch (e) {
+      await addError("Google Sign-In error: $e", "signIn()");
      return null;
    }
  }

-  Future<GoogleSignInAccount?> signInFromLogin() async {
-    try {
-      final GoogleSignInAccount? googleUser = await _googleSignIn.signIn();
-      if (googleUser != null) {
-        await _handleSignUp(googleUser);
-        await Get.put(LoginController()).loginUsingCredentials(
-          box.read(BoxName.passengerID).toString(),
-          box.read(BoxName.email).toString(),
-        );
-      }
-      return googleUser;
-    } catch (error) {
-      // if (error is GoogleSignInAuthenticationException) {
-      //   // Handle authentication errors from Google Sign-In
-      //   addError("Google sign-in authentication error: ${error.message}",
-      //       '<GoogleSignInAccount?> signInFromLogin()');
-      // } else if (error is GoogleSignInAccountNotFoundException) {
-      //   // Handle the case where the user is not found (if applicable)
-      //   addError("Google sign-in account not found error: ${error.message}",
-      //       '<GoogleSignInAccount?> signInFromLogin()');
-      // }
-      //  else
-      if (error is SocketException) {
-        // Handle network issues, like SSL certificate issues
-        addError("Network error (SSL certificate issue): ${error.message}",
-            '<GoogleSignInAccount?> signInFromLogin()');
-      } else if (error is PlatformException) {
-        // Handle platform-specific errors, like Google Play Services issues
-        if (error.code == 'sign_in_required') {
-          // Google Play Services are required but not installed or outdated
-          showGooglePlayServicesError();
-        } else {
-          addError("Platform error: ${error.message}",
-              '<GoogleSignInAccount?> signInFromLogin()');
-        }
-      } else {
-        // Catch all other unknown errors
-        addError("Unknown error: ${error.toString()}",
-            '<GoogleSignInAccount?> signInFromLogin()');
-      }
-      return null;
-    }
-  }
-
-  void showGooglePlayServicesError() async {
-    const playStoreUrl =
-        'https://play.google.com/store/apps/details?id=com.google.android.gms&hl=en_US';
-
-    if (await canLaunchUrl(Uri.parse(playStoreUrl))) {
-      await launchUrl(Uri.parse(playStoreUrl));
-    } else {
-      // Fallback if the URL can't be opened
-      showDialog(
-        context: Get.context!,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            title: Text('Error'.tr),
-            content: Text(
-                'Could not open the Google Play Store. Please update Google Play Services manually.'
-                    .tr),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () => Navigator.pop(context),
-                child: Text('Close'.tr),
-              ),
-            ],
-          );
-        },
+  /// ✅ تسجيل دخول مخصص لشاشة Login (مع استدعاء الكنترولر)
+  static Future<GoogleSignInAccount?> signInFromLogin() async {
+    await init();
+    final user = await signIn();
+    if (user != null) {
+      await Get.put(LoginController()).loginUsingCredentials(
+        box.read(BoxName.passengerID).toString(),
+        box.read(BoxName.email).toString(),
      );
    }
+    return user;
  }

-  // Future<GoogleSignInAccount?> signInFromLogin() async {
-  //   try {
-  //     final GoogleSignInAccount? googleUser = await _googleSignIn.signIn();
-  //     if (googleUser != null) {
-  //       await _handleSignUp(googleUser);
-  //       // if (box.read(BoxName.countryCode) == 'Egypt') {
-  //       await Get.put(LoginController()).loginUsingCredentials(
-  //         box.read(BoxName.passengerID).toString(),
-  //         box.read(BoxName.email).toString(),
-  //       );
-  //       // } else if (box.read(BoxName.countryCode) == 'Jordan') {
-  //       //   // Get.to(() => AiPage());
-  //       // }
-  //     }
-  //     return googleUser;
-  //   } catch (error) {
-  //     addError(error.toString(), '<GoogleSignInAccount?> signInFromLogin()');
-  //     return null;
-  //   }
-  // }
+  /// ✅ طلب سكوبات إضافية (بديل withScopes القديم)
+  static Future<void> requestExtraScopes(List<String> scopes) async {
+    final user = _lastUser;
+    if (user == null) return;
+    await user.authorizationClient.authorizeScopes(scopes);
+  }

-  addError(String error, where) async {
-    CRUD().post(link: AppLink.addError, payload: {
-      'error': error.toString(), // Example error description
-      'userId': box.read(BoxName.driverID) ??
-          box.read(BoxName.passengerID), // Example user ID
-      'userType': box.read(BoxName.driverID) != null
-          ? 'Driver'
-          : 'passenger', // Example user type
-      'phone': box.read(BoxName.phone) ??
-          box.read(BoxName.phoneDriver), // Example phone number
+  /// ✅ تسجيل خروج
+  static Future<void> signOut() async {
+    await _signIn.signOut();
+    await _handleSignOut();
+  }

-      'device': where
+  static GoogleSignInAccount? getCurrentUser() => _lastUser;
+
+  // ================= Helpers ==================
+
+  static Future<void> _handleSignUp(GoogleSignInAccount user) async {
+    box.write(BoxName.passengerID, user.id);
+    box.write(BoxName.email, user.email);
+    box.write(BoxName.name, user.displayName ?? '');
+    box.write(BoxName.passengerPhotoUrl, user.photoUrl ?? '');
+  }
+
+  static Future<void> _handleSignOut() async {
+    box.erase();
+
+    Get.offAll(OnBoardingPage());
+  }
+
+  static Future<void> addError(String error, String where) async {
+    await CRUD().post(link: AppLink.addError, payload: {
+      'error': error,
+      'userId': box.read(BoxName.driverID) ?? box.read(BoxName.passengerID),
+      'userType': box.read(BoxName.driverID) != null ? 'Driver' : 'Passenger',
+      'phone': box.read(BoxName.phone) ?? box.read(BoxName.phoneDriver),
+      'device': where,
    });
  }

-  // Method to handle Google Sign-Out
-  static Future<void> signOut() async {
-    try {
-      await _googleSignIn.signOut();
-      await _handleSignOut();
-    } catch (error) {}
-  }
-
-  // Method to get the current signed-in user
-  static GoogleSignInAccount? getCurrentUser() {
-    return _googleSignIn.currentUser;
-  }
-
-  // Method to handle sign-up process
-  static Future<void> _handleSignUp(GoogleSignInAccount user) async {
-    // Store driver information
-
-    box.write(BoxName.passengerID, user.id);
-    box.write(BoxName.email, (user.email));
-    box.write(BoxName.name, (user.displayName.toString()));
-    box.write(BoxName.passengerPhotoUrl, (user.photoUrl.toString()));
-
-    // Perform any additional sign-up tasks or API calls here
-    // For example, you can send the user data to your server for registration
-  }
-
-  // Method to handle sign-out process
-  static Future<void> _handleSignOut() async {
-    // Clear stored driver information
-    box.erase();
-    // box.remove(BoxName.passengerPhotoUrl);
-    // box.remove(BoxName.driverID);
-    // box.remove(BoxName.email);
-    // box.remove(BoxName.lang);
-    // box.remove(BoxName.name);
-    // box.remove(BoxName.passengerID);
-    // box.remove(BoxName.phone);
-    // box.remove(BoxName.tokenFCM);
-    // box.remove(BoxName.tokens);
-    // box.remove(BoxName.addHome);
-    // box.remove(BoxName.addWork);
-    // box.remove(BoxName.agreeTerms);
-    // box.remove(BoxName.apiKeyRun);
-    // box.remove(BoxName.countryCode);
-    // box.remove(BoxName.accountIdStripeConnect);
-    // box.remove(BoxName.passengerWalletTotal);
-    // box.remove(BoxName.isVerified);
-    // box.remove(BoxName.firstTimeLoadKey);
-    Get.offAll(() => OnBoardingPage());
-    // Perform any additional sign-out tasks or API calls here
-    // For example, you can notify your server about the user sign-out
+  static Future<void> showGooglePlayServicesError() async {
+    const playStoreUrl =
+        'https://play.google.com/store/apps/details?id=com.google.android.gms&hl=en_US';
+    final uri = Uri.parse(playStoreUrl);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      showDialog(
+        context: Get.context!,
+        builder: (context) => AlertDialog(
+          title: Text('Error'.tr),
+          content: Text(
+            'Could not open the Google Play Store. Please update Google Play Services manually.'
+                .tr,
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context),
+              child: Text('Close'.tr),
+            ),
+          ],
+        ),
+      );
+    }
  }
 }
--- a/lib/controller/auth/login_controller.dart
+++ b/lib/controller/auth/login_controller.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 import 'package:Intaleq/constant/api_key.dart';
+import 'package:Intaleq/views/auth/otp_page.dart';
 import 'package:http/http.dart' as http;

 import 'package:Intaleq/constant/info.dart';
@@ -173,149 +174,161 @@ class LoginController extends GetxController {

        await AppInitializer().getKey();

-        final refreshToken = decodedResponse1['refresh_token'];
-        await storage.write(key: BoxName.refreshToken, value: refreshToken);
-      } else {}
+        // final refreshToken = decodedResponse1['refresh_token'];
+        // await storage.write(key: BoxName.refreshToken, value: refreshToken);
+      }
    }
  }

-  loginUsingCredentials(String passengerID, email) async {
+  Future<void> loginUsingCredentials(String passengerID, String email) async {
    isloading = true;
    update();
-    // bool isTokenExpired = JwtDecoder.isExpired(
-    //     r(box.read(BoxName.jwt)).toString().split(AppInformation.addd)[0]);
+    await getJWT();

-    // if (isTokenExpired) {
-    //   // Log.print('isTokenExpired loginUsingCredentials: ${isTokenExpired}');
-    //   await getJWT();
-    // }
+    try {
+      // 1) استعلام تسجيل الدخول
+      final res = await CRUD().get(
+        link: AppLink.loginFromGooglePassenger,
+        payload: {
+          'email': email,
+          'id': passengerID, // استخدم المعامل مباشرة
+          'platform': Platform.isAndroid ? 'android' : 'ios',
+          'appName': AppInformation.appName,
+        },
+      );

-    var res =
-        await CRUD().get(link: AppLink.loginFromGooglePassenger, payload: {
-      'email': email.toString(),
-      'id': passengerID.toString(),
-      "platform": Platform.isAndroid ? 'android' : 'ios',
-      "appName": AppInformation.appName,
-    });
-    if (res == 'Failure') {
-      // Get.offAll(SmsSignupEgypt());
+      if (res == 'Failure') {
+        Get.snackbar("User does not exist.".tr, '',
+            backgroundColor: Colors.red);
+        return;
+      }
+
+      // 2) فك JSON مرة واحدة
+      final decoded = jsonDecode(res);
+      if (decoded is! Map || decoded.isEmpty) return;
+
+      final status = (decoded['status'] ?? '').toString();
+      final data = (decoded['data'] as List?)?.firstOrNull as Map? ?? {};
+      if (status != 'success' || data['verified'].toString() != '1') {
+        // غير مُفعل -> أذهب للتسجيل بالـ SMS
+        Get.offAll(() => PhoneNumberScreen());
+        return;
+      }
+
+      // 3) كتابة القيم (خفيفة)
+      box.write(BoxName.isVerified, '1');
+      box.write(BoxName.email, data['email']);
+      box.write(BoxName.phone, data['phone']);
+      box.write(BoxName.name, data['first_name']);
+      box.write(BoxName.isTest, '1');
+      box.write(BoxName.package, data['package']);
+      box.write(BoxName.promo, data['promo']);
+      box.write(BoxName.discount, data['discount']);
+      box.write(BoxName.validity, data['validity']);
+      box.write(BoxName.isInstall, data['isInstall'] ?? 'none');
+      box.write(BoxName.isGiftToken, data['isGiftToken'] ?? 'none');
+      if (data['inviteCode'] != null) {
+        box.write(BoxName.inviteCode, data['inviteCode'].toString());
+      }
+      // مهم: تأكد من passengerID في الـ box
+      box.write(BoxName.passengerID, passengerID);
+
+      // 4) نفّذ عمليات مكلفة بالتوازي: getTokens + fingerprint
+      final results = await Future.wait([
+        CRUD().get(link: AppLink.getTokens, payload: {
+          'passengerID': passengerID, // FIX: لا تستخدم box هنا
+        }),
+        DeviceHelper.getDeviceFingerprint(),
+      ]);
+      await box.write(BoxName.firstTimeLoadKey, 'false');
+      final tokenResp = results[0];
+      final fingerPrint = (results[1] ?? '').toString();
+      await storage.write(key: BoxName.fingerPrint, value: fingerPrint);
+
+      if (email != '962798583052@intaleqapp.com' && tokenResp != 'failure') {
+        final tokenJson = jsonDecode(tokenResp);
+        final serverToken = tokenJson['message']?['token']?.toString() ?? '';
+        // Log.print('serverToken: ${serverToken}');
+        final localFcm = (box.read(BoxName.tokenFCM) ?? '').toString();
+        // Log.print('localFcm: ${localFcm}');
+
+        // 5) اختلاف الجهاز -> تحقّق OTP
+        if (serverToken.isNotEmpty && serverToken != localFcm) {
+          final goVerify = await _confirmDeviceChangeDialog();
+          if (goVerify == true) {
+            await Get.to(() => OtpVerificationPage(
+                  phone: data['phone'].toString(),
+                  deviceToken: fingerPrint,
+                  token: tokenResp.toString(),
+                  ptoken: serverToken,
+                ));
+            // بعد العودة من OTP (نجح/فشل)، أخرج من الميثود كي لا يحصل offAll مرتين
+            return;
+          }
+        }
+      }
+
+      // 6) منطق الدعوة (إن وُجد) ثم الانتقال
+      final invite = box.read(BoxName.inviteCode)?.toString() ?? 'none';
+      final isInstall = box.read(BoxName.isInstall)?.toString() ?? '0';
+
+      if (invite != 'none' && isInstall != '1') {
+        try {
+          await CRUD().post(link: AppLink.updatePassengersInvitation, payload: {
+            "inviteCode": invite,
+            "passengerID": passengerID,
+          });
+          await Get.defaultDialog(
+            title: 'Invitation Used'.tr,
+            middleText: "Your invite code was successfully applied!".tr,
+            textConfirm: "OK".tr,
+            confirmTextColor: Colors.white,
+            onConfirm: () async {
+              try {
+                await CRUD().post(link: AppLink.addPassengersPromo, payload: {
+                  "promoCode":
+                      'I-${(box.read(BoxName.name)).toString().split(' ').first}',
+                  "amount": '25',
+                  "passengerID": passengerID,
+                  "description": 'promo first'
+                });
+              } catch (e) {
+                addError(
+                    e.toString(), 'promo on invitation in login_controller');
+              } finally {
+                Get.offAll(() => const MapPagePassenger());
+              }
+            },
+          );
+          return;
+        } catch (_) {
+          // حتى لو فشل، كمل للصفحة الرئيسية
+        }
+      }
+
+      Get.offAll(() => const MapPagePassenger());
+    } catch (e, st) {
+      addError('$e', 'loginUsingCredentials');
+      Get.snackbar('Error', e.toString(), backgroundColor: Colors.redAccent);
+    } finally {
      isloading = false;
      update();
-      Get.snackbar("User does not exist.".tr, '', backgroundColor: Colors.red);
-    } else {
-      // Log.print('res: ${res}');
-      var jsonDecoeded = jsonDecode(res);
-
-      if (jsonDecoeded.isNotEmpty) {
-        var d = jsonDecoeded['data'][0];
-        if (jsonDecoeded['status'] == 'success' &&
-            d['verified'].toString() == '1') {
-          //
-
-          box.write(BoxName.isVerified, '1');
-          box.write(BoxName.email, d['email']);
-          box.write(BoxName.phone, d['phone']);
-          box.write(BoxName.name, d['first_name']);
-          box.write(BoxName.isTest, '1');
-          box.write(BoxName.package, d['package']);
-          box.write(BoxName.promo, d['promo']);
-          box.write(BoxName.discount, d['discount']);
-          box.write(BoxName.validity, d['validity']);
-          box.write(BoxName.isInstall, d['isInstall'] ?? 'none');
-          box.write(BoxName.isGiftToken, d['isGiftToken'] ?? 'none');
-          box.write(BoxName.firstTimeLoadKey, 'false');
-          d['inviteCode'] != null
-              ? box.write(
-                  BoxName.inviteCode, (d['inviteCode'].toString()) ?? 'none')
-              : null;
-
-          var token = await CRUD().get(link: AppLink.getTokens, payload: {
-            'passengerID': box.read(BoxName.passengerID).toString()
-          });
-          var fingerPrint = await DeviceHelper.getDeviceFingerprint();
-          Log.print('fingerPrint 0: ${fingerPrint}');
-          await storage.write(key: BoxName.fingerPrint, value: fingerPrint);
-
-          if (email == '962798583052@intaleqapp.com') {
-          } else {
-            if (token != 'failure') {
-              if ((jsonDecode(token)['message']['token'].toString()) !=
-                  box.read(BoxName.tokenFCM)) {
-                await Get.defaultDialog(
-                  barrierDismissible: false,
-                  title: 'Device Change Detected'.tr,
-                  middleText: 'Please verify your identity'.tr,
-                  textConfirm: 'Verify'.tr,
-                  confirmTextColor: Colors.white,
-                  onConfirm: () {
-                    // Get.back();
-                    // انتقل لصفحة OTP الجديدة
-                    Get.to(
-                      () => OtpVerificationPage(
-                        phone: d['phone'].toString(),
-                        deviceToken: fingerPrint.toString(),
-                        token: token.toString(),
-                        ptoken:
-                            jsonDecode(token)['message']['token'].toString(),
-                      ),
-                    );
-                  },
-                );
-              }
-            }
-          } // Logging to check if inviteCode is written correctly
-
-          if (d['inviteCode'] != 'none' &&
-              d['inviteCode'] != null &&
-              // box.read(BoxName.inviteCode).toString() != 'none' &&
-              box.read(BoxName.isInstall).toString() != '1') {
-            await CRUD()
-                .post(link: AppLink.updatePassengersInvitation, payload: {
-              "inviteCode": (box.read(BoxName.inviteCode).toString()),
-              "passengerID": box.read(BoxName.passengerID).toString(),
-            });
-            Get.defaultDialog(
-              title: 'Invitation Used'
-                  .tr, // Automatically translates based on the current locale
-              middleText: "Your invite code was successfully applied!"
-                  .tr, // Automatically translates based on the current locale
-              onConfirm: () {
-                try {
-                  CRUD().post(link: AppLink.addPassengersPromo, payload: {
-                    "promoCode":
-                        'S-${(box.read(BoxName.name)).toString().split(' ')[0]}',
-                    "amount": '25',
-                    "passengerID": box.read(BoxName.passengerID).toString(),
-                    "description": 'promo first'
-                  });
-                } catch (e) {
-                  addError(e.toString(),
-                      'passenger Invitation Used dialogu as promo line 185 login_controller');
-                } finally {
-                  // Continue with the rest of your flow, regardless of errors
-                  // For example, navigate to the next page
-                  Get.offAll(() => const MapPagePassenger());
-                }
-              },
-              textConfirm: "OK".tr, // Confirm button text
-            );
-          } else {
-            Get.offAll(() => const MapPagePassenger());
-          }
-        } else {
-          Get.offAll(() => SmsSignupEgypt());
-          // Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
-          //     backgroundColor: Colors.redAccent);
-          isloading = false;
-          update();
-        }
-      } else {
-        isloading = false;
-        update();
-      }
    }
  }

+  Future<bool?> _confirmDeviceChangeDialog() {
+    return Get.defaultDialog<bool>(
+      barrierDismissible: false,
+      title: 'Device Change Detected'.tr,
+      middleText: 'Please verify your identity'.tr,
+      textConfirm: 'Verify'.tr,
+      confirmTextColor: Colors.white,
+      onConfirm: () => Get.back(result: true),
+      textCancel: 'Cancel'.tr,
+      onCancel: () => Get.back(result: false),
+    );
+  }
+
  void login() async {
    isloading = true;
    update();
--- a/lib/controller/auth/otp_controller.dart
+++ b/lib/controller/auth/otp_controller.dart
@@ -7,6 +7,7 @@ import '../../../print.dart';
 import '../../views/auth/otp_page.dart';
 import '../../views/widgets/error_snakbar.dart';
 import '../functions/crud.dart';
+import '../functions/package_info.dart';
 import 'login_controller.dart';

 // --- Helper Class for Phone Authentication ---
@@ -83,6 +84,24 @@ class PhoneAuthHelper {
    }
  }

+  static Future<void> _addTokens() async {
+    String fingerPrint = await DeviceHelper.getDeviceFingerprint();
+
+    await CRUD()
+        .post(link: "${AppLink.server}/ride/firebase/add.php", payload: {
+      'token': (box.read(BoxName.tokenFCM.toString())),
+      'passengerID': box.read(BoxName.passengerID).toString(),
+      "fingerPrint": fingerPrint
+    });
+    await CRUD().post(
+        link: "${AppLink.seferPaymentServer}/ride/firebase/add.php",
+        payload: {
+          'token': (box.read(BoxName.tokenFCM.toString())),
+          'passengerID': box.read(BoxName.passengerID).toString(),
+          "fingerPrint": fingerPrint
+        });
+  }
+
  static Future<void> registerUser({
    required String phoneNumber,
    required String firstName,
@@ -102,6 +121,7 @@ class PhoneAuthHelper {
      final data = (response);
      if (data != 'failure') {
        // Registration successful, log user in
+        await _addTokens();
        await _handleSuccessfulLogin(data['message']['data']);
      } else {
        mySnackeBarError(
--- a/lib/controller/auth/token_otp_change_controller.dart
+++ b/lib/controller/auth/token_otp_change_controller.dart
@@ -9,6 +9,7 @@ import 'package:get/get.dart';
 import '../../print.dart';
 import '../../views/home/map_page_passenger.dart';
 import '../firebase/firbase_messge.dart';
+import '../functions/package_info.dart';

 class OtpVerificationController extends GetxController {
  final String phone;
@@ -49,6 +50,7 @@ class OtpVerificationController extends GetxController {
  }

  Future<void> sendOtp() async {
+    if (isLoading.value) return;
    isLoading.value = true;
    try {
      final response = await CRUD().post(
@@ -60,48 +62,60 @@ class OtpVerificationController extends GetxController {
      );

      if (response != 'failure') {
+        isLoading.value = true;
        // بإمكانك عرض رسالة نجاح هنا
      } else {
-        // Get.snackbar('Error', 'Failed to send OTP');
+        Get.snackbar('Error'.tr, 'Failed to send OTP'.tr);
      }
    } catch (e) {
      Get.snackbar('Error', e.toString());
    } finally {
-      isLoading.value = false;
+      // isLoading.value = false;
    }
  }

  Future<void> verifyOtp(String ptoken) async {
    isVerifying.value = true;
-    var finger = await storage.read(key: BoxName.fingerPrint);
+
    try {
+      String fingerPrint = await DeviceHelper.getDeviceFingerprint();
      final response = await CRUD().post(
        link: '${AppLink.server}/auth/token_passenger/verify_otp.php',
        payload: {
          'phone_number': phone,
          'otp': otpCode.value,
          'token': box.read(BoxName.tokenFCM).toString(),
-          'fingerPrint': finger.toString(),
+          'fingerPrint': fingerPrint.toString(),
        },
      );

      if (response != 'failure' && response['status'] == 'success') {
-        Get.back(); // توجه إلى الصفحة التالية
-        await Get.put(FirebaseMessagesController()).sendNotificationToDriverMAP(
+        final fcm = Get.isRegistered<FirebaseMessagesController>()
+            ? Get.find<FirebaseMessagesController>()
+            : Get.put(FirebaseMessagesController());
+
+        await fcm.sendNotificationToDriverMAP(
          'token change',
          'change device'.tr,
          ptoken.toString(),
          [],
          'cancel.wav',
        );
-        CRUD().post(
-            link:
-                '${AppLink.seferPaymentServer}/auth/token/update_passenger_token.php',
+        await CRUD().post(
+            link: "${AppLink.seferPaymentServer}/ride/firebase/add.php",
            payload: {
-              'token': box.read(BoxName.tokenDriver).toString(),
-              'fingerPrint': finger.toString(),
+              'token': (box.read(BoxName.tokenFCM.toString())),
              'passengerID': box.read(BoxName.passengerID).toString(),
+              "fingerPrint": fingerPrint.toString(),
            });
+        // CRUD().post(
+        //     link:
+        //         '${AppLink.seferPaymentServer}/auth/token/update_passenger_token.php',
+        //     payload: {
+        //       'token': box.read(BoxName.tokenFCM).toString(),
+        //       'fingerPrint': fingerPrint.toString(),
+        //       'passengerID': box.read(BoxName.passengerID).toString(),
+        //     });
        Get.offAll(() => const MapPagePassenger());
      } else {
        Get.snackbar('Verification Failed', 'OTP is incorrect or expired');
--- a/lib/controller/firebase/firbase_messge.dart
+++ b/lib/controller/firebase/firbase_messge.dart
@@ -134,7 +134,7 @@ class FirebaseMessagesController extends GetxController {
        notificationController.showNotification(
            'Accepted Ride'.tr, 'Driver Accepted the Ride for You'.tr, 'ding');
      }
-      var passengerList = message.data['passengerList'];
+      var passengerList = message.data['DriverList'];

      var myList = jsonDecode(passengerList) as List<dynamic>;
      Log.print('myList: ${myList}');
@@ -161,7 +161,7 @@ class FirebaseMessagesController extends GetxController {
        notificationController.showNotification(
            'Trip Monitoring'.tr, '', 'iphone_ringtone');
      }
-      var myListString = message.data['passengerList'];
+      var myListString = message.data['DriverList'];
      var myList = jsonDecode(myListString) as List<dynamic>;
      Get.toNamed('/tripmonitor', arguments: {
        'rideId': myList[0].toString(),
@@ -296,7 +296,7 @@ class FirebaseMessagesController extends GetxController {
    // }
    else if (message.notification!.title! == 'Call Income') {
      try {
-        var myListString = message.data['passengerList'];
+        var myListString = message.data['DriverList'];
        var driverList = jsonDecode(myListString) as List<dynamic>;
        // if (Platform.isAndroid) {
        if (Platform.isAndroid) {
@@ -316,7 +316,7 @@ class FirebaseMessagesController extends GetxController {
      } catch (e) {}
    } else if (message.notification!.title! == 'Call Income from Driver'.tr) {
      try {
-        var myListString = message.data['passengerList'];
+        var myListString = message.data['DriverList'];
        var driverList = jsonDecode(myListString) as List<dynamic>;
        // if (Platform.isAndroid) {
        if (Platform.isAndroid) {
@@ -335,7 +335,7 @@ class FirebaseMessagesController extends GetxController {
      } catch (e) {}
    } else if (message.notification!.title! == 'Call End'.tr) {
      try {
-        var myListString = message.data['passengerList'];
+        var myListString = message.data['DriverList'];
        var driverList = jsonDecode(myListString) as List<dynamic>;
        if (Platform.isAndroid) {
          notificationController.showNotification(
--- a/lib/controller/firebase/local_notification.dart
+++ b/lib/controller/firebase/local_notification.dart
@@ -273,8 +273,8 @@ class NotificationController extends GetxController {
      scheduledTZDateTime,
      details,
      androidScheduleMode: AndroidScheduleMode.exact,
-      uiLocalNotificationDateInterpretation:
-          UILocalNotificationDateInterpretation.absoluteTime,
+      // uiLocalNotificationDateInterpretation:
+      //     UILocalNotificationDateInterpretation.absoluteTime,
      matchDateTimeComponents:
          null, // Don't repeat automatically; we handle manually
    );
@@ -320,8 +320,8 @@ class NotificationController extends GetxController {
      scheduledDate,
      details,
      androidScheduleMode: AndroidScheduleMode.exact,
-      uiLocalNotificationDateInterpretation:
-          UILocalNotificationDateInterpretation.absoluteTime,
+      // uiLocalNotificationDateInterpretation:
+      //     UILocalNotificationDateInterpretation.absoluteTime,
      matchDateTimeComponents:
          null, // Don't repeat automatically; we handle 7 days manually
    );
--- a/lib/controller/functions/crud.dart
+++ b/lib/controller/functions/crud.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'package:Intaleq/constant/box_name.dart';
 import 'package:Intaleq/constant/links.dart';
@@ -9,6 +10,7 @@ import 'package:Intaleq/env/env.dart';

 import '../../constant/api_key.dart';

+import '../../print.dart';
 import '../../views/widgets/elevated_btn.dart';
 import '../../views/widgets/error_snakbar.dart';
 import 'encrypt_decrypt.dart';
@@ -22,6 +24,7 @@ import 'network/net_guard.dart';

 class CRUD {
  final NetGuard _netGuard = NetGuard();
+  final _client = http.Client();

  /// Stores the signature of the last logged error to prevent duplicates.
  static String _lastErrorSignature = '';
@@ -41,7 +44,6 @@ class CRUD {

      if (currentErrorSignature == _lastErrorSignature &&
          now.difference(_lastErrorTimestamp) < _errorLogDebounceDuration) {
-        print("Debounced a duplicate error: $error");
        return;
      }

@@ -66,9 +68,7 @@ class CRUD {
          'details': details,
        },
      );
-    } catch (e) {
-      print("CRITICAL: Failed to log error to server: $e");
-    }
+    } catch (e) {}
  }

  /// Centralized private method to handle all API requests.
@@ -78,80 +78,72 @@ class CRUD {
    Map<String, dynamic>? payload,
    required Map<String, String> headers,
  }) async {
+    // timeouts أقصر
+    const connectTimeout = Duration(seconds: 6);
+    const receiveTimeout = Duration(seconds: 10);
+
+    Future<http.Response> doPost() {
+      final url = Uri.parse(link);
+      // استخدم _client بدل http.post
+      return _client
+          .post(url, body: payload, headers: headers)
+          .timeout(connectTimeout + receiveTimeout);
+    }
+
+    http.Response response;
    try {
-      var response = await HttpRetry.sendWithRetry(
-        () {
-          var url = Uri.parse(link);
-          return http.post(
-            url,
-            body: payload,
-            headers: headers,
-          );
-        },
-        maxRetries: 3,
-        timeout: const Duration(seconds: 15),
-      );
+      // retry ذكي: محاولة واحدة إضافية فقط لأخطاء شبكة/5xx
+      try {
+        response = await doPost();
+      } on SocketException catch (_) {
+        // محاولة ثانية واحدة فقط
+        response = await doPost();
+      } on TimeoutException catch (_) {
+        response = await doPost();
+      }

-      if (response.statusCode == 200) {
+      final sc = response.statusCode;
+      Log.print('sc: ${sc}');
+      Log.print('request: ${response.request}');
+      final body = response.body;
+      Log.print('body: ${body}');
+
+      // 2xx
+      if (sc >= 200 && sc < 300) {
        try {
-          var jsonData = jsonDecode(response.body);
-          if (jsonData['status'] == 'success') {
-            return jsonData;
-          } else {
-            // Log API logical errors (e.g., "Customer not found")
-            if (jsonData['status'] == 'failure') {
-              // return 'failure';
-            } else {
-              addError(
-                'API Logic Error: ${jsonData['status']}',
-                'Response: ${response.body}',
-                'CRUD._makeRequest - $link',
-              );
-            }
+          final jsonData = jsonDecode(body);
+          return jsonData; // لا تعيد 'success' فقط؛ أعِد الجسم كله
+        } catch (e, st) {
+          // لا تسجّل كخطأ شبكي لكل حالة؛ فقط معلومات
+          addError('JSON Decode Error', 'Body: $body\n$st',
+              'CRUD._makeRequest $link');
+          return 'failure';
+        }
+      }

-            return jsonData['status'];
-          }
-        } catch (e, stackTrace) {
-          addError(
-            'JSON Decode Error: $e',
-            'Response Body: ${response.body}\nStack Trace: $stackTrace',
-            'CRUD._makeRequest - $link',
-          );
-          return 'failure';
-        }
-      } else if (response.statusCode == 401) {
-        var jsonData = jsonDecode(response.body);
-        if (jsonData['error'] == 'Token expired') {
-          await Get.put(LoginController()).getJWT();
-          // mySnackbarSuccess('please order now'.tr);
-          return 'token_expired';
-        } else {
-          addError(
-            'Unauthorized Error: ${jsonData['error']}',
-            'Status Code: 401',
-            'CRUD._makeRequest - $link',
-          );
-          return 'failure';
-        }
-      } else {
+      // 401 → دع الطبقة العليا تتعامل مع التجديد
+      if (sc == 401) {
+        // لا تستدع getJWT هنا كي لا نضاعف الرحلات
+        return 'token_expired';
+      }
+
+      // 5xx: لا تعِد المحاولة هنا (حاولنا مرة ثانية فوق)
+      if (sc >= 500) {
        addError(
-          'HTTP Error',
-          'Status Code: ${response.statusCode}\nResponse Body: ${response.body}',
-          'CRUD._makeRequest - $link',
-        );
+            'Server 5xx', 'SC: $sc\nBody: $body', 'CRUD._makeRequest $link');
        return 'failure';
      }
+
+      // 4xx أخرى: أعد الخطأ بدون تسجيل مكرر
+      return 'failure';
    } on SocketException {
-      _netGuard.notifyOnce((title, msg) {
-        mySnackeBarError(msg);
-      });
+      _netGuard.notifyOnce((title, msg) => mySnackeBarError(msg));
      return 'no_internet';
-    } catch (e, stackTrace) {
-      addError(
-        'HTTP Request Exception: $e',
-        'Stack Trace: $stackTrace',
-        'CRUD._makeRequest - $link',
-      );
+    } on TimeoutException {
+      return 'failure';
+    } catch (e, st) {
+      addError('HTTP Request Exception: $e', 'Stack: $st',
+          'CRUD._makeRequest $link');
      return 'failure';
    }
  }
@@ -186,28 +178,45 @@ class CRUD {
    required String link,
    Map<String, dynamic>? payload,
  }) async {
-    String token = r(box.read(BoxName.jwt)).toString().split(Env.addd)[0];
-    // if (JwtDecoder.isExpired(token)) {
-    //   await Get.put(LoginController()).getJWT();
-    //   token = r(box.read(BoxName.jwt)).toString().split(Env.addd)[0];
-    // }
-
-    final headers = {
-      "Content-Type": "application/x-www-form-urlencoded",
-      'Authorization': 'Bearer $token'
-    };
-
-    var result = await _makeRequest(
-      link: link,
-      payload: payload,
-      headers: headers,
+    var url = Uri.parse(
+      link,
    );
+    var response = await http.post(
+      url,
+      body: payload,
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        'Authorization':
+            'Bearer ${r(box.read(BoxName.jwt)).toString().split(Env.addd)[0]}'
+      },
+    );
+    if (response.statusCode == 200) {
+      var jsonData = jsonDecode(response.body);
+      if (jsonData['status'] == 'success') {
+        return response.body;
+      }

-    // The original 'get' method returned the raw body on success, maintaining that behavior.
-    if (result is Map && result['status'] == 'success') {
-      return jsonEncode(result);
+      return jsonData['status'];
+    } else if (response.statusCode == 401) {
+      // Specifically handle 401 Unauthorized
+      var jsonData = jsonDecode(response.body);
+
+      if (jsonData['error'] == 'Token expired') {
+        // Show snackbar prompting to re-login
+        await Get.put(LoginController()).getJWT();
+        // mySnackbarSuccess('please order now'.tr);
+        return 'token_expired'; // Return a specific value for token expiration
+      } else {
+        // Other 401 errors
+        // addError('Unauthorized: ${jsonData['error']}', 'crud().post - 401',
+        //     url.toString());
+        return 'failure';
+      }
+    } else {
+      addError('Non-200 response code: ${response.statusCode}',
+          'crud().post - Other', url.toString());
+      return 'failure';
    }
-    return result;
  }

  /// Performs an authenticated POST request to wallet endpoints.
@@ -236,27 +245,48 @@ class CRUD {
    required String link,
    Map<String, dynamic>? payload,
  }) async {
-    var jwt = await LoginController().getJwtWallet();
+    var s = await LoginController().getJwtWallet();
    final hmac = box.read(BoxName.hmac);
-
-    final headers = {
-      "Content-Type": "application/x-www-form-urlencoded",
-      'Authorization': 'Bearer $jwt',
-      'X-HMAC-Auth': hmac.toString(),
-    };
-
-    var result = await _makeRequest(
-      link: link,
-      payload: payload,
-      headers: headers,
+    var url = Uri.parse(
+      link,
    );
+    var response = await http.post(
+      url,
+      body: payload,
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        'Authorization': 'Bearer $s',
+        'X-HMAC-Auth': hmac.toString(),
+      },
+    );
+    if (response.statusCode == 200) {
+      var jsonData = jsonDecode(response.body);
+      if (jsonData['status'] == 'success') {
+        return response.body;
+      }

-    if (result is Map && result['status'] == 'success') {
-      return jsonEncode(result);
+      return jsonData['status'];
+    } else if (response.statusCode == 401) {
+      // Specifically handle 401 Unauthorized
+      var jsonData = jsonDecode(response.body);
+
+      if (jsonData['error'] == 'Token expired') {
+        // Show snackbar prompting to re-login
+        await Get.put(LoginController()).getJwtWallet();
+
+        return 'token_expired'; // Return a specific value for token expiration
+      } else {
+        // Other 401 errors
+        addError('Unauthorized: ${jsonData['error']}', 'crud().post - 401',
+            url.toString());
+        return 'failure';
+      }
+    } else {
+      addError('Non-200 response code: ${response.statusCode}',
+          'crud().post - Other', url.toString());
+      return 'failure';
    }
-    return result;
  }
-
  // =======================================================================
  // All other specialized methods remain below.
  // They are kept separate because they interact with external third-party APIs
@@ -282,11 +312,6 @@ class CRUD {
        },
      );

-      print('req: ${response.request}');
-      print('status: ${response.statusCode}');
-      print('body: ${response.body}');
-      print('payload: $payload');
-
      Map<String, dynamic> wrap(String status, {Object? message, int? code}) {
        return {
          'status': status,
@@ -728,9 +753,6 @@ class CRUD {
      url,
      body: payload,
    );
-    // Log.print('req: ${response.request}');
-    // Log.print('response: ${response.body}');
-    // Log.print('payload: ${payload}');
    var jsonData = jsonDecode(response.body);
    if (jsonData['status'] == 'OK') {
      return jsonData;
--- a/lib/controller/functions/device_info.dart
+++ b/lib/controller/functions/device_info.dart
@@ -22,7 +22,7 @@ class DeviceInfoPlus {
          'sdkVersion': androidInfo.version.sdkInt,
          'manufacturer': androidInfo.manufacturer,
          'isPhysicalDevice': androidInfo.isPhysicalDevice,
-          'serialNumber': androidInfo.serialNumber,
+          'serialNumber': androidInfo.fingerprint,
          'fingerprint': androidInfo.fingerprint,
          'type': androidInfo.type,
          'data': androidInfo.data,
--- a/lib/controller/functions/encrypt_decrypt.dart
+++ b/lib/controller/functions/encrypt_decrypt.dart
@@ -1,12 +1,9 @@
-import 'package:Intaleq/constant/box_name.dart';
 import 'package:Intaleq/env/env.dart';
 import 'package:encrypt/encrypt.dart' as encrypt;
 import 'package:flutter/foundation.dart';
 import 'package:secure_string_operations/secure_string_operations.dart';

 import '../../constant/char_map.dart';
-import '../../main.dart';
-import '../../print.dart';

 class EncryptionHelper {
  static EncryptionHelper? _instance;
--- a/lib/controller/functions/package_info.dart
+++ b/lib/controller/functions/package_info.dart
@@ -330,7 +330,7 @@ class DeviceHelper {

      // Extract relevant device information
      final String deviceId = Platform.isAndroid
-          ? deviceData['androidId'] ?? deviceData['serialNumber'] ?? 'unknown'
+          ? deviceData['androidId'] ?? deviceData['fingerprint'] ?? 'unknown'
          : deviceData['identifierForVendor'] ?? 'unknown';

      final String deviceModel = deviceData['model'] ?? 'unknown';
--- a/lib/controller/functions/secure_storage.dart
+++ b/lib/controller/functions/secure_storage.dart
@@ -26,10 +26,10 @@ class SecureStorage {

 const List<String> keysToFetch = [
  'serverPHP',
-  'seferAlexandriaServer',
-  'seferPaymentServer',
-  'seferCairoServer',
-  'seferGizaServer',
+  // 'seferAlexandriaServer',
+  // 'seferPaymentServer',
+  // 'seferCairoServer',
+  // 'seferGizaServer',
 ];

 class AppInitializer {
@@ -39,10 +39,9 @@ class AppInitializer {
    if (box.read(BoxName.jwt) == null) {
      await LoginController().getJWT();
    } else {
-      bool isTokenExpired = JwtDecoder.isExpired(X
-          .r(X.r(X.r(box.read(BoxName.jwt), cn), cC), cs)
-          .toString()
-          .split(AppInformation.addd)[0]);
+      bool isTokenExpired = JwtDecoder.isExpired(
+          r(box.read(BoxName.jwt)).toString().split(AppInformation.addd)[0]);
+
      if (isTokenExpired) {
        await LoginController().getJWT();
      }
--- a/lib/controller/home/map_passenger_controller.dart
+++ b/lib/controller/home/map_passenger_controller.dart
@@ -174,9 +174,9 @@ class MapPassengerController extends GetxController {
  bool rideConfirm = false;
  bool isMarkersShown = false;
  bool isMainBottomMenuMap = true;
-  late Timer markerReloadingTimer2;
-  late Timer markerReloadingTimer1;
-  late int durationToPassenger = 0;
+  Timer? markerReloadingTimer2 = Timer(Duration.zero, () {});
+  Timer? markerReloadingTimer1 = Timer(Duration.zero, () {});
+  int durationToPassenger = 0;
  bool isWayPointSheet = false;
  bool isWayPointStopsSheet = false;
  bool isWayPointStopsSheetUtilGetMap = false;
@@ -192,7 +192,7 @@ class MapPassengerController extends GetxController {
  var dataCarsLocationByPassenger;
  var datadriverCarsLocationToPassengerAfterApplied;
  CarLocation? nearestCar;
-  late Timer markerReloadingTimer;
+  late Timer? markerReloadingTimer = Timer(Duration.zero, () {});
  bool shouldFetch = true; // Flag to determine if fetch should be executed
  int selectedPassengerCount = 1;
  double progress = 0;
@@ -245,7 +245,7 @@ class MapPassengerController extends GetxController {
  late String driverToken = '';
  int carsOrder = 0;
  int wayPointIndex = 0;
-  late double kazan;
+  late double kazan = 8;
  String? mapAPIKEY;
  late double totalME = 0;
  late double tax = 0;
@@ -273,7 +273,10 @@ class MapPassengerController extends GetxController {
  int minutes = 0;

  // --- إضافة جديدة: للوصول إلى وحدة التحكم بالروابط ---
-  final DeepLinkController _deepLinkController = Get.find();
+  final DeepLinkController _deepLinkController =
+      Get.isRegistered<DeepLinkController>()
+          ? Get.find<DeepLinkController>()
+          : Get.put(DeepLinkController());
  // ------------------------------------------------

  void onChangedPassengerCount(int newValue) {
@@ -2640,6 +2643,15 @@ class MapPassengerController extends GetxController {
          'northeastLon': bounds.northeast.longitude.toString(),
        });
        break;
+      case 'Electric':
+        res = await CRUD()
+            .get(link: AppLink.getCarsLocationByPassengerElectric, payload: {
+          'southwestLat': bounds.southwest.latitude.toString(),
+          'southwestLon': bounds.southwest.longitude.toString(),
+          'northeastLat': bounds.northeast.latitude.toString(),
+          'northeastLon': bounds.northeast.longitude.toString(),
+        });
+        break;
      case 'Pink Bike':
        res = await CRUD()
            .get(link: AppLink.getCarsLocationByPassengerPinkBike, payload: {
@@ -3198,9 +3210,9 @@ class MapPassengerController extends GetxController {

    // 1. إلغاء المؤقتات الفردية
    // Using ?.cancel() is safe even if the timer is null
-    markerReloadingTimer.cancel();
-    markerReloadingTimer1.cancel();
-    markerReloadingTimer2.cancel();
+    markerReloadingTimer!.cancel();
+    markerReloadingTimer1!.cancel();
+    markerReloadingTimer2!.cancel();
    timerToPassengerFromDriverAfterApplied?.cancel();
    _timer?.cancel();

@@ -3302,11 +3314,6 @@ class MapPassengerController extends GetxController {
  }

  Future cancelRide() async {
-    // if (rideConfirm == true ||
-    //     statusRide == 'Apply' ||
-    //     statusRide == 'Applied' ||
-    //     statusRide == 'wait' ||
-    //     statusRide == 'waiting') {
    clearPlacesDestination();
    clearPolyline();
    // clearPolylineAll();
@@ -3315,7 +3322,7 @@ class MapPassengerController extends GetxController {
    if (rideId != 'yet') {
      Log.print('cancelRide: 1');
      await firebaseMessagesController.sendNotificationToDriverMAP(
-        'Cancel Trip'.tr,
+        'Cancel Trip',
        'Trip Cancelled'.tr,
        driverToken.toString(),
        [],
@@ -3336,31 +3343,8 @@ class MapPassengerController extends GetxController {
          "status": 'Cancel'
        }),
      ]);
-
-      if (AppLink.endPoint != AppLink.IntaleqCairoServer) {
-        CRUD().post(
-            link: "${AppLink.endPoint}/ride/driver_order/update.php",
-            payload: {
-              "order_id": rideId.toString(), // Convert to String
-              "status": 'Cancel'
-            });
-        CRUD()
-            .post(link: "${AppLink.endPoint}/ride/rides/update.php", payload: {
-          "id": rideId.toString(), // Convert to String
-          "status": 'Cancel'
-        });
-        CRUD().post(
-            link:
-                "${AppLink.endPoint}/ride/notificationCaptain/updateWaitingTrip.php",
-            payload: {
-              "id": rideId.toString(), // Convert to String
-              "status": 'Cancel'
-            });
-      }
-      print('Cancel');
-      // }
    }
-    Future.delayed(const Duration(seconds: 1));
+    // Future.delayed(const Duration(seconds: 1));
    Get.offAll(() => const MapPagePassenger());
  }

@@ -4560,6 +4544,7 @@ class MapPassengerController extends GetxController {
      url += '&waypoints=$formattedWaypoints';
    }
    var response = await CRUD().getGoogleApi(link: url, payload: {});
+
    data = response['routes'][0]['legs'];
    box.remove(BoxName.tripData);
    box.write(BoxName.tripData, response);
@@ -4642,10 +4627,17 @@ class MapPassengerController extends GetxController {
    if (polyLines.isNotEmpty) {
      clearPolyline();
    } else {
-      // الآن بإمكانك قراءة القيمة من الـBox في أي مكان:
-      bool lowEndMode = box.read(BoxName.lowEndMode) ?? true;
+      // الآن نقرأ القيمة ونحدد عدد النقاط بناءً عليها
+      bool lowEndMode = box.read(BoxName.lowEndMode) ??
+          false; // الأفضل أن يكون الافتراضي هو الجودة العالية
+
+      // نمرر عدد النقاط المناسب هنا
+      animatePolylineLayered(
+        polylineCoordinates,
+        maxPoints:
+            lowEndMode ? 30 : 150, // 30 نقطة لوضع الأداء، 150 للوضع العادي
+      );

-      animatePolylineLayered(polylineCoordinates);
      rideConfirm = false;
      isMarkersShown = true;

@@ -4680,12 +4672,13 @@ class MapPassengerController extends GetxController {

 // 2) رسم متدرّج بطبقات متراكبة (بدون حذف)، برونزي ↔ أخضر، مع zIndex وعرض مختلف
  Future<void> animatePolylineLayered(List<LatLng> coordinates,
-      {int layersCount = 8, int stepDelayMs = 10}) async {
+      {int layersCount = 1, int stepDelayMs = 10, int maxPoints = 150}) async {
    // امسح أي طبقات قديمة فقط الخاصة بالطريق
    polyLines.removeWhere((p) => p.polylineId.value.startsWith('route_layer_'));
    update();

-    final List<LatLng> coords = _downsampleEven(coordinates, maxPoints: 20);
+    final List<LatLng> coords =
+        _downsampleEven(coordinates, maxPoints: maxPoints);
    if (coords.length < 2) return;

    // ألوان مع شفافية خفيفة للتمييز
@@ -4816,6 +4809,7 @@ class MapPassengerController extends GetxController {
    var url =
        ('${AppLink.googleMapsLink}directions/json?&language=${box.read(BoxName.lang)}&avoid=tolls|ferries&destination=$destinationSteps&origin=$originSteps&key=${AK.mapAPIKEY}');
    var response = await CRUD().getGoogleApi(link: url, payload: {});
+
    data = response['routes'][0]['legs'];
    // isLoading = false;

@@ -5300,30 +5294,23 @@ class MapPassengerController extends GetxController {
    changeBottomSheetShown();
  }

-  addToken() async {
-    String fingerPrint = await DeviceHelper.getDeviceFingerprint();
+  // addToken() async {
+  //   String fingerPrint = await DeviceHelper.getDeviceFingerprint();

-    await CRUD()
-        .post(link: "${AppLink.server}/ride/firebase/add.php", payload: {
-      'token': (box.read(BoxName.tokenFCM.toString())),
-      'passengerID': box.read(BoxName.passengerID).toString(),
-      "fingerPrint": fingerPrint
-    });
-    CRUD().postWallet(
-        link: "${AppLink.seferPaymentServer}/ride/firebase/add.php",
-        payload: {
-          'token': (box.read(BoxName.tokenFCM.toString())),
-          'passengerID': box.read(BoxName.passengerID).toString(),
-          "fingerPrint": fingerPrint
-        });
-    // CRUD().post(
-    //     link: "${AppLink.IntaleqGizaServer}/ride/firebase/add.php",
-    //     payload: {
-    //       'token': (box.read(BoxName.tokenFCM.toString())),
-    //       'passengerID': box.read(BoxName.passengerID).toString(),
-    //       "fingerPrint": fingerPrint
-    //     });
-  }
+  //   await CRUD()
+  //       .post(link: "${AppLink.server}/ride/firebase/add.php", payload: {
+  //     'token': (box.read(BoxName.tokenFCM.toString())),
+  //     'passengerID': box.read(BoxName.passengerID).toString(),
+  //     "fingerPrint": fingerPrint
+  //   });
+  //   CRUD().postWallet(
+  //       link: "${AppLink.seferPaymentServer}/ride/firebase/add.php",
+  //       payload: {
+  //         'token': (box.read(BoxName.tokenFCM.toString())),
+  //         'passengerID': box.read(BoxName.passengerID).toString(),
+  //         "fingerPrint": fingerPrint
+  //       });
+  // }

  List<LatLng> polylineCoordinate = [];
  String? cardNumber;
@@ -5794,13 +5781,13 @@ class MapPassengerController extends GetxController {
  void onInit() async {
    super.onInit();
 // // --- إضافة جديدة: تهيئة وحدة التحكم في الروابط العميقة ---
-//     Get.put(DeepLinkController(), permanent: true);
+    Get.put(DeepLinkController(), permanent: true);
 //     // ----------------------------------------------------
    // مرحلة 0: الضروري جداً لعرض الخريطة سريعاً
-    mapAPIKEY = await storage.read(key: BoxName.mapAPIKEY);
+    // mapAPIKEY = await storage.read(key: BoxName.mapAPIKEY);
    await initilizeGetStorage(); // إعداد سريع
    await _initMinimalIcons(); // start/end فقط
-    await addToken(); // لو لازم للمصادقة
+    // await addToken(); // لو لازم للمصادقة
    _listenForDeepLink();
    await getLocation(); // لتحديد الكاميرا
    box.write(BoxName.carType, 'yet');
--- a/lib/controller/home/splash_screen_controlle.dart
+++ b/lib/controller/home/splash_screen_controlle.dart
@@ -1,110 +1,140 @@
 import 'dart:async';
-
-import 'package:Intaleq/constant/style.dart';
-import 'package:Intaleq/controller/functions/secure_storage.dart';
-import 'package:Intaleq/views/widgets/my_scafold.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:Intaleq/views/auth/login_page.dart';
 import 'package:package_info_plus/package_info_plus.dart';
-// import 'package:uni_links/uni_links.dart';
+import 'package:Intaleq/constant/box_name.dart';
+import 'package:Intaleq/onbording_page.dart';
+import 'package:Intaleq/views/auth/login_page.dart';
+import 'package:Intaleq/controller/auth/login_controller.dart';
+import 'package:Intaleq/controller/functions/secure_storage.dart';
+import 'package:Intaleq/views/widgets/my_scafold.dart';
+import 'package:Intaleq/constant/style.dart';

-import '../../constant/box_name.dart';
 import '../../main.dart';
-import '../../onbording_page.dart';
-import '../../views/auth/otp_page.dart';
-import '../auth/login_controller.dart';

+// كنترولر مع منطق تحميل محسن ينتظر العمليات غير المتزامنة
 class SplashScreenController extends GetxController
    with GetTickerProviderStateMixin {
  late AnimationController _animationController;
-  late Animation<double> animation;
+
+  // الحركات الخاصة بكل عنصر من عناصر الواجهة
+  late Animation<double> titleFadeAnimation;
+  late Animation<double> titleScaleAnimation;
+  late Animation<double> taglineFadeAnimation;
+  late Animation<Offset> taglineSlideAnimation;
+  late Animation<double> footerFadeAnimation;
+
  final progress = 0.0.obs;
  Timer? _progressTimer;

-  String packageInfo = '';
-
-  Future<void> _getPackageInfo() async {
-    final info = await PackageInfo.fromPlatform();
-    packageInfo = info.version;
-    box.write(BoxName.packagInfo, packageInfo);
-    update();
-  }
-
-  String iss = '';
  @override
-  Future<void> onInit() async {
+  void onInit() {
    super.onInit();

-    // storage.read(key: 'iss').then((s) {
-    //   // print(s);
-    //   iss = s!;
-    // });
-    // if (iss == null) {
-    SecureStorage().saveData('iss', 'mobile-app:');
-    // }
-
-    _getPackageInfo();
    _animationController = AnimationController(
      vsync: this,
-      duration: const Duration(milliseconds: 1500), // Reduced duration
-    )..forward();
+      duration: const Duration(milliseconds: 2000),
+    );

-    animation =
-        CurvedAnimation(parent: _animationController, curve: Curves.easeOut);
+    // --- تعريف الحركات المتتالية ---
+    titleFadeAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: const Interval(0.0, 0.5, curve: Curves.easeOut),
+      ),
+    );
+    titleScaleAnimation = Tween<double>(begin: 0.8, end: 1.0).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: const Interval(0.0, 0.5, curve: Curves.easeOut),
+      ),
+    );
+    taglineFadeAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: const Interval(0.3, 0.8, curve: Curves.easeOut),
+      ),
+    );
+    taglineSlideAnimation =
+        Tween<Offset>(begin: const Offset(0, 0.5), end: Offset.zero).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: const Interval(0.3, 0.8, curve: Curves.easeOut),
+      ),
+    );
+    footerFadeAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: const Interval(0.5, 1.0, curve: Curves.easeOut),
+      ),
+    );

-    startTimer();
-    _startProgressTimer();
+    _animationController.forward();
+
+    // بدء عملية التهيئة والتحميل
+    _initializeApp();
  }

-  void _startProgressTimer() {
-    const totalTime = 2000; // 5 seconds in milliseconds
-    const interval = 50; // Update every 50ms
+  /// تهيئة التطبيق وانتظار انتهاء التحميل قبل الانتقال
+  Future<void> _initializeApp() async {
+    // تشغيل مؤقت شريط التقدم ليعطي انطباعاً مرئياً فقط
+    _startProgressAnimation();
+
+    // تعريف مهمتين: منطق التحميل، والحد الأدنى لوقت عرض الشاشة
+    final logicFuture = _performNavigationLogic();
+    final minTimeFuture = Future.delayed(const Duration(seconds: 3));
+
+    // الانتظار حتى انتهاء المهمتين معاً
+    await Future.wait([logicFuture, minTimeFuture]);
+
+    // بعد انتهاء الانتظار، سيتم الانتقال تلقائياً من داخل a_performNavigationLogic
+  }
+
+  /// تشغيل حركة شريط التقدم بشكل مرئي ومنفصل عن منطق التحميل
+  void _startProgressAnimation() {
+    const totalTime = 2800; // مدة ملء الشريط
+    const interval = 50;
    int elapsed = 0;

    _progressTimer =
-        Timer.periodic(const Duration(milliseconds: interval), (timer) async {
+        Timer.periodic(const Duration(milliseconds: interval), (timer) {
      elapsed += interval;
      progress.value = (elapsed / totalTime).clamp(0.0, 1.0);
-
      if (elapsed >= totalTime) {
        timer.cancel();
-        // await SecurityHelper.performSecurityChecks();
-        // if (box.read('isNotTrust') ||
-        //     box.read('isJailBroken') ||
-        //     box.read('isTampered')) {
-        //   Get.to(() => SecurityPage());
-        // } else {
-        box.read(BoxName.onBoarding) == null
-            ? Get.off(() => OnBoardingPage())
-            : box.read(BoxName.email) != null &&
-                    box.read(BoxName.phone) != null &&
-                    box.read(BoxName.isVerified) == '1'
-                // ? Get.off(() => const MapPagePassenger())
-                ? await Get.put(LoginController()).loginUsingCredentials(
-                    box.read(BoxName.passengerID).toString(),
-                    box.read(BoxName.email).toString(),
-                  )
-                : Get.off(() => LoginPage());
      }
-      // }
    });
  }

-  void startTimer() async {
-    Timer(const Duration(seconds: 5), () async {
-      // box.read(BoxName.onBoarding) == null
-      //     ? Get.off(() => OnBoardingPage())
-      //     : box.read(BoxName.email) != null &&
-      //             box.read(BoxName.phone) != null &&
-      //             box.read(BoxName.isVerified) == '1'
-      //         // ? Get.off(() => const MapPagePassenger())
-      //         ? await Get.put(LoginController()).loginUsingCredentials(
-      //             box.read(BoxName.passengerID).toString(),
-      //             box.read(BoxName.email).toString(),
-      //           )
-      //         : Get.off(() => LoginPage());
-    });
+  /// تنفيذ منطق التحميل الفعلي وتسجيل الدخول وتحديد وجهة الانتقال
+  Future<void> _performNavigationLogic() async {
+    // تنفيذ المهام الأولية
+    await _getPackageInfo();
+    SecureStorage().saveData('iss', 'mobile-app:');
+
+    // تحديد الشاشة التالية
+    if (box.read(BoxName.onBoarding) == null) {
+      Get.off(() => OnBoardingPage());
+    } else if (box.read(BoxName.email) != null &&
+        box.read(BoxName.phone) != null &&
+        box.read(BoxName.isVerified) == '1') {
+      // -- النقطة الأهم --
+      // هنا ننتظر انتهاء عملية تسجيل الدخول قبل الانتقال
+      await Get.put(LoginController()).loginUsingCredentials(
+        box.read(BoxName.passengerID).toString(),
+        box.read(BoxName.email).toString(),
+      );
+      // بعد هذه العملية، سيتولى LoginController بنفسه الانتقال للصفحة الرئيسية أو صفحة الدخول
+    } else {
+      Get.off(() => LoginPage());
+    }
+  }
+
+  /// جلب معلومات الحزمة لعرض إصدار التطبيق
+  Future<void> _getPackageInfo() async {
+    final info = await PackageInfo.fromPlatform();
+    box.write(BoxName.packagInfo, info.version);
+    update();
  }

  @override
@@ -115,6 +145,7 @@ class SplashScreenController extends GetxController
  }
 }

+// يمكن الإبقاء على هذه الفئة لواجهة المستخدم المتعلقة بالأمان كما في الملف الأصلي
 class SecurityPage extends StatelessWidget {
  const SecurityPage({
    super.key,
--- a/lib/controller/local/translations.dart
+++ b/lib/controller/local/translations.dart
@@ -5,7 +5,7 @@ class MyTranslation extends Translations {
  Map<String, Map<String, String>> get keys => {
        "ar": {
          "Syria": "سوريا",
-          "SYP": "ليرة سورية",
+          "SYP": "ل.س",
          "Order": "طلب",
          "OrderVIP": "طلب VIP",
          "Hi ,I Arrive your site": "أنا وصلت لموقعك",
@@ -141,10 +141,15 @@ class MyTranslation extends Translations {
          "Order for myself": "اطلب لنفسي",
          "Are you want to go this site": "هل تريد الذهاب إلى هذا الموقع؟",
          "No": "لا",
+          'Pay by Sham Cash': 'الدفع عبر شام كاش',
          "Intaleq Wallet": "محفظة انطلق",
          "Have a promo code?": "هل لديك رمز خصم؟",
          "Your Wallet balance is ": "رصيد محفظتك هو ",
          "Cash": "كاش",
+          'Phone Number': 'رقم الموبايل',
+          'Search country': 'ابحث عن دولة',
+          'Payment Successful!': 'تم الدفع بنجاح!',
+          'Your payment was successful.': 'تم الدفع بنجاح.',
          "Pay directly to the captain": "ادفع للكابتن مباشرة",
          "Top up Wallet to continue": "اشحن المحفظة للمتابعة",
          "Or pay with Cash instead": "أو ادفع كاش بدلاً من ذلك",