إضافة الهوية الجديدة Tripz
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:math';
|
||||
import 'package:siro_driver/views/widgets/error_snakbar.dart';
|
||||
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
@@ -9,17 +9,17 @@ import 'package:geolocator/geolocator.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:intaleq_maps/intaleq_maps.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:siro_driver/constant/box_name.dart';
|
||||
import 'package:siro_driver/constant/links.dart';
|
||||
import 'package:siro_driver/controller/car_platform_bridge.dart';
|
||||
import 'package:siro_driver/controller/functions/crud.dart';
|
||||
import 'package:siro_driver/controller/functions/tts.dart';
|
||||
import 'package:siro_driver/controller/home/navigation/decode_polyline_isolate.dart';
|
||||
import 'package:siro_driver/env/env.dart';
|
||||
import 'package:siro_driver/main.dart';
|
||||
import 'package:siro_driver/print.dart';
|
||||
import 'package:tripz_driver/constant/box_name.dart';
|
||||
import 'package:tripz_driver/constant/links.dart';
|
||||
import 'package:tripz_driver/controller/car_platform_bridge.dart';
|
||||
import 'package:tripz_driver/controller/functions/crud.dart';
|
||||
import 'package:tripz_driver/controller/functions/tts.dart';
|
||||
import 'package:tripz_driver/controller/home/navigation/decode_polyline_isolate.dart';
|
||||
import 'package:tripz_driver/env/env.dart';
|
||||
import 'package:tripz_driver/main.dart';
|
||||
import 'package:tripz_driver/print.dart';
|
||||
import 'dart:ui';
|
||||
import 'package:siro_driver/services/offline_map_service.dart';
|
||||
import 'package:tripz_driver/services/offline_map_service.dart';
|
||||
|
||||
class RouteData {
|
||||
final List<LatLng> coordinates;
|
||||
@@ -1186,7 +1186,7 @@ class NavigationController extends GetxController
|
||||
_lastTraveledIndexInFullRoute = 0;
|
||||
currentInstruction = "";
|
||||
nextInstruction = "";
|
||||
currentManeuverModifier = "siro";
|
||||
currentManeuverModifier = "tripz";
|
||||
distanceToNextStep = "";
|
||||
_distanceToNextStepMeters = 0.0;
|
||||
totalDistanceRemaining = "";
|
||||
@@ -1291,7 +1291,7 @@ class NavigationController extends GetxController
|
||||
if (mapController == null) return;
|
||||
|
||||
try {
|
||||
// ✅ Use searchPlaces from intaleq_maps SDK
|
||||
// ✅ Use searchPlaces from tripz_maps SDK
|
||||
final results = await mapController!.searchPlaces(q);
|
||||
|
||||
if (myLocation != null) {
|
||||
@@ -1343,10 +1343,10 @@ class NavigationController extends GetxController
|
||||
if (!isNavigating) return;
|
||||
final etaSeconds = _routeTotalDurationS > 0
|
||||
? (_fullRouteCoordinates.isNotEmpty
|
||||
? _routeTotalDurationS *
|
||||
(_fullRouteCoordinates.length - _lastTraveledIndexInFullRoute) /
|
||||
_fullRouteCoordinates.length
|
||||
: 0.0)
|
||||
? _routeTotalDurationS *
|
||||
(_fullRouteCoordinates.length - _lastTraveledIndexInFullRoute) /
|
||||
_fullRouteCoordinates.length
|
||||
: 0.0)
|
||||
: 0.0;
|
||||
CarPlatformBridge.updateNavState(
|
||||
lat: myLocation?.latitude ?? 0.0,
|
||||
@@ -1355,10 +1355,11 @@ class NavigationController extends GetxController
|
||||
speed: currentSpeed,
|
||||
instruction: currentInstruction,
|
||||
distanceToStep: _distanceToNextStepMeters,
|
||||
totalDistance: _routeTotalDistanceM * (_fullRouteCoordinates.isNotEmpty
|
||||
? (_fullRouteCoordinates.length - _lastTraveledIndexInFullRoute) /
|
||||
_fullRouteCoordinates.length
|
||||
: 0.0),
|
||||
totalDistance: _routeTotalDistanceM *
|
||||
(_fullRouteCoordinates.isNotEmpty
|
||||
? (_fullRouteCoordinates.length - _lastTraveledIndexInFullRoute) /
|
||||
_fullRouteCoordinates.length
|
||||
: 0.0),
|
||||
eta: etaSeconds,
|
||||
maneuver: currentManeuverModifier is int
|
||||
? currentManeuverModifier as int
|
||||
|
||||
@@ -4,13 +4,13 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:intaleq_maps/intaleq_maps.dart';
|
||||
import 'package:siro_driver/env/env.dart';
|
||||
import 'package:siro_driver/controller/profile/setting_controller.dart';
|
||||
import 'package:tripz_driver/env/env.dart';
|
||||
import 'package:tripz_driver/controller/profile/setting_controller.dart';
|
||||
|
||||
import 'package:siro_driver/constant/box_name.dart';
|
||||
import 'package:siro_driver/constant/colors.dart';
|
||||
import 'package:siro_driver/main.dart';
|
||||
import 'package:siro_driver/views/widgets/error_snakbar.dart';
|
||||
import 'package:tripz_driver/constant/box_name.dart';
|
||||
import 'package:tripz_driver/constant/colors.dart';
|
||||
import 'package:tripz_driver/main.dart';
|
||||
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
|
||||
import 'navigation_controller.dart';
|
||||
|
||||
// ─── Color Palette ──────────────────────────────────────────────────────────
|
||||
@@ -55,7 +55,7 @@ class NavigationView extends StatelessWidget {
|
||||
polygons: c.polygons,
|
||||
mapType: s.isMapDarkMode
|
||||
? IntaleqMapType
|
||||
.normal // Normal in SiroMap seems to be Dark
|
||||
.normal // Normal in TripzMap seems to be Dark
|
||||
: IntaleqMapType.light,
|
||||
initialCameraPosition: CameraPosition(
|
||||
target: c.myLocation ?? const LatLng(33.5138, 36.2765),
|
||||
|
||||
Reference in New Issue
Block a user