Fixes & Updates - 2026-06-01: Integrate Back-End v3 updates, fix call/connection issues across apps

lib/controller/home/captin/home_captain_controller.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:intaleq_maps/intaleq_maps.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:http/http.dart' as http;
 import 'package:sefer_driver/constant/box_name.dart';
 import 'dart:async';
@@ -29,7 +30,7 @@ class HomeCaptainController extends GetxController {
   Timer? activeTimer;
   Map data = {};
   bool isHomeMapActive = true;
-  InlqBitmap carIcon = InlqBitmap.defaultMarker;
+  InlqBitmap carIcon = InlqBitmap.fromAsset('assets/images/car.png');
   bool isMapReadyForCommands = false;
   bool isLoading = true;
   late double kazan = 0;
@@ -186,7 +187,8 @@ class HomeCaptainController extends GetxController {
     _heatmapTimer?.cancel();
     fetchAndDrawHeatmap();
 
-    _heatmapTimer = Timer.periodic(const Duration(minutes: 5), (timer) {
+    // Refresh every 15 min instead of 5 to reduce data & battery usage
+    _heatmapTimer = Timer.periodic(const Duration(minutes: 15), (timer) {
       if (isHeatmapVisible) {
         print("🔄 [Heatmap] Periodic refresh started...");
         fetchAndDrawHeatmap();
@@ -213,7 +215,8 @@ class HomeCaptainController extends GetxController {
   }
 
   String stringActiveDuration = '';
-  
+  int _fatigueSeconds = 0; // عداد ثواني الإرهاق المؤقت
+
   // ==========================================
   // ====== 🛡️ Fatigue Monitoring System ======
   // ==========================================
@@ -230,7 +233,8 @@ class HomeCaptainController extends GetxController {
       }
     }
 
-    if (totalSecondsToday >= 12 * 3600) { // 12 Hours
+    if (totalSecondsToday >= 12 * 3600) {
+      // 12 Hours
       _forceOfflineDueToFatigue();
       throw Exception('Fatigue Limit Exceeded');
     }
@@ -244,12 +248,15 @@ class HomeCaptainController extends GetxController {
       activeTimer?.cancel();
       update();
     }
-    
+
     Get.defaultDialog(
       title: 'Safety First 🛑'.tr,
-      middleText: 'You have been driving for 12 hours. For your safety and compliance, please take a 6-hour break.'.tr,
+      middleText:
+          'You have been driving for 12 hours. For your safety and compliance, please take a 6-hour break.'
+              .tr,
       barrierDismissible: false,
-      titleStyle: const TextStyle(color: Colors.red, fontWeight: FontWeight.bold),
+      titleStyle:
+          const TextStyle(color: Colors.red, fontWeight: FontWeight.bold),
       confirm: ElevatedButton(
         style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
         onPressed: () => Get.back(),
@@ -263,30 +270,34 @@ class HomeCaptainController extends GetxController {
       Get.put(CaptainWalletController());
     }
     totalPoints = Get.find<CaptainWalletController>().totalPoints;
-    
+
     // Toggle Active State
     isActive = !isActive;
-    
+
     if (isActive) {
       try {
         _checkFatigueBeforeOnline(); // Throws exception if tired
-        
+
         if (double.parse(totalPoints) > -200) {
           locationController.startLocationUpdates();
           HapticFeedback.heavyImpact();
           activeStartTime = DateTime.now();
-          
+
           activeTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
             activeDuration = DateTime.now().difference(activeStartTime!);
             stringActiveDuration = formatDuration(activeDuration);
-            
-            // Increment Fatigue Counter
-            int totalSeconds = box.read('fatigue_total_seconds') ?? 0;
-            totalSeconds += 1;
-            box.write('fatigue_total_seconds', totalSeconds);
 
-            if (totalSeconds >= 12 * 3600) { // 12 hours
-               _forceOfflineDueToFatigue();
+            // Increment Fatigue Counter (write to box every 30s)
+            _fatigueSeconds++;
+            if (_fatigueSeconds % 30 == 0) {
+              int totalSeconds =
+                  (box.read('fatigue_total_seconds') ?? 0) + _fatigueSeconds;
+              box.write('fatigue_total_seconds', totalSeconds);
+              _fatigueSeconds = 0;
+              if (totalSeconds >= 12 * 3600) {
+                // 12 hours
+                _forceOfflineDueToFatigue();
+              }
             }
 
             update();
@@ -311,7 +322,7 @@ class HomeCaptainController extends GetxController {
       activeTimer?.cancel();
       savePeriod(activeDuration);
       activeDuration = Duration.zero;
-      
+
       // Save offline time for Fatigue Monitoring reset
       box.write('fatigue_last_offline', DateTime.now().toIso8601String());
       update();
@@ -486,6 +497,7 @@ class HomeCaptainController extends GetxController {
 
   // late IntaleqMapController mapHomeCaptainController;
   IntaleqMapController? mapHomeCaptainController;
+  LatLng? _lastCameraLoc; // لتتبع آخر موقع حرك الكاميرا
 
   // --- FIX 2: Smart Map Creation ---
   void onMapCreated(IntaleqMapController controller) {
@@ -504,7 +516,7 @@ class HomeCaptainController extends GetxController {
           print(
               "🔥 [HomeCaptain] Safely moving camera to: ${currentLoc.latitude}");
           mapHomeCaptainController!.moveCamera(
-            CameraUpdate.newLatLngZoom(currentLoc, 15),
+            CameraUpdate.newLatLngZoom(currentLoc, 17.5),
           );
         } else {
           print("🔥 [HomeCaptain] Safely moving to default Damascus");
@@ -680,19 +692,30 @@ class HomeCaptainController extends GetxController {
     checkAndShowBlockDialog();
     box.write(BoxName.statusDriverLocation, 'off');
     // 2. عدل الليسنر ليصبح مشروطاً
-    // 2. مؤقت التتبع التلقائي (كل 5 ثوانٍ كما في الكود السابق)
-    _cameraFollowTimer = Timer.periodic(const Duration(seconds: 5), (timer) {
+    // Camera follow timer — only moves when the driver has
+    // actually moved > 15 meters, saving GPU/battery on idle.
+    _cameraFollowTimer = Timer.periodic(const Duration(seconds: 8), (timer) {
       if (isClosed ||
           !isHomeMapActive ||
           mapHomeCaptainController == null ||
+          !isMapReadyForCommands ||
           !isActive) return;
 
       var loc = locationController.myLocation;
       if (loc.latitude != 0 && loc.latitude != null && !loc.latitude.isNaN) {
+        // Skip if driver hasn't moved significantly
+        if (_lastCameraLoc != null) {
+          final double dist = Geolocator.distanceBetween(
+            _lastCameraLoc!.latitude,
+            _lastCameraLoc!.longitude,
+            loc.latitude,
+            loc.longitude,
+          );
+          if (dist < 15) return;
+        }
+        _lastCameraLoc = loc;
         try {
-          // 🔥 Safety double-check before animating
           if (mapHomeCaptainController != null) {
-            print("🔥 [HomeCaptain] Safely moving camera to: ${loc.latitude}");
             mapHomeCaptainController?.animateCamera(
               CameraUpdate.newLatLngZoom(loc, 17.5),
             );