Update: 2026-06-12 01:23:54

2026-06-12 01:23:54 +03:00
parent 7049c7468c
commit ef6b52d2e3
47 changed files with 1480 additions and 1472 deletions
--- a/siro_service/lib/constant/links.dart
+++ b/siro_service/lib/constant/links.dart
@@ -9,22 +9,80 @@ class AppLink {
  static final String seferAlexandriaServer = Env.seferAlexandriaServer;
  static final String seferCairoServer = Env.seferCairoServer;
  static final String seferGizaServer = Env.seferGizaServer;
-  static String paymentServer = 'https://walletintaleq.intaleq.xyz/v1/main';
-  static String locationServer = 'https://location.intaleq.xyz/siro/ride/location';
-  static String location = locationServer;
-  static String locationServerSide = 'https://location.intaleq.xyz/siro/ride/location';
-  static String mapSaasRoute = 'https://map-saas.intaleqapp.com/api/maps/route';
-  static String mapSaasPlaces = 'https://map-saas.intaleqapp.com/api/geocoding/places';
-  static const String routeApiBaseUrl = "https://routesjo.intaleq.xyz/route/v1/driving";
-  static final String syria = 'https://syria.intaleq.xyz/siro';
+  static String get currentCountry => box.read('countryCode') ?? 'Jordan';
+
+  static String get paymentServer {
+    switch (currentCountry) {
+      case 'Syria': return 'https://wallet-syria.siromove.com/v1/main';
+      case 'Egypt': return 'https://wallet-egypt.siromove.com/v1/main';
+      case 'Jordan': return 'https://wallet-jordan.siromove.com/v1/main';
+      default: return 'https://wallet.siromove.com/v1/main';
+    }
+  }
+
+  static String get locationServer {
+    switch (currentCountry) {
+      case 'Syria': return 'https://location-syria.siromove.com/siro/ride/location';
+      case 'Egypt': return 'https://location-egypt.siromove.com/siro/ride/location';
+      case 'Jordan': return 'https://location-jordan.siromove.com/siro/ride/location';
+      default: return 'https://location.siromove.com/siro/ride/location';
+    }
+  }
+
+  static String get location => locationServer;
+  static String get locationServerSide => locationServer;
+
+  static String get mapSaasRoute {
+    switch (currentCountry) {
+      case 'Syria': return 'https://map-syria.siromove.com/api/maps/route';
+      case 'Egypt': return 'https://map-egypt.siromove.com/api/maps/route';
+      case 'Jordan': return 'https://map-jordan.siromove.com/api/maps/route';
+      default: return 'https://map-saas.intaleqapp.com/api/maps/route';
+    }
+  }
+
+  static String get mapSaasPlaces {
+    switch (currentCountry) {
+      case 'Syria': return 'https://map-syria.siromove.com/api/geocoding/places';
+      case 'Egypt': return 'https://map-egypt.siromove.com/api/geocoding/places';
+      case 'Jordan': return 'https://map-jordan.siromove.com/api/geocoding/places';
+      default: return 'https://map-saas.intaleqapp.com/api/geocoding/places';
+    }
+  }
+
+  static String get routeApiBaseUrl {
+    switch (currentCountry) {
+      case 'Syria': return 'https://routes-syria.siromove.com/route/v1/driving';
+      case 'Egypt': return 'https://routes-egypt.siromove.com/route/v1/driving';
+      case 'Jordan': return 'https://routes-jordan.siromove.com/route/v1/driving';
+      default: return 'https://routes.siromove.com/route/v1/driving';
+    }
+  }
+
+  static String get syria => 'https://api-syria.siromove.com/siro';
  
  static String seferPaymentServer0 = box.read('seferPaymentServer');

-  static final String endPoint = 'https://api.intaleq.xyz/siro_v3';
-  static final String rideServer = 'https://rides.intaleq.xyz/siro';
-  // static final String server = Env.serverPHP;
-  static String getBestDriver = "$server/Admin/driver/getBestDriver.php";
-  static final String server = 'https://api.intaleq.xyz/siro_v3';
+  static String get endPoint {
+    switch (currentCountry) {
+      case 'Syria': return 'https://api-syria.siromove.com/siro_v3';
+      case 'Egypt': return 'https://api-egypt.siromove.com/siro_v3';
+      case 'Jordan': return 'https://api-jordan.siromove.com/siro_v3';
+      default: return 'https://api.siromove.com/siro_v3';
+    }
+  }
+
+  static String get rideServer {
+    switch (currentCountry) {
+      case 'Syria': return 'https://api-syria.siromove.com/siro';
+      case 'Egypt': return 'https://api-egypt.siromove.com/siro';
+      case 'Jordan': return 'https://api-jordan.siromove.com/siro';
+      default: return 'https://api.siromove.com/siro';
+    }
+  }
+
+  static String get getBestDriver => "$server/Admin/driver/getBestDriver.php";
+  static String get server => endPoint;
  static final String jwtService = '$server/jwtService.php';
  static String addError = "$server/Admin/errorApp.php";

--- a/siro_service/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/siro_service/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -13,7 +13,6 @@ import firebase_messaging
 import flutter_image_compress_macos
 import flutter_local_notifications
 import flutter_secure_storage_macos
-import google_sign_in_ios
 import share_plus
 import sqflite_darwin
 import url_launcher_macos
@@ -27,7 +26,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin"))
  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
-  FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin"))
  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
--- a/siro_service/pubspec.lock
+++ b/siro_service/pubspec.lock
@@ -600,54 +600,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "6.3.3"
-  google_identity_services_web:
-    dependency: transitive
-    description:
-      name: google_identity_services_web
-      sha256: "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.3+1"
-  google_sign_in:
-    dependency: "direct main"
-    description:
-      name: google_sign_in
-      sha256: "521031b65853b4409b8213c0387d57edaad7e2a949ce6dea0d8b2afc9cb29763"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.2.0"
-  google_sign_in_android:
-    dependency: transitive
-    description:
-      name: google_sign_in_android
-      sha256: df5c15533814ed20b7d9e1c5a40a73f174e5d5017bd2669b1c72fb6596fde812
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.2.11"
-  google_sign_in_ios:
-    dependency: transitive
-    description:
-      name: google_sign_in_ios
-      sha256: ac1e4c1205267cb7999d1d81333fccffdfda29e853f434bbaf71525498bb6950
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.3.0"
-  google_sign_in_platform_interface:
-    dependency: transitive
-    description:
-      name: google_sign_in_platform_interface
-      sha256: "7f59208c42b415a3cca203571128d6f84f885fead2d5b53eb65a9e27f2965bb5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  google_sign_in_web:
-    dependency: transitive
-    description:
-      name: google_sign_in_web
-      sha256: d473003eeca892f96a01a64fc803378be765071cb0c265ee872c7f8683245d14
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.3"
  graphs:
    dependency: transitive
    description:
--- a/siro_service/pubspec.yaml
+++ b/siro_service/pubspec.yaml
@@ -49,7 +49,6 @@ dependencies:
  url_launcher: ^6.3.0
  flutter_launcher_icons: ^0.14.3
  envied: ^1.1.1
-  google_sign_in: ^7.1.1
  firebase_auth: ^6.0.0
  vibration: ^3.1.3
  flutter_secure_storage: ^9.2.2