Update: 2026-07-10 19:42:49

siro_driver/android/app/src/main/kotlin/com/example/intaleq_driver/MapPresentation.kt

@@ -71,7 +71,7 @@ class MapPresentation(outerContext: Context, display: Display) : Presentation(ou
                 "asset://packages/intaleq_maps/assets/style_dark.json"
             else
                 "asset://packages/intaleq_maps/assets/style.json"
-            map.setStyle(Style.Builder().fromUri(currentStyleLoaded)) {
+            map.setStyle(Style.Builder().fromUri(currentStyleLoaded!!)) {
                 isMapReady = true
                 updateCameraPosition()
             }

siro_driver/ios/Runner/AppDelegate.swift

@@ -1,7 +1,6 @@
 import UIKit
 import Flutter
 import FirebaseCore
-import CarPlay
 
 import CoreLocation
 
@@ -29,7 +28,6 @@ import CoreLocation
 
         // تهيئة قنوات الاتصال مع Flutter
         setupMethodChannel()
-        setupCarNavigationChannel()
 
         // ضبط مدير الموقع لمتابعة تغييرات الأذونات
         locationManager.delegate = self
@@ -38,33 +36,7 @@ import CoreLocation
         return super.application(application, didFinishLaunchingWithOptions: launchOptions)
     }
 
-    // MARK: - CarPlay Connection (Non-Scene API)
 
-    override func application(
-        _ application: UIApplication,
-        didConnectCarInterfaceController interfaceController: CPInterfaceController,
-        to window: CPWindow
-    ) {
-        let sceneDelegate = CarPlaySceneDelegate()
-        sceneDelegate.interfaceController = interfaceController
-
-        let mapTemplate = CPMapTemplate()
-        sceneDelegate.mapTemplate = mapTemplate
-        mapTemplate.guidanceBackgroundStyle = .light
-
-        interfaceController.setRootTemplate(mapTemplate, animated: true)
-
-        CarPlayState.shared.sceneDelegate = sceneDelegate
-    }
-
-    override func application(
-        _ application: UIApplication,
-        didDisconnectCarInterfaceController interfaceController: CPInterfaceController,
-        from window: CPWindow
-    ) {
-        CarPlayState.shared.sceneDelegate?.stopNavigation()
-        CarPlayState.shared.sceneDelegate = nil
-    }
 
     // MARK: - تهيئة القناة بين Swift و Flutter
     func setupMethodChannel() {
@@ -84,95 +56,6 @@ import CoreLocation
         }
     }
 
-    // MARK: - Car Navigation Method Channel
-
-    func setupCarNavigationChannel() {
-        guard let controller = window?.rootViewController as? FlutterViewController else {
-            return
-        }
-
-        let channel = FlutterMethodChannel(
-            name: "com.siro.siro_driver/car_navigation",
-            binaryMessenger: controller.binaryMessenger
-        )
-        channel.setMethodCallHandler { [weak self] call, result in
-            guard let self = self else { return }
-            switch call.method {
-            case "updateNavState":
-                let lat = (call.arguments as? [String: Any])?["lat"] as? Double ?? 0
-                let lng = (call.arguments as? [String: Any])?["lng"] as? Double ?? 0
-                let bearing = (call.arguments as? [String: Any])?["bearing"] as? Double ?? 0
-                let speed = (call.arguments as? [String: Any])?["speed"] as? Double ?? 0
-                let instruction = (call.arguments as? [String: Any])?["instruction"] as? String ?? ""
-                let distanceToStep = (call.arguments as? [String: Any])?["distanceToStep"] as? Double ?? 0
-                let eta = (call.arguments as? [String: Any])?["eta"] as? Double ?? 0
-                let maneuver = (call.arguments as? [String: Any])?["maneuver"] as? Int ?? 0
-                let isNavigating = (call.arguments as? [String: Any])?["isNavigating"] as? Bool ?? false
-
-                DispatchQueue.main.async {
-                    guard let delegate = CarPlayState.shared.sceneDelegate else { return }
-                    if isNavigating {
-                        if delegate.navigationSession == nil {
-                            delegate.startNavigation(
-                                instruction: instruction,
-                                distance: distanceToStep,
-                                eta: eta,
-                                maneuverType: maneuver
-                            )
-                        } else {
-                            delegate.updateManeuver(
-                                instruction: instruction,
-                                distance: distanceToStep,
-                                maneuverType: maneuver
-                            )
-                            delegate.updateArrivalEstimates(eta: eta)
-                        }
-                        delegate.updateLocation(lat: lat, lng: lng, bearing: bearing)
-                    } else {
-                        delegate.stopNavigation()
-                    }
-                }
-                result(true)
-
-            case "updateLocation":
-                let lat = (call.arguments as? [String: Any])?["lat"] as? Double ?? 0
-                let lng = (call.arguments as? [String: Any])?["lng"] as? Double ?? 0
-                let bearing = (call.arguments as? [String: Any])?["bearing"] as? Double ?? 0
-
-                DispatchQueue.main.async {
-                    CarPlayState.shared.sceneDelegate?.updateLocation(
-                        lat: lat,
-                        lng: lng,
-                        bearing: bearing
-                    )
-                }
-                result(true)
-
-            case "updateInstruction":
-                let instruction = (call.arguments as? [String: Any])?["instruction"] as? String ?? ""
-                let maneuver = (call.arguments as? [String: Any])?["maneuver"] as? Int ?? 0
-                let distanceToStep = (call.arguments as? [String: Any])?["distanceToStep"] as? Double ?? 0
-
-                DispatchQueue.main.async {
-                    CarPlayState.shared.sceneDelegate?.updateManeuver(
-                        instruction: instruction,
-                        distance: distanceToStep,
-                        maneuverType: maneuver
-                    )
-                }
-                result(true)
-
-            case "stopNavigation":
-                DispatchQueue.main.async {
-                    CarPlayState.shared.sceneDelegate?.stopNavigation()
-                }
-                result(true)
-
-            default:
-                result(FlutterMethodNotImplemented)
-            }
-        }
-    }
 
     // MARK: - عرض تنبيه عند اكتشاف جهاز مخترق
     func showSecurityAlert() {

siro_driver/ios/Runner/Runner.entitlements

@@ -4,7 +4,5 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
-	<key>com.apple.developer.carplay-driving-task</key>
-	<true/>
 </dict>
 </plist>

siro_driver/lib/constant/links.dart

@@ -352,7 +352,8 @@ class AppLink {
       "$paymentServer/ride/driverWallet/get.php";
   static String get getDriverPaymentToday =>
       "$paymentServer/ride/payment/get.php";
-  static String get getCountRide => "$rideServer/payment/getCountRide.php";
+  static String get getCountRide =>
+      "$paymentServer/ride/payment/getCountRide.php";
   static String get getAllPaymentFromRide =>
       "$paymentServer/ride/payment/getAllPayment.php";
   static String get getAllPaymentVisa =>

siro_driver/lib/controller/home/captin/home_captain_controller.dart

@@ -31,7 +31,7 @@ class HomeCaptainController extends GetxController {
   Timer? activeTimer;
   Map data = {};
   bool isHomeMapActive = true;
-  InlqBitmap carIcon = InlqBitmap.fromAsset('assets/images/car.png');
+  InlqBitmap carIcon = InlqBitmap.fromAsset('assets/images/car.png', size: 2.3);
   bool isMapReadyForCommands = false;
   bool isLoading = true;
   late double kazan = 0;
@@ -306,7 +306,7 @@ class HomeCaptainController extends GetxController {
   }
 
   void addCustomCarIcon() {
-    carIcon = InlqBitmap.fromAsset('assets/images/car.png');
+    carIcon = InlqBitmap.fromAsset('assets/images/car.png', size: 2.3);
     update();
   }
 

siro_driver/lib/controller/home/captin/map_driver_controller.dart

@@ -1791,7 +1791,7 @@ class MapDriverController extends GetxController
   }
 
   void addCustomCarIcon() {
-    carIcon = InlqBitmap.fromAsset('assets/images/car.png');
+    carIcon = InlqBitmap.fromAsset('assets/images/car.png', size: 2.3);
     update();
   }
 

siro_driver/lib/controller/home/captin/navigation_service.dart

@@ -30,7 +30,7 @@ class NavigationService extends GetxService {
   }
 
   void _loadCustomIcons() {
-    carIcon = InlqBitmap.fromAsset('assets/images/car.png');
+    carIcon = InlqBitmap.fromAsset('assets/images/car.png', size: 2.3);
     passengerIcon = InlqBitmap.fromAsset('assets/images/picker.png');
     startIcon = InlqBitmap.fromAsset('assets/images/A.png');
     endIcon = InlqBitmap.fromAsset('assets/images/b.png');

siro_driver/lib/controller/home/navigation/navigation_controller.dart

@@ -685,7 +685,7 @@ class NavigationController extends GetxController
     await mapController!.setUserMarker(Marker(
       markerId: const MarkerId('car'),
       position: myLocation!,
-      icon: InlqBitmap.fromStyleImage('car_icon'),
+      icon: InlqBitmap.fromStyleImage('car_icon', size: 2.3),
       anchor: const Offset(0.5, 0.5),
       flat: true,
       rotation: _smoothedHeading,

siro_driver/pubspec.yaml

@@ -2,7 +2,7 @@ name: siro_driver
 description: "A new Flutter project."
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.0+3
+version: 1.0.0+4
 
 environment:
   sdk: ">=3.0.5 <4.0.0"

siro_rider/android/app/src/main/kotlin/com/siro/siro_rider/AndroidLiveUpdatePlugin.kt

@@ -10,6 +10,7 @@ import android.graphics.BitmapFactory
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodCall
 
 /**
  * Android 16 Progress Style Live Update Plugin
@@ -270,7 +271,7 @@ class AndroidLiveUpdatePlugin(private val context: Context) {
     /**
      * معالجة استدعاءات MethodChannel
      */
-    fun handleMethodCall(call: MethodChannel.MethodCall, result: MethodChannel.Result) {
+    fun handleMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when (call.method) {
             "startLiveUpdate" -> {
                 val rideId = call.argument<String>("rideId") ?: ""

siro_rider/pubspec.lock

@@ -1296,10 +1296,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
+      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.19"
+    version: "0.12.18"
   material_color_utilities:
     dependency: transitive
     description:
@@ -1312,10 +1312,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
   mime:
     dependency: "direct main"
     description:
@@ -1884,10 +1884,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
+    version: "0.7.9"
   timezone:
     dependency: transitive
     description: