diff --git a/run_generation.sh b/run_generation.sh deleted file mode 100755 index 93e5032..0000000 --- a/run_generation.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -echo "🚀 Generating SIRO Rider App Icons..." -cd /Users/hamzaaleghwairyeen/development/App/Siro/siro_rider -flutter clean -flutter pub get -dart run flutter_launcher_icons:main - -echo "🚀 Generating SIRO Driver App Icons..." -cd /Users/hamzaaleghwairyeen/development/App/Siro/siro_driver -flutter clean -flutter pub get -dart run flutter_launcher_icons:main - -echo "🎨 Generating Animated GIF for SIRO Rider & Driver..." -cd /Users/hamzaaleghwairyeen/development/App/Siro -python3 -m pip install Pillow --break-system-packages -python3 /Users/hamzaaleghwairyeen/.gemini/antigravity-ide/brain/a5945c2c-de5f-4478-bd3c-d2f1c3aeec6a/scratch/pulse_logo.py /Users/hamzaaleghwairyeen/development/App/Siro/siro_rider/assets/images/logo.png /Users/hamzaaleghwairyeen/development/App/Siro/siro_rider/assets/images/logo.gif -cp /Users/hamzaaleghwairyeen/development/App/Siro/siro_rider/assets/images/logo.gif /Users/hamzaaleghwairyeen/development/App/Siro/siro_driver/assets/images/logo.gif - -echo "🍏 Fixing iOS App Icon names to match old format..." -python3 /Users/hamzaaleghwairyeen/.gemini/antigravity-ide/brain/a5945c2c-de5f-4478-bd3c-d2f1c3aeec6a/scratch/fix_ios_icons.py - -echo "✅ All Done! Icons and Animated GIFs are ready." diff --git a/siro_driver/lib/constant/links.dart b/siro_driver/lib/constant/links.dart index e18f23b..fc3906a 100755 --- a/siro_driver/lib/constant/links.dart +++ b/siro_driver/lib/constant/links.dart @@ -17,21 +17,23 @@ class AppLink { static const String appDomain = 'siromove.com'; - static String get locationServer { + static String get location { 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': - default: return 'https://location.siromove.com/siro/ride/location'; + case 'Syria': return 'https://api-syria.siromove.com/siro_v3/ride/location'; + case 'Egypt': return 'https://api-egypt.siromove.com/siro_v3/ride/location'; + case 'Jordan': return 'https://api-jordan.siromove.com/siro_v3/ride/location'; + default: return 'https://api.siromove.com/siro_v3/ride/location'; } } + static String get locationServer => locationServerSide; + static String get locationServerSide { 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': - default: return 'https://location.siromove.com/siro/ride/location'; + default: return 'https://location-jordan.siromove.com/siro/ride/location'; } } @@ -83,7 +85,14 @@ class AppLink { ///=================ride==========================/// ///https://api.intaleq.xyz/siro/ride static String get ride => '$server/ride'; - static String get rideServer => 'https://rides.intaleq.xyz/siro/ride'; + static String get rideServer { + switch (currentCountry) { + case 'Syria': return 'https://ride-syria.siromove.com/siro/ride'; + case 'Egypt': return 'https://ride-egypt.siromove.com/siro/ride'; + case 'Jordan': + default: return 'https://ride-jordan.siromove.com/siro/ride'; + } + } ///mapOSM = 'https://routesy.intaleq.xyz' static String get mapOSM { @@ -393,33 +402,33 @@ class AppLink { //==================certifcate========== // static String location = '$endPoint/ride/location'; - static String get getCarsLocationByPassenger => "$locationServer/get.php"; + static String get getCarsLocationByPassenger => "$location/get.php"; static String get addpassengerLocation => - "$locationServer/addpassengerLocation.php"; + "$locationServerSide/addpassengerLocation.php"; static String get getLocationAreaLinks => - "$locationServer/get_location_area_links.php"; + "$location/get_location_area_links.php"; static String get getLatestLocationPassenger => - "$locationServer/getLatestLocationPassenger.php"; + "$location/getLatestLocationPassenger.php"; static String get getFemalDriverLocationByPassenger => - "$locationServer/getFemalDriver.php"; + "$location/getFemalDriver.php"; static String get getDriverCarsLocationToPassengerAfterApplied => - "$locationServer/getDriverCarsLocationToPassengerAfterApplied.php"; - static String get addCarsLocationByPassenger => "$locationServer/add.php"; - static String get saveBehavior => "$locationServer/save_behavior.php"; - static String get addCarsLocationGizaEndpoint => "$locationServer/add.php"; + "$location/getDriverCarsLocationToPassengerAfterApplied.php"; + static String get addCarsLocationByPassenger => "$locationServerSide/add.php"; + static String get saveBehavior => "$locationServerSide/save_behavior.php"; + static String get addCarsLocationGizaEndpoint => "$locationServerSide/add.php"; static String get addCarsLocationAlexandriaEndpoint => - "$locationServer/add.php"; - static String get addCarsLocationCairoEndpoint => "$locationServer/add.php"; + "$locationServerSide/add.php"; + static String get addCarsLocationCairoEndpoint => "$locationServerSide/add.php"; static String get deleteCarsLocationByPassenger => - "$locationServer/delete.php"; + "$locationServerSide/delete.php"; static String get updateCarsLocationByPassenger => - "$locationServer/update.php"; + "$locationServerSide/update.php"; static String get getTotalDriverDuration => - "$locationServer/getTotalDriverDuration.php"; + "$location/getTotalDriverDuration.php"; static String get getRidesDriverByDay => - "$locationServer/getRidesDriverByDay.php"; + "$location/getRidesDriverByDay.php"; static String get getTotalDriverDurationToday => - "$locationServer/getTotalDriverDurationToday.php"; + "$location/getTotalDriverDurationToday.php"; //==================get_driver_behavior.php============= static String get get_driver_behavior => diff --git a/siro_driver/lib/controller/home/captin/home_captain_controller.dart b/siro_driver/lib/controller/home/captin/home_captain_controller.dart index 439b8e9..9dd8745 100755 --- a/siro_driver/lib/controller/home/captin/home_captain_controller.dart +++ b/siro_driver/lib/controller/home/captin/home_captain_controller.dart @@ -98,8 +98,7 @@ class HomeCaptainController extends GetxController { Future fetchAndDrawHeatmap() async { print("🚀 [Heatmap] Fetching live data..."); // استخدم الرابط المباشر لملف JSON لسرعة قصوى - final String jsonUrl = - "https://ride.intaleq.xyz/siro/ride/heatmap_data.json"; + final String jsonUrl = "${AppLink.ride}/rides/heatmap_live.json"; try { // نستخدم timestamp لمنع الكاش من الموبايل نفسه diff --git a/siro_rider/lib/constant/links.dart b/siro_rider/lib/constant/links.dart index 3d2bc7a..0e60009 100644 --- a/siro_rider/lib/constant/links.dart +++ b/siro_rider/lib/constant/links.dart @@ -81,10 +81,10 @@ class AppLink { static String get rideServerSide { 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'; + case 'Syria': return 'https://ride-syria.siromove.com/siro'; + case 'Egypt': return 'https://ride-egypt.siromove.com/siro'; + case 'Jordan': + default: return 'https://ride-jordan.siromove.com/siro'; } }