From c5f8c6cd8e32fde546087d132a0a45efad882762 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Sun, 2 Aug 2026 00:56:07 +0300 Subject: [PATCH] Update: 2026-08-02 00:56:07 --- intaleq_driver/firebase.json | 2 +- intaleq_driver/lib/firebase_options.dart | 24 ++++++++++--------- intaleq_rider/firebase.json | 2 +- .../home/map/map_socket_controller.dart | 14 +---------- intaleq_rider/lib/firebase_options.dart | 24 ++++++++++--------- 5 files changed, 29 insertions(+), 37 deletions(-) diff --git a/intaleq_driver/firebase.json b/intaleq_driver/firebase.json index ae1d9ad..1f04576 100644 --- a/intaleq_driver/firebase.json +++ b/intaleq_driver/firebase.json @@ -1 +1 @@ -{"flutter":{"platforms":{"android":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:android:492d9bc1df6b40c51632ca","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:ios:a86f1a54f0b1aaa21632ca","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"siro-a6957","configurations":{"android":"1:825988584191:android:492d9bc1df6b40c51632ca","ios":"1:825988584191:ios:a86f1a54f0b1aaa21632ca"}}}}}} \ No newline at end of file +{"flutter":{"platforms":{"android":{"default":{"projectId":"intaleq-d48a7","appId":"1:1086900987150:android:e3daebe53bf691de77a35f","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"intaleq-d48a7","appId":"1:1086900987150:ios:6d2c7f479c82ba7077a35f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"intaleq-d48a7","configurations":{"android":"1:1086900987150:android:e3daebe53bf691de77a35f","ios":"1:1086900987150:ios:6d2c7f479c82ba7077a35f"}}}}}} \ No newline at end of file diff --git a/intaleq_driver/lib/firebase_options.dart b/intaleq_driver/lib/firebase_options.dart index c0e1ae0..c10a000 100644 --- a/intaleq_driver/lib/firebase_options.dart +++ b/intaleq_driver/lib/firebase_options.dart @@ -50,18 +50,20 @@ class DefaultFirebaseOptions { } static const FirebaseOptions android = FirebaseOptions( - apiKey: 'AIzaSyAEoply_UcEP6KaCu_ziCy_ZDIjAKvi7b8', - appId: '1:825988584191:android:492d9bc1df6b40c51632ca', - messagingSenderId: '825988584191', - projectId: 'siro-a6957', - storageBucket: 'siro-a6957.firebasestorage.app', + apiKey: 'AIzaSyCFsWBqvkXzk1Gb-bCGxwqTwJQKIeHjH64', + appId: '1:1086900987150:android:e3daebe53bf691de77a35f', + messagingSenderId: '1086900987150', + projectId: 'intaleq-d48a7', + storageBucket: 'intaleq-d48a7.firebasestorage.app', ); static const FirebaseOptions ios = FirebaseOptions( - apiKey: 'AIzaSyDk6x6KZUY0IQtxoCMXX0F7N_yik8O19eA', - appId: '1:825988584191:ios:a86f1a54f0b1aaa21632ca', - messagingSenderId: '825988584191', - projectId: 'siro-a6957', - storageBucket: 'siro-a6957.firebasestorage.app', - iosBundleId: 'com.siro.siro-driver', + apiKey: 'AIzaSyAwG09AeehwBfktpKKJwCKQOtEUpHtr-p0', + appId: '1:1086900987150:ios:6d2c7f479c82ba7077a35f', + messagingSenderId: '1086900987150', + projectId: 'intaleq-d48a7', + storageBucket: 'intaleq-d48a7.firebasestorage.app', + androidClientId: '1086900987150-060srlmdjocdcav377rbur4ka14m90b7.apps.googleusercontent.com', + iosClientId: '1086900987150-6mpaq0ookehlvljtsp2aes26dqpukok1.apps.googleusercontent.com', + iosBundleId: 'com.Intaleq.driver', ); } diff --git a/intaleq_rider/firebase.json b/intaleq_rider/firebase.json index 65a5084..5989b4c 100644 --- a/intaleq_rider/firebase.json +++ b/intaleq_rider/firebase.json @@ -1 +1 @@ -{"flutter":{"platforms":{"android":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:android:7e9088b719dcb7061632ca","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:ios:4f60966dd0a69b3f1632ca","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"siro-a6957","configurations":{"android":"1:825988584191:android:7e9088b719dcb7061632ca","ios":"1:825988584191:ios:4f60966dd0a69b3f1632ca","macos":"1:825988584191:ios:7b48f585862d5cfc1632ca"}}},"macos":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:ios:7b48f585862d5cfc1632ca","uploadDebugSymbols":false,"fileOutput":"macos/Runner/GoogleService-Info.plist"}}}}} \ No newline at end of file +{"flutter":{"platforms":{"android":{"default":{"projectId":"intaleq-d48a7","appId":"1:1086900987150:android:b7231956aa6d3b3377a35f","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"intaleq-d48a7","appId":"1:1086900987150:ios:a60973accd7f3dc777a35f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"intaleq-d48a7","configurations":{"android":"1:1086900987150:android:b7231956aa6d3b3377a35f","ios":"1:1086900987150:ios:a60973accd7f3dc777a35f"}}},"macos":{"default":{"projectId":"siro-a6957","appId":"1:825988584191:ios:7b48f585862d5cfc1632ca","uploadDebugSymbols":false,"fileOutput":"macos/Runner/GoogleService-Info.plist"}}}}} \ No newline at end of file diff --git a/intaleq_rider/lib/controller/home/map/map_socket_controller.dart b/intaleq_rider/lib/controller/home/map/map_socket_controller.dart index 837be14..e4eb003 100644 --- a/intaleq_rider/lib/controller/home/map/map_socket_controller.dart +++ b/intaleq_rider/lib/controller/home/map/map_socket_controller.dart @@ -86,7 +86,7 @@ class MapSocketController extends GetxController { io_client.OptionBuilder() .setTransports(['websocket']) .disableAutoConnect() - .setQuery({'id': passengerId, 'jwt': jwt}) + .setQuery({'id': passengerId, 'jwt': jwt, 'EIO': '3'}) // محاولات لا نهائية، توحيداً مع تطبيق السائق (background_service.dart). // كانت 20: بعدها يستسلم السوكيت **نهائياً** فيصمت للأبد بعد بضع دقائق // من شبكة سيئة، ويبقى الراكب على الـ polling بلا أن يدري. صار الاتصال @@ -173,18 +173,6 @@ class MapSocketController extends GetxController { socket.on('connect_error', (error) { Log.print("❌ Socket Connect Error: $error"); isSocketConnected = false; - // في الإصدار 1.0.2 أحياناً auto-reconnect لا يعمل بعد connect_error - // نتأكد يدوياً من إعادة الاتصال - Future.delayed(const Duration(seconds: 3), () { - if (!isSocketConnected && _isSocketInitialized) { - Log.print("🔄 Manual reconnect after connect_error..."); - try { - socket.connect(); - } catch (e) { - Log.print("Manual reconnect error: $e"); - } - } - }); }); socket.on('ride_status_change', (data) { diff --git a/intaleq_rider/lib/firebase_options.dart b/intaleq_rider/lib/firebase_options.dart index ce959ee..e813677 100644 --- a/intaleq_rider/lib/firebase_options.dart +++ b/intaleq_rider/lib/firebase_options.dart @@ -47,19 +47,21 @@ class DefaultFirebaseOptions { } static const FirebaseOptions android = FirebaseOptions( - apiKey: 'AIzaSyAEoply_UcEP6KaCu_ziCy_ZDIjAKvi7b8', - appId: '1:825988584191:android:7e9088b719dcb7061632ca', - messagingSenderId: '825988584191', - projectId: 'siro-a6957', - storageBucket: 'siro-a6957.firebasestorage.app', + apiKey: 'AIzaSyCFsWBqvkXzk1Gb-bCGxwqTwJQKIeHjH64', + appId: '1:1086900987150:android:b7231956aa6d3b3377a35f', + messagingSenderId: '1086900987150', + projectId: 'intaleq-d48a7', + storageBucket: 'intaleq-d48a7.firebasestorage.app', ); static const FirebaseOptions ios = FirebaseOptions( - apiKey: 'AIzaSyDk6x6KZUY0IQtxoCMXX0F7N_yik8O19eA', - appId: '1:825988584191:ios:4f60966dd0a69b3f1632ca', - messagingSenderId: '825988584191', - projectId: 'siro-a6957', - storageBucket: 'siro-a6957.firebasestorage.app', - iosBundleId: 'com.siroapp.rider', + apiKey: 'AIzaSyDzGO9a-1IDMLD2FxhmOO9ONL1gMssFa9g', + appId: '1:1086900987150:ios:a60973accd7f3dc777a35f', + messagingSenderId: '1086900987150', + projectId: 'intaleq-d48a7', + storageBucket: 'intaleq-d48a7.firebasestorage.app', + androidClientId: '1086900987150-060srlmdjocdcav377rbur4ka14m90b7.apps.googleusercontent.com', + iosClientId: '1086900987150-9jv4oa8l3t23d54lrf27c1d22tbt9i6d.apps.googleusercontent.com', + iosBundleId: 'com.Intaleq.intaleq', ); static const FirebaseOptions macos = FirebaseOptions( apiKey: 'AIzaSyDk6x6KZUY0IQtxoCMXX0F7N_yik8O19eA',