feat(apps): الخريطة وطلب الرحلة ودورة السائق — المرحلة 4
## حسم تعارض الخرائط (docs/38 §7) لصالح القرار الأحدث 2026-07-20: كل الخرائط — البلاطات والبحث والعكسي والمسار — مباشرة إلى map-saas بترويسة x-api-key، بلا مرور بباك إند تريبز. نقاط /maps/* في الباك إند لا تُستعمل، وإحداها (geocode) معطوبة على المنشور. العقد تُحقّق حيّاً بـcurl قبل كتابة سطر. ## النواة المشتركة - core/api/antlaq_api.dart: عميل منفصل بلا AuthInterceptor — توكن تريبز لا شأن لخادم الخرائط به، وإرساله إليه تسريب بلا مقابل - core/realtime: Socket.IO واحد (trip:update · driver:location · trip:offer · trip:offer_taken) - core/location: نقطة الموقع الوحيدة بمرشّح 25 متراً - features/trip/data: سبعة نماذج + MapsRepository + TripRepository متطابق حرفياً بين التوأمين ## الراكب RideCubit بستّ مراحل + RidePage وثمانية ويدجت: الخريطة · دبّوس المنتصف · المخطّط · الخط الزمني · اختيار النوع · التأكيد · البحث عن سائق · الرحلة. ## السائق DutyCubit بأربع مراحل + DutyPage: مفتاح الاتصال · العرض بمؤقّت · الرحلة. ## قرارات تحمي الأداء والصحّة - GeoPoint مستقلّ عن حزمة الخريطة؛ intaleq_maps مستوردة في ملف واحد فقط لكل تطبيق. تبديل محرّك الخريطة لا يلمس منطقاً - الخريطة خارج BlocBuilder الورقة ولها BlocSelector خاص: نبضة موقع كل 25م لا تعيد بناء الشاشة - مهلة بحث محليّة 90ث + استطلاع كل 5ث: الخادم قد لا يُطلق expired/no_drivers أبداً (ثغرة R1)، وانتظار حدث قد لا يصل = شاشة بحث أبدية - offeredDrivers == 0 جواب نهائي فوري بلا انتظار المهلة - الأجرة لا تُعرض إلا إن كانت صالحة: /tariff/quote يرجّع 200 بقيم null صامتة - موقع السائق بمسارين عمداً: REST لمطابقة Redis والسوكت لخريطة الراكب flutter analyze نظيف · الراكب 70 ملف/5,294 سطر · السائق 67 ملف/4,771 سطر. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Hamza-Ayed
co-authored by
Claude Opus 5
Claude Opus 5
parent
c52338f3bb
commit
1156299d09
@@ -0,0 +1,226 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../core/api/api_exception.dart';
|
||||
import '../../../core/location/location_service.dart';
|
||||
import '../../../core/realtime/realtime_service.dart';
|
||||
import '../data/models/geo_point.dart';
|
||||
import '../data/models/trip.dart';
|
||||
import '../data/trip_repository.dart';
|
||||
import 'duty_state.dart';
|
||||
|
||||
/// دوام السائق: الاتصال ← استقبال العروض ← القبول ← إدارة الرحلة.
|
||||
class DutyCubit extends Cubit<DutyState> {
|
||||
DutyCubit({
|
||||
required TripRepository trips,
|
||||
required LocationService location,
|
||||
required RealtimeService realtime,
|
||||
}) : _trips = trips,
|
||||
_location = location,
|
||||
_realtime = realtime,
|
||||
super(const DutyState());
|
||||
|
||||
final TripRepository _trips;
|
||||
final LocationService _location;
|
||||
final RealtimeService _realtime;
|
||||
|
||||
StreamSubscription<RealtimeEvent>? _events;
|
||||
Timer? _offerTimer;
|
||||
|
||||
@override
|
||||
Future<void> close() {
|
||||
_events?.cancel();
|
||||
_offerTimer?.cancel();
|
||||
_location.stop();
|
||||
return super.close();
|
||||
}
|
||||
|
||||
Future<void> init() async {
|
||||
_events = _realtime.events.listen(_onRealtime);
|
||||
await _realtime.connect();
|
||||
unawaited(_loadCredit());
|
||||
unawaited(_resumeActiveTrip());
|
||||
}
|
||||
|
||||
Future<void> _loadCredit() async {
|
||||
try {
|
||||
final credit = await _trips.credit();
|
||||
if (isClosed) return;
|
||||
emit(state.copyWith(
|
||||
creditBalance: credit.balance,
|
||||
creditBlocked: credit.blocked,
|
||||
));
|
||||
} on ApiException {
|
||||
// الرصيد معلومة مساعدة لا حاجز إقلاع.
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _resumeActiveTrip() async {
|
||||
try {
|
||||
final live = (await _trips.mine()).where((t) => t.status.isLive);
|
||||
if (isClosed || live.isEmpty) return;
|
||||
_attachTrip(live.first);
|
||||
} on ApiException {
|
||||
// لا رحلة جارية.
|
||||
}
|
||||
}
|
||||
|
||||
// ── الاتصال ────────────────────────────────────────────────────────────
|
||||
|
||||
Future<void> toggleOnline() async {
|
||||
final goingOnline = !state.isOnline;
|
||||
emit(state.copyWith(busy: true, error: DutyError.none));
|
||||
try {
|
||||
await _trips.setOnline(goingOnline);
|
||||
if (isClosed) return;
|
||||
|
||||
if (goingOnline) {
|
||||
// الموقع يُرفع فور الاتصال: سائقٌ متصل بلا موقع لا يصله عمل.
|
||||
_location.listen(_onPosition);
|
||||
emit(state.copyWith(phase: DutyPhase.waiting, busy: false));
|
||||
} else {
|
||||
await _location.stop();
|
||||
emit(state.copyWith(
|
||||
phase: DutyPhase.offline,
|
||||
busy: false,
|
||||
clearOffer: true,
|
||||
));
|
||||
}
|
||||
} on ApiException {
|
||||
if (!isClosed) {
|
||||
emit(state.copyWith(busy: false, error: DutyError.goOnlineFailed));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void _onPosition(dynamic position) {
|
||||
final lat = position.latitude as double;
|
||||
final lng = position.longitude as double;
|
||||
final heading = position.heading as double?;
|
||||
|
||||
emit(state.copyWith(myLocation: GeoPoint(lat, lng)));
|
||||
|
||||
// مساران عمداً: REST يغذّي المطابقة في Redis، والسوكت يغذّي خريطة
|
||||
// الراكب الحيّة. سقوط أحدهما لا يُعمي الآخر.
|
||||
unawaited(_trips
|
||||
.pushLocation(GeoPoint(lat, lng), heading: heading)
|
||||
.catchError((_) {}));
|
||||
_realtime.sendDriverLocation(lat, lng, heading: heading);
|
||||
}
|
||||
|
||||
// ── العروض ─────────────────────────────────────────────────────────────
|
||||
|
||||
void _showOffer(Trip offer) {
|
||||
if (state.phase == DutyPhase.active) return; // مشغول برحلة
|
||||
_offerTimer?.cancel();
|
||||
emit(state.copyWith(
|
||||
offer: offer,
|
||||
phase: DutyPhase.offered,
|
||||
error: DutyError.none,
|
||||
));
|
||||
|
||||
// العرض لا يبقى معلّقاً إلى الأبد: الخادم قد يعطيه لغيره بلا إشعارنا.
|
||||
_offerTimer = Timer(const Duration(seconds: 25), dismissOffer);
|
||||
}
|
||||
|
||||
void dismissOffer() {
|
||||
_offerTimer?.cancel();
|
||||
if (isClosed) return;
|
||||
emit(state.copyWith(
|
||||
clearOffer: true,
|
||||
phase: state.trip != null ? DutyPhase.active : DutyPhase.waiting,
|
||||
));
|
||||
}
|
||||
|
||||
Future<void> acceptOffer() async {
|
||||
final offer = state.offer;
|
||||
if (offer == null) return;
|
||||
_offerTimer?.cancel();
|
||||
emit(state.copyWith(busy: true, error: DutyError.none));
|
||||
try {
|
||||
await _trips.accept(offer.id);
|
||||
_attachTrip(await _trips.get(offer.id));
|
||||
} on ApiException catch (e) {
|
||||
if (isClosed) return;
|
||||
// القبول ذرّي: أول سائق يفوز، والباقي يُرفض. هذا ليس عطلاً — يُعرض
|
||||
// «سبقك سائق آخر» لا رسالة خطأ عامة.
|
||||
emit(state.copyWith(
|
||||
busy: false,
|
||||
clearOffer: true,
|
||||
phase: DutyPhase.waiting,
|
||||
error: e.isForbidden || e.statusCode == 409
|
||||
? DutyError.offerTaken
|
||||
: DutyError.acceptFailed,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// ── الرحلة ─────────────────────────────────────────────────────────────
|
||||
|
||||
/// الانتقال التالي في آلة الحالات — الشاشة لا تقرّره (docs/38 §4).
|
||||
TripStatus? get nextStatus => switch (state.trip?.status) {
|
||||
TripStatus.assigned => TripStatus.driverArriving,
|
||||
TripStatus.driverArriving => TripStatus.driverArrived,
|
||||
TripStatus.driverArrived => TripStatus.inProgress,
|
||||
TripStatus.inProgress => TripStatus.completed,
|
||||
_ => null,
|
||||
};
|
||||
|
||||
Future<void> advanceTrip() async {
|
||||
final trip = state.trip;
|
||||
final next = nextStatus;
|
||||
if (trip == null || next == null) return;
|
||||
|
||||
emit(state.copyWith(busy: true, error: DutyError.none));
|
||||
try {
|
||||
await _trips.updateStatus(trip.id, next);
|
||||
_attachTrip(await _trips.get(trip.id));
|
||||
// العمولة تُخصم من الرصيد التشغيلي عند الإنهاء — يُحدَّث فوراً.
|
||||
if (next == TripStatus.completed) unawaited(_loadCredit());
|
||||
} on ApiException {
|
||||
if (!isClosed) {
|
||||
emit(state.copyWith(busy: false, error: DutyError.statusFailed));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void _attachTrip(Trip trip) {
|
||||
_realtime.joinTrip(trip.id);
|
||||
if (trip.status.isOver) {
|
||||
emit(state.copyWith(
|
||||
clearTrip: true,
|
||||
clearOffer: true,
|
||||
busy: false,
|
||||
phase: state.isOnline ? DutyPhase.waiting : DutyPhase.offline,
|
||||
));
|
||||
return;
|
||||
}
|
||||
emit(state.copyWith(
|
||||
trip: trip,
|
||||
clearOffer: true,
|
||||
busy: false,
|
||||
phase: DutyPhase.active,
|
||||
));
|
||||
}
|
||||
|
||||
void _onRealtime(RealtimeEvent event) {
|
||||
switch (event.name) {
|
||||
case RealtimeEvent.tripOffer:
|
||||
_showOffer(Trip.fromJson(event.data));
|
||||
|
||||
case RealtimeEvent.tripOfferTaken:
|
||||
final id = event.data['id'] ?? event.data['tripId'];
|
||||
if (id == state.offer?.id) {
|
||||
dismissOffer();
|
||||
emit(state.copyWith(error: DutyError.offerTaken));
|
||||
}
|
||||
|
||||
case RealtimeEvent.tripUpdate:
|
||||
final id = event.data['id'] ?? event.data['tripId'];
|
||||
if (id != null && id == state.trip?.id) {
|
||||
_attachTrip(Trip.fromJson(event.data));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
import '../data/models/geo_point.dart';
|
||||
import '../data/models/trip.dart';
|
||||
|
||||
/// حالة السائق. الفرق الجوهري عن الراكب: السائق **يستقبل** عملاً بدل أن
|
||||
/// يطلبه، فالمحور هنا الاتصال والعرض لا التخطيط.
|
||||
enum DutyPhase {
|
||||
/// غير متصل — لا يصله شيء.
|
||||
offline,
|
||||
|
||||
/// متصل بانتظار عرض.
|
||||
waiting,
|
||||
|
||||
/// عرض معروض بمؤقّت.
|
||||
offered,
|
||||
|
||||
/// رحلة مقبولة جارية.
|
||||
active,
|
||||
}
|
||||
|
||||
enum DutyError { none, goOnlineFailed, acceptFailed, offerTaken, statusFailed }
|
||||
|
||||
class DutyState extends Equatable {
|
||||
const DutyState({
|
||||
this.phase = DutyPhase.offline,
|
||||
this.myLocation,
|
||||
this.offer,
|
||||
this.trip,
|
||||
this.busy = false,
|
||||
this.error = DutyError.none,
|
||||
this.creditBalance,
|
||||
this.creditBlocked = false,
|
||||
});
|
||||
|
||||
final DutyPhase phase;
|
||||
final GeoPoint? myLocation;
|
||||
|
||||
/// العرض المعروض حالياً — يختفي إن سبق إليه سائق آخر.
|
||||
final Trip? offer;
|
||||
|
||||
final Trip? trip;
|
||||
final bool busy;
|
||||
final DutyError error;
|
||||
|
||||
/// الرصيد التشغيلي: العمولة تُخصم منه عند الإنهاء (docs/38 §5).
|
||||
final String? creditBalance;
|
||||
|
||||
/// محجوب لنفاد الرصيد — لا يصله عمل، ولا بد أن يعرف السبب صراحةً.
|
||||
final bool creditBlocked;
|
||||
|
||||
bool get isOnline => phase != DutyPhase.offline;
|
||||
|
||||
DutyState copyWith({
|
||||
DutyPhase? phase,
|
||||
GeoPoint? myLocation,
|
||||
Trip? offer,
|
||||
Trip? trip,
|
||||
bool? busy,
|
||||
DutyError? error,
|
||||
String? creditBalance,
|
||||
bool? creditBlocked,
|
||||
bool clearOffer = false,
|
||||
bool clearTrip = false,
|
||||
}) {
|
||||
return DutyState(
|
||||
phase: phase ?? this.phase,
|
||||
myLocation: myLocation ?? this.myLocation,
|
||||
offer: clearOffer ? null : (offer ?? this.offer),
|
||||
trip: clearTrip ? null : (trip ?? this.trip),
|
||||
busy: busy ?? this.busy,
|
||||
error: error ?? this.error,
|
||||
creditBalance: creditBalance ?? this.creditBalance,
|
||||
creditBlocked: creditBlocked ?? this.creditBlocked,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => [
|
||||
phase,
|
||||
myLocation,
|
||||
offer,
|
||||
trip,
|
||||
busy,
|
||||
error,
|
||||
creditBalance,
|
||||
creditBlocked,
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
import '../../../core/api/antlaq_api.dart';
|
||||
import 'models/geo_point.dart';
|
||||
import 'models/place.dart';
|
||||
import 'models/route_info.dart';
|
||||
|
||||
/// كل الخرائط من map-saas مباشرة (قرار 2026-07-20). نقاط `/maps/*` في باك إند
|
||||
/// تريبز **لا تُستعمل** — إحداها (`geocode`) معطوبة على المنشور أصلاً.
|
||||
class MapsRepository {
|
||||
MapsRepository(this._api);
|
||||
|
||||
final AntlaqApi _api;
|
||||
|
||||
Future<List<Place>> search(String query, {GeoPoint? near}) async {
|
||||
if (query.trim().isEmpty) return const [];
|
||||
final res = await _api.get<List<dynamic>>(
|
||||
'/geocoding/search',
|
||||
query: {
|
||||
'q': query.trim(),
|
||||
if (near != null) 'lat': near.lat,
|
||||
if (near != null) 'lng': near.lng,
|
||||
},
|
||||
);
|
||||
return res
|
||||
.whereType<Map<String, dynamic>>()
|
||||
.map(Place.fromJson)
|
||||
.toList(growable: false);
|
||||
}
|
||||
|
||||
/// يرجّع **مصفوفة** مرتّبة بالأقرب — الأول هو المطلوب. تفكيكها ككائن مفرد
|
||||
/// كان باگ سيرو الذي أُصلح 2026-07-20.
|
||||
Future<Place?> reverse(GeoPoint point) async {
|
||||
final res = await _api.get<List<dynamic>>(
|
||||
'/geocoding/reverse',
|
||||
query: {'lat': point.lat, 'lng': point.lng},
|
||||
);
|
||||
final first = res.whereType<Map<String, dynamic>>().firstOrNull;
|
||||
return first == null ? null : Place.fromJson(first);
|
||||
}
|
||||
|
||||
Future<RouteInfo> route(GeoPoint from, GeoPoint to) async {
|
||||
final res = await _api.get<Map<String, dynamic>>(
|
||||
'/maps/route',
|
||||
query: {
|
||||
'fromLat': from.lat,
|
||||
'fromLng': from.lng,
|
||||
'toLat': to.lat,
|
||||
'toLng': to.lng,
|
||||
},
|
||||
);
|
||||
return RouteInfo.fromJson(res);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
/// تسعيرة مسبقة من `POST /tariff/quote`.
|
||||
///
|
||||
/// ⚠️ مصيدتان مثبتتان (docs/38 §7):
|
||||
/// 1. هذه النقطة **camelCase وحدها** بخلاف كل الـAPI.
|
||||
/// 2. بالمعاملات الخطأ ترجّع **200 بقيم `null` صامتة** لا خطأً — لذلك
|
||||
/// [isUsable] شرطٌ قبل عرض أي رقم للمستخدم.
|
||||
class FareQuote extends Equatable {
|
||||
const FareQuote({
|
||||
required this.total,
|
||||
required this.currency,
|
||||
this.subtotal,
|
||||
this.surgeMultiplier = 1,
|
||||
this.window = '',
|
||||
});
|
||||
|
||||
final double? total;
|
||||
final String currency;
|
||||
final double? subtotal;
|
||||
final double surgeMultiplier;
|
||||
final String window;
|
||||
|
||||
factory FareQuote.fromJson(Map<String, dynamic> json) {
|
||||
final quote = (json['quote'] as Map<String, dynamic>?) ?? const {};
|
||||
return FareQuote(
|
||||
total: (quote['total'] as num?)?.toDouble(),
|
||||
currency: quote['currency'] as String? ?? '',
|
||||
subtotal: (quote['subtotal'] as num?)?.toDouble(),
|
||||
surgeMultiplier: (quote['surgeMultiplier'] as num?)?.toDouble() ?? 1,
|
||||
window: quote['window'] as String? ?? '',
|
||||
);
|
||||
}
|
||||
|
||||
bool get isUsable => total != null && total! > 0;
|
||||
|
||||
/// تسعير مرتفع — يُعرض للمستخدم صراحةً قبل التأكيد لا بعده.
|
||||
bool get hasSurge => surgeMultiplier > 1;
|
||||
|
||||
@override
|
||||
List<Object?> get props => [total, currency, subtotal, surgeMultiplier];
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
/// إحداثية في طبقة النطاق — **مستقلة عن حزمة الخريطة** عمداً.
|
||||
///
|
||||
/// الكيوبت والمستودع لا يعرفان `intaleq_maps`؛ التحويل يقع في الواجهة وحدها.
|
||||
/// تغيير محرّك الخريطة لاحقاً لا يلمس منطقاً.
|
||||
class GeoPoint extends Equatable {
|
||||
const GeoPoint(this.lat, this.lng);
|
||||
|
||||
final double lat;
|
||||
final double lng;
|
||||
|
||||
factory GeoPoint.fromJson(Map<String, dynamic> json) => GeoPoint(
|
||||
(json['lat'] as num).toDouble(),
|
||||
(json['lng'] as num).toDouble(),
|
||||
);
|
||||
|
||||
Map<String, dynamic> toJson() => {'lat': lat, 'lng': lng};
|
||||
|
||||
@override
|
||||
List<Object?> get props => [lat, lng];
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
import 'geo_point.dart';
|
||||
|
||||
/// مكان من map-saas. حقول الاسم `name`/`name_ar`/`address` — **لا
|
||||
/// `formattedAddress`** (عقد مثبت بـcurl، راجع قرار الخرائط 2026-07-20).
|
||||
class Place extends Equatable {
|
||||
const Place({
|
||||
required this.id,
|
||||
required this.name,
|
||||
required this.point,
|
||||
this.address = '',
|
||||
this.category = '',
|
||||
});
|
||||
|
||||
final String id;
|
||||
final String name;
|
||||
final GeoPoint point;
|
||||
final String address;
|
||||
final String category;
|
||||
|
||||
factory Place.fromJson(Map<String, dynamic> json) {
|
||||
return Place(
|
||||
id: json['id']?.toString() ?? '',
|
||||
// العربي أولاً — الواجهة عربية افتراضاً، والإنجليزي احتياط.
|
||||
name: (json['name_ar'] as String?)?.trim().isNotEmpty == true
|
||||
? json['name_ar'] as String
|
||||
: (json['name'] as String? ?? ''),
|
||||
address: json['address'] as String? ?? '',
|
||||
category: json['category'] as String? ?? '',
|
||||
point: GeoPoint(
|
||||
(json['latitude'] as num).toDouble(),
|
||||
(json['longitude'] as num).toDouble(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// ما يُعرض في حقل العنوان: الاسم، وإن غاب فالعنوان.
|
||||
String get label => name.isNotEmpty ? name : address;
|
||||
|
||||
@override
|
||||
List<Object?> get props => [id, name, point, address];
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
/// نوع الرحلة كما يرجّعه `GET /ride-types` (شكل مُتحقَّق حيّاً، docs/38 §7).
|
||||
/// **شاشة الاختيار تُبنى من هنا** — لا قائمة مكتوبة في التطبيق.
|
||||
class RideType extends Equatable {
|
||||
const RideType({
|
||||
required this.id,
|
||||
required this.code,
|
||||
required this.nameAr,
|
||||
required this.nameEn,
|
||||
required this.vehicleKind,
|
||||
required this.womenOnly,
|
||||
required this.roundTripSupported,
|
||||
required this.sort,
|
||||
this.icon,
|
||||
});
|
||||
|
||||
final String id;
|
||||
final String code;
|
||||
final String nameAr;
|
||||
final String nameEn;
|
||||
final String vehicleKind;
|
||||
final bool womenOnly;
|
||||
final bool roundTripSupported;
|
||||
final int sort;
|
||||
final String? icon;
|
||||
|
||||
factory RideType.fromJson(Map<String, dynamic> json) {
|
||||
return RideType(
|
||||
id: json['id'] as String,
|
||||
code: json['code'] as String,
|
||||
nameAr: json['name_ar'] as String? ?? '',
|
||||
nameEn: json['name_en'] as String? ?? '',
|
||||
vehicleKind: json['vehicle_kind'] as String? ?? 'car',
|
||||
womenOnly: json['women_only'] as bool? ?? false,
|
||||
roundTripSupported: json['round_trip_supported'] as bool? ?? false,
|
||||
sort: (json['sort'] as num?)?.toInt() ?? 0,
|
||||
icon: json['icon'] as String?,
|
||||
);
|
||||
}
|
||||
|
||||
String nameFor(String languageCode) =>
|
||||
languageCode == 'ar' ? nameAr : (nameEn.isEmpty ? nameAr : nameEn);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [id, code, sort];
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
/// مسار من map-saas. المسار نفسه **encoded polyline** في حقل `points`،
|
||||
/// ويُفكّ في الواجهة لا هنا (طبقة النطاق لا تعرف حزمة الخريطة).
|
||||
class RouteInfo extends Equatable {
|
||||
const RouteInfo({
|
||||
required this.distanceMeters,
|
||||
required this.durationSeconds,
|
||||
required this.encodedPoints,
|
||||
this.name = '',
|
||||
});
|
||||
|
||||
final double distanceMeters;
|
||||
final int durationSeconds;
|
||||
final String encodedPoints;
|
||||
final String name;
|
||||
|
||||
factory RouteInfo.fromJson(Map<String, dynamic> json) {
|
||||
return RouteInfo(
|
||||
distanceMeters: (json['distance'] as num?)?.toDouble() ?? 0,
|
||||
durationSeconds: (json['duration'] as num?)?.round() ?? 0,
|
||||
encodedPoints: json['points'] as String? ?? '',
|
||||
name: json['routeName'] as String? ?? '',
|
||||
);
|
||||
}
|
||||
|
||||
/// التعرفة تُطلب بالكيلومترات والدقائق (docs/38 §7).
|
||||
double get distanceKm => distanceMeters / 1000;
|
||||
double get durationMin => durationSeconds / 60;
|
||||
|
||||
@override
|
||||
List<Object?> get props => [distanceMeters, durationSeconds, encodedPoints];
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
import 'geo_point.dart';
|
||||
|
||||
/// حالات الرحلة كما يعرّفها الخادم (docs/38 §4).
|
||||
enum TripStatus {
|
||||
searching,
|
||||
assigned,
|
||||
driverArriving,
|
||||
driverArrived,
|
||||
inProgress,
|
||||
completed,
|
||||
paid,
|
||||
cancelled,
|
||||
expired,
|
||||
noDrivers,
|
||||
unknown;
|
||||
|
||||
static TripStatus parse(String? raw) => switch (raw) {
|
||||
'searching' => TripStatus.searching,
|
||||
'assigned' => TripStatus.assigned,
|
||||
'driver_arriving' => TripStatus.driverArriving,
|
||||
'driver_arrived' => TripStatus.driverArrived,
|
||||
'in_progress' => TripStatus.inProgress,
|
||||
'completed' => TripStatus.completed,
|
||||
'paid' => TripStatus.paid,
|
||||
'cancelled' => TripStatus.cancelled,
|
||||
'expired' => TripStatus.expired,
|
||||
'no_drivers' => TripStatus.noDrivers,
|
||||
_ => TripStatus.unknown,
|
||||
};
|
||||
|
||||
String get wire => switch (this) {
|
||||
TripStatus.driverArriving => 'driver_arriving',
|
||||
TripStatus.driverArrived => 'driver_arrived',
|
||||
TripStatus.inProgress => 'in_progress',
|
||||
TripStatus.noDrivers => 'no_drivers',
|
||||
_ => name,
|
||||
};
|
||||
|
||||
/// رحلة جارية تُستأنف عند فتح التطبيق.
|
||||
bool get isLive => const {
|
||||
TripStatus.searching,
|
||||
TripStatus.assigned,
|
||||
TripStatus.driverArriving,
|
||||
TripStatus.driverArrived,
|
||||
TripStatus.inProgress,
|
||||
}.contains(this);
|
||||
|
||||
bool get isOver => const {
|
||||
TripStatus.completed,
|
||||
TripStatus.paid,
|
||||
TripStatus.cancelled,
|
||||
TripStatus.expired,
|
||||
TripStatus.noDrivers,
|
||||
}.contains(this);
|
||||
}
|
||||
|
||||
class Trip extends Equatable {
|
||||
const Trip({
|
||||
required this.id,
|
||||
required this.status,
|
||||
this.origin,
|
||||
this.destination,
|
||||
this.quotedFare,
|
||||
this.priceForPassenger,
|
||||
this.priceForDriver,
|
||||
this.currency = '',
|
||||
this.driverName,
|
||||
this.driverPhone,
|
||||
this.vehiclePlate,
|
||||
this.vehicleModel,
|
||||
this.driverRating,
|
||||
});
|
||||
|
||||
final String id;
|
||||
final TripStatus status;
|
||||
final GeoPoint? origin;
|
||||
final GeoPoint? destination;
|
||||
|
||||
/// أجرة مقفولة عند الطلب.
|
||||
final String? quotedFare;
|
||||
|
||||
/// **حقلان منفصلان** لا حقل واحد — الفرق هو العمولة (docs/38 §4).
|
||||
final String? priceForPassenger;
|
||||
final String? priceForDriver;
|
||||
|
||||
final String currency;
|
||||
final String? driverName;
|
||||
final String? driverPhone;
|
||||
final String? vehiclePlate;
|
||||
final String? vehicleModel;
|
||||
final String? driverRating;
|
||||
|
||||
factory Trip.fromJson(Map<String, dynamic> json) {
|
||||
GeoPoint? point(String key) {
|
||||
final v = json[key];
|
||||
return v is Map<String, dynamic> ? GeoPoint.fromJson(v) : null;
|
||||
}
|
||||
|
||||
final driver = json['driver'] as Map<String, dynamic>?;
|
||||
return Trip(
|
||||
id: json['id'] as String,
|
||||
status: TripStatus.parse(json['status'] as String?),
|
||||
origin: point('origin'),
|
||||
destination: point('destination'),
|
||||
// كل المبالغ نصوص (docs/38 §12.2) — تُحفظ كما وصلت ولا تُحوَّل هنا.
|
||||
quotedFare: json['quoted_fare']?.toString(),
|
||||
priceForPassenger: json['price_for_passenger']?.toString(),
|
||||
priceForDriver: json['price_for_driver']?.toString(),
|
||||
currency: json['currency'] as String? ?? '',
|
||||
driverName: driver?['name'] as String? ?? json['driver_name'] as String?,
|
||||
driverPhone:
|
||||
driver?['phone'] as String? ?? json['driver_phone'] as String?,
|
||||
vehiclePlate:
|
||||
driver?['vehicle_plate'] as String? ?? json['vehicle_plate'] as String?,
|
||||
vehicleModel:
|
||||
driver?['vehicle_model'] as String? ?? json['vehicle_model'] as String?,
|
||||
driverRating: driver?['rating']?.toString(),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => [id, status, priceForPassenger, driverName];
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
import '../../../core/api/api_client.dart';
|
||||
import 'models/fare_quote.dart';
|
||||
import 'models/geo_point.dart';
|
||||
import 'models/ride_type.dart';
|
||||
import 'models/trip.dart';
|
||||
|
||||
class TripRepository {
|
||||
TripRepository(this._api);
|
||||
|
||||
final ApiClient _api;
|
||||
|
||||
Future<List<RideType>> rideTypes() async {
|
||||
final res = await _api.get<List<dynamic>>('/ride-types');
|
||||
return res
|
||||
.whereType<Map<String, dynamic>>()
|
||||
.map(RideType.fromJson)
|
||||
.where((t) => true)
|
||||
.toList(growable: false)
|
||||
..sort((a, b) => a.sort.compareTo(b.sort));
|
||||
}
|
||||
|
||||
/// ⚠️ camelCase وحدها في كل الـAPI، وتحتاج **مسافة ومدة محسوبتين مسبقاً**
|
||||
/// من `/maps/route` — إرسال الإحداثيات يرجّع 200 بقيم `null` صامتة
|
||||
/// (docs/38 §7).
|
||||
Future<FareQuote> quote({
|
||||
required String city,
|
||||
required String serviceClass,
|
||||
required double distanceKm,
|
||||
required double durationMin,
|
||||
}) async {
|
||||
final res = await _api.post<Map<String, dynamic>>(
|
||||
'/tariff/quote',
|
||||
body: {
|
||||
'city': city,
|
||||
'serviceClass': serviceClass,
|
||||
'distanceKm': distanceKm,
|
||||
'durationMin': durationMin,
|
||||
},
|
||||
);
|
||||
return FareQuote.fromJson(res);
|
||||
}
|
||||
|
||||
/// يرجّع الرحلة وعدد السائقين الذين عُرضت عليهم — الصفر يعني «لا سائقين
|
||||
/// قريبين» فوراً، بلا انتظار مهلة.
|
||||
Future<({Trip trip, int offeredDrivers})> request({
|
||||
required GeoPoint origin,
|
||||
required GeoPoint destination,
|
||||
required String serviceClass,
|
||||
String paymentMethod = 'wallet',
|
||||
List<GeoPoint> stops = const [],
|
||||
String? couponCode,
|
||||
bool isRoundTrip = false,
|
||||
}) async {
|
||||
final res = await _api.post<Map<String, dynamic>>('/trips', body: {
|
||||
'origin': origin.toJson(),
|
||||
'destination': destination.toJson(),
|
||||
'service_class': serviceClass,
|
||||
'payment_method': paymentMethod,
|
||||
'is_round_trip': isRoundTrip,
|
||||
if (stops.isNotEmpty)
|
||||
'stops': stops.map((s) => s.toJson()).toList(growable: false),
|
||||
'coupon_code': ?couponCode,
|
||||
});
|
||||
return (
|
||||
trip: Trip.fromJson(res['trip'] as Map<String, dynamic>),
|
||||
offeredDrivers: (res['offeredDrivers'] as num?)?.toInt() ?? 0,
|
||||
);
|
||||
}
|
||||
|
||||
Future<Trip> get(String tripId) async {
|
||||
final res = await _api.get<Map<String, dynamic>>('/trips/$tripId');
|
||||
return Trip.fromJson(res);
|
||||
}
|
||||
|
||||
Future<List<Trip>> mine() async {
|
||||
final res = await _api.get<List<dynamic>>('/trips/mine');
|
||||
return res
|
||||
.whereType<Map<String, dynamic>>()
|
||||
.map(Trip.fromJson)
|
||||
.toList(growable: false);
|
||||
}
|
||||
|
||||
Future<void> cancel(String tripId) =>
|
||||
_api.post<Map<String, dynamic>>('/trips/$tripId/cancel');
|
||||
|
||||
// ── طرف السائق ─────────────────────────────────────────────────────────
|
||||
|
||||
Future<List<Trip>> available() async {
|
||||
final res = await _api.get<List<dynamic>>('/trips/available');
|
||||
return res
|
||||
.whereType<Map<String, dynamic>>()
|
||||
.map(Trip.fromJson)
|
||||
.toList(growable: false);
|
||||
}
|
||||
|
||||
Future<void> accept(String tripId) =>
|
||||
_api.post<Map<String, dynamic>>('/trips/$tripId/accept');
|
||||
|
||||
Future<void> setOnline(bool online) => _api.patch<Map<String, dynamic>>(
|
||||
'/drivers/status',
|
||||
body: {'online': online},
|
||||
);
|
||||
|
||||
/// نبضة الموقع إلى Redis — أساس المطابقة. مرشّح المسافة في
|
||||
/// `LocationService` يمنع إغراقها.
|
||||
Future<void> pushLocation(GeoPoint point, {double? heading, double? speed}) =>
|
||||
_api.post<Map<String, dynamic>>('/drivers/location', body: {
|
||||
...point.toJson(),
|
||||
'heading': ?heading,
|
||||
'speed': ?speed,
|
||||
});
|
||||
|
||||
/// الرصيد التشغيلي. للراكب يرجّع 403 `Not a driver` — لا يُنادى إلا من
|
||||
/// تطبيق السائق (docs/38 §5).
|
||||
Future<({String balance, bool blocked})> credit() async {
|
||||
final res = await _api.get<Map<String, dynamic>>('/credit');
|
||||
return (
|
||||
balance: res['balance']?.toString() ?? '0',
|
||||
blocked: res['blocked'] as bool? ?? false,
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> updateStatus(String tripId, TripStatus status) =>
|
||||
_api.patch<Map<String, dynamic>>(
|
||||
'/trips/$tripId/status',
|
||||
body: {'status': status.wire},
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../core/design/tokens.dart';
|
||||
import '../../../core/design/tripz_colors.dart';
|
||||
import '../../../core/di.dart';
|
||||
import '../../../core/l10n/l10n.dart';
|
||||
import '../../../core/ui/status_banner.dart';
|
||||
import '../cubit/duty_cubit.dart';
|
||||
import '../cubit/duty_state.dart';
|
||||
import '../data/models/geo_point.dart';
|
||||
import 'widgets/active_duty_sheet.dart';
|
||||
import 'widgets/duty_toggle.dart';
|
||||
import 'widgets/offer_sheet.dart';
|
||||
import 'widgets/ride_map.dart';
|
||||
|
||||
/// شاشة السائق: خريطة + مفتاح الاتصال أعلى + ورقة تتبدّل بالمرحلة.
|
||||
class DutyPage extends StatefulWidget {
|
||||
const DutyPage({super.key});
|
||||
|
||||
@override
|
||||
State<DutyPage> createState() => _DutyPageState();
|
||||
}
|
||||
|
||||
class _DutyPageState extends State<DutyPage> {
|
||||
late final DutyCubit _cubit = sl<DutyCubit>()..init();
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_cubit.close();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocProvider.value(
|
||||
value: _cubit,
|
||||
child: Scaffold(
|
||||
body: Stack(
|
||||
children: [
|
||||
// الخريطة معزولة عن بقية الحالة: نبضة موقع كل 25 متراً يجب ألّا
|
||||
// تعيد بناء الورقة والمفتاح معها.
|
||||
BlocSelector<DutyCubit, DutyState, GeoPoint?>(
|
||||
selector: (s) => s.myLocation,
|
||||
builder: (context, me) => RideMap(origin: me, cameraTarget: me),
|
||||
),
|
||||
|
||||
SafeArea(
|
||||
child: Padding(
|
||||
padding: Space.page,
|
||||
child: Column(
|
||||
children: [
|
||||
BlocSelector<DutyCubit, DutyState, ({bool online, bool busy})>(
|
||||
selector: (s) => (online: s.isOnline, busy: s.busy),
|
||||
builder: (context, d) => DutyToggle(
|
||||
isOnline: d.online,
|
||||
busy: d.busy,
|
||||
onToggle: _cubit.toggleOnline,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: Space.xs),
|
||||
BlocSelector<DutyCubit, DutyState, bool>(
|
||||
selector: (s) => s.creditBlocked,
|
||||
builder: (context, blocked) => blocked
|
||||
? StatusBanner(
|
||||
message: context.l10n.errorGeneric,
|
||||
tone: BannerTone.danger,
|
||||
icon: Icons.account_balance_wallet_outlined,
|
||||
)
|
||||
: const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
Align(
|
||||
alignment: Alignment.bottomCenter,
|
||||
child: BlocBuilder<DutyCubit, DutyState>(
|
||||
builder: (context, state) => _Sheet(state: state),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Sheet extends StatelessWidget {
|
||||
const _Sheet({required this.state});
|
||||
|
||||
final DutyState state;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
|
||||
final child = switch (state.phase) {
|
||||
DutyPhase.offline => const SizedBox.shrink(),
|
||||
DutyPhase.waiting => Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: Space.md),
|
||||
child: Text(
|
||||
state.error == DutyError.offerTaken
|
||||
? l10n.driverOfferTaken
|
||||
: l10n.driverNoOffers,
|
||||
textAlign: TextAlign.center,
|
||||
style: context.texts.bodyMedium?.copyWith(
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
DutyPhase.offered => OfferSheet(offer: state.offer!),
|
||||
DutyPhase.active =>
|
||||
ActiveDutySheet(trip: state.trip!, busy: state.busy),
|
||||
};
|
||||
|
||||
if (state.phase == DutyPhase.offline) return const SizedBox.shrink();
|
||||
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
color: context.colors.surface,
|
||||
borderRadius: Radii.sheetTop,
|
||||
),
|
||||
child: SafeArea(
|
||||
top: false,
|
||||
child: Padding(
|
||||
padding: Space.page,
|
||||
child: AnimatedSize(
|
||||
duration: Motion.inScreen,
|
||||
curve: Motion.curve,
|
||||
alignment: Alignment.bottomCenter,
|
||||
child: child,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/design/typography.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
import '../../../../core/ui/tripz_button.dart';
|
||||
import '../../cubit/duty_cubit.dart';
|
||||
import '../../data/models/trip.dart';
|
||||
|
||||
/// الرحلة من طرف السائق: **زر واحد** يدفع آلة الحالات خطوة واحدة.
|
||||
/// السائق لا يختار الحالة التالية — الكيوبت يشتقّها (docs/38 §4).
|
||||
class ActiveDutySheet extends StatelessWidget {
|
||||
const ActiveDutySheet({super.key, required this.trip, required this.busy});
|
||||
|
||||
final Trip trip;
|
||||
final bool busy;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final cubit = context.read<DutyCubit>();
|
||||
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(_statusText(context), style: context.texts.titleMedium),
|
||||
if (trip.priceForDriver != null)
|
||||
Text(
|
||||
'${trip.priceForDriver} ${trip.currency}',
|
||||
style: numericStyle(context.texts.titleLarge).copyWith(
|
||||
color: context.tripzColors.success,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
TripzButton.primary(
|
||||
label: _actionLabel(context, cubit),
|
||||
loading: busy,
|
||||
onPressed: cubit.nextStatus == null ? null : cubit.advanceTrip,
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
String _statusText(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
return switch (trip.status) {
|
||||
TripStatus.assigned || TripStatus.driverArriving => l10n.driverOnTheWay,
|
||||
TripStatus.driverArrived => l10n.tripDriverArrived,
|
||||
TripStatus.inProgress => l10n.tripInProgress,
|
||||
_ => l10n.tripCompleted,
|
||||
};
|
||||
}
|
||||
|
||||
String _actionLabel(BuildContext context, DutyCubit cubit) {
|
||||
final l10n = context.l10n;
|
||||
return switch (cubit.nextStatus) {
|
||||
TripStatus.driverArriving => l10n.driverOnTheWay,
|
||||
TripStatus.driverArrived => l10n.driverArrivedAction,
|
||||
TripStatus.inProgress => l10n.driverStartTrip,
|
||||
TripStatus.completed => l10n.driverEndTrip,
|
||||
_ => l10n.tripCompleted,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/design/typography.dart';
|
||||
import '../../data/models/trip.dart';
|
||||
|
||||
/// بطاقة السائق ولوحة المركبة — أهم ما يبحث عنه الراكب في الشارع، فيأخذ
|
||||
/// أوضح موضع وأكبر تباين.
|
||||
class DriverBadge extends StatelessWidget {
|
||||
const DriverBadge({super.key, required this.trip});
|
||||
|
||||
final Trip trip;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (trip.driverName == null) return const SizedBox.shrink();
|
||||
return Row(
|
||||
children: [
|
||||
CircleAvatar(
|
||||
radius: 24,
|
||||
backgroundColor: context.colors.primaryContainer,
|
||||
child: Icon(
|
||||
Icons.person_rounded,
|
||||
color: context.colors.onPrimaryContainer,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: Space.sm),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(trip.driverName!, style: context.texts.titleSmall),
|
||||
if (trip.vehicleModel != null)
|
||||
Text(
|
||||
trip.vehicleModel!,
|
||||
style: context.texts.bodySmall?.copyWith(
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
if (trip.driverRating != null)
|
||||
Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.star_rounded,
|
||||
size: Sizes.iconSm,
|
||||
color: context.tripzColors.warning,
|
||||
),
|
||||
const SizedBox(width: Space.xxs),
|
||||
Text(
|
||||
trip.driverRating!,
|
||||
style: numericStyle(context.texts.bodySmall),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (trip.vehiclePlate != null) _Plate(plate: trip.vehiclePlate!),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// لوحة مرسومة لا نصّ عادي — تُقرأ من بعيد ومن زاوية.
|
||||
class _Plate extends StatelessWidget {
|
||||
const _Plate({required this.plate});
|
||||
|
||||
final String plate;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: Space.sm,
|
||||
vertical: Space.xxs,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: Radii.field_,
|
||||
border: Border.all(color: context.colors.outline, width: 1.5),
|
||||
color: context.tripzColors.surfaceRaised,
|
||||
),
|
||||
child: Text(
|
||||
plate,
|
||||
textDirection: TextDirection.ltr,
|
||||
style: numericStyle(context.texts.titleMedium).copyWith(
|
||||
letterSpacing: 1.5,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
|
||||
/// مفتاح الاتصال — أهم عنصر في تطبيق السائق، فيأخذ أعلى الشاشة وأوضح تباين.
|
||||
/// الحالة معروضة نصّاً ولوناً معاً: لا يعتمد السائق على لون وحده وهو يقود.
|
||||
class DutyToggle extends StatelessWidget {
|
||||
const DutyToggle({
|
||||
super.key,
|
||||
required this.isOnline,
|
||||
required this.busy,
|
||||
required this.onToggle,
|
||||
});
|
||||
|
||||
final bool isOnline;
|
||||
final bool busy;
|
||||
final VoidCallback onToggle;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
final colors = context.tripzColors;
|
||||
final color = isOnline ? colors.success : context.colors.onSurfaceVariant;
|
||||
|
||||
return Material(
|
||||
color: context.tripzColors.surfaceRaised,
|
||||
borderRadius: Radii.card_,
|
||||
child: InkWell(
|
||||
onTap: busy ? null : onToggle,
|
||||
borderRadius: Radii.card_,
|
||||
child: Padding(
|
||||
padding: Space.page,
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 12,
|
||||
height: 12,
|
||||
decoration: BoxDecoration(color: color, shape: BoxShape.circle),
|
||||
),
|
||||
const SizedBox(width: Space.sm),
|
||||
Expanded(
|
||||
child: Text(
|
||||
isOnline ? l10n.driverOnline : l10n.driverOffline,
|
||||
style: context.texts.titleMedium?.copyWith(color: color),
|
||||
),
|
||||
),
|
||||
if (busy)
|
||||
const SizedBox(
|
||||
width: Sizes.iconSm,
|
||||
height: Sizes.iconSm,
|
||||
child: CircularProgressIndicator(strokeWidth: 2.2),
|
||||
)
|
||||
else
|
||||
Text(
|
||||
isOnline ? l10n.driverGoOffline : l10n.driverGoOnline,
|
||||
style: context.texts.labelLarge?.copyWith(
|
||||
color: context.colors.primary,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/design/typography.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
import '../../../../core/ui/tripz_button.dart';
|
||||
import '../../cubit/duty_cubit.dart';
|
||||
import '../../data/models/trip.dart';
|
||||
|
||||
/// عرض رحلة: **رقم الأرباح أولاً**، ثم العناوين، ثم الأزرار. السائق يقرّر
|
||||
/// في ثوانٍ وهو خلف المقود — الترتيب هنا ليس ذوقاً.
|
||||
///
|
||||
/// شريط المؤقّت ينفد فيختفي العرض تلقائياً (`dismissOffer` في الكيوبت).
|
||||
class OfferSheet extends StatefulWidget {
|
||||
const OfferSheet({super.key, required this.offer});
|
||||
|
||||
final Trip offer;
|
||||
|
||||
@override
|
||||
State<OfferSheet> createState() => _OfferSheetState();
|
||||
}
|
||||
|
||||
class _OfferSheetState extends State<OfferSheet>
|
||||
with SingleTickerProviderStateMixin {
|
||||
late final AnimationController _timer = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(seconds: 25),
|
||||
)..forward();
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_timer.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
final cubit = context.read<DutyCubit>();
|
||||
final offer = widget.offer;
|
||||
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
AnimatedBuilder(
|
||||
animation: _timer,
|
||||
builder: (context, _) => LinearProgressIndicator(
|
||||
value: 1 - _timer.value,
|
||||
minHeight: 3,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(l10n.driverOfferTitle, style: context.texts.titleMedium),
|
||||
if (offer.priceForDriver != null)
|
||||
Text(
|
||||
'${offer.priceForDriver} ${offer.currency}',
|
||||
style: numericStyle(context.texts.headlineSmall).copyWith(
|
||||
color: context.tripzColors.success,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
_AddressRow(
|
||||
color: context.tripzColors.mapOrigin,
|
||||
label: l10n.rideOrigin,
|
||||
),
|
||||
_AddressRow(
|
||||
color: context.tripzColors.mapDestination,
|
||||
label: l10n.rideDestination,
|
||||
),
|
||||
const SizedBox(height: Space.lg),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: TripzButton.secondary(
|
||||
label: l10n.driverReject,
|
||||
expanded: true,
|
||||
onPressed: cubit.dismissOffer,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: Space.sm),
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: TripzButton.primary(
|
||||
label: l10n.driverAccept,
|
||||
onPressed: cubit.acceptOffer,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _AddressRow extends StatelessWidget {
|
||||
const _AddressRow({required this.color, required this.label});
|
||||
|
||||
final Color color;
|
||||
final String label;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: Space.xxs),
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 10,
|
||||
height: 10,
|
||||
decoration: BoxDecoration(color: color, shape: BoxShape.circle),
|
||||
),
|
||||
const SizedBox(width: Space.sm),
|
||||
Text(label, style: context.texts.bodyMedium),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:intaleq_maps/intaleq_maps.dart' as im;
|
||||
|
||||
import '../../../../core/config.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../data/models/geo_point.dart';
|
||||
import '../../data/models/route_info.dart';
|
||||
|
||||
/// الخريطة — **الطبقة الوحيدة التي تعرف `intaleq_maps`**. ما فوقها يتعامل
|
||||
/// مع `GeoPoint` وحده، فتبديل محرّك الخريطة لاحقاً لا يلمس منطقاً.
|
||||
///
|
||||
/// البلاطات تُجلب مباشرة من map-saas بمفتاح مقيّد ببصمة التطبيق
|
||||
/// (قرار 2026-07-20).
|
||||
class RideMap extends StatefulWidget {
|
||||
const RideMap({
|
||||
super.key,
|
||||
this.origin,
|
||||
this.destination,
|
||||
this.driver,
|
||||
this.route,
|
||||
this.cameraTarget,
|
||||
this.onCameraIdle,
|
||||
});
|
||||
|
||||
final GeoPoint? origin;
|
||||
final GeoPoint? destination;
|
||||
final GeoPoint? driver;
|
||||
final RouteInfo? route;
|
||||
final GeoPoint? cameraTarget;
|
||||
|
||||
/// مركز الخريطة عند استقرارها — يغذّي اختيار النقطة بالدبّوس الثابت.
|
||||
final ValueChanged<GeoPoint>? onCameraIdle;
|
||||
|
||||
@override
|
||||
State<RideMap> createState() => _RideMapState();
|
||||
}
|
||||
|
||||
class _RideMapState extends State<RideMap> {
|
||||
im.IntaleqMapController? _controller;
|
||||
im.LatLng? _center;
|
||||
|
||||
static const _fallback = im.LatLng(31.9539, 35.9106); // عمّان
|
||||
|
||||
@override
|
||||
void didUpdateWidget(RideMap old) {
|
||||
super.didUpdateWidget(old);
|
||||
final target = widget.cameraTarget;
|
||||
if (target != null && target != old.cameraTarget) {
|
||||
_controller?.animateCamera(
|
||||
im.CameraUpdate.newLatLng(im.LatLng(target.lat, target.lng)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colors = context.tripzColors;
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
|
||||
return im.IntaleqMap(
|
||||
apiKey: AppConfig.mapApiKey,
|
||||
initialCameraPosition: im.CameraPosition(
|
||||
target: widget.origin == null
|
||||
? _fallback
|
||||
: im.LatLng(widget.origin!.lat, widget.origin!.lng),
|
||||
zoom: 15,
|
||||
),
|
||||
// الخريطة تبدّل ستايلها مع الثيم — خريطة نهارية في وضع ليلي تكسر
|
||||
// الغرض (docs/26 §2).
|
||||
styleUrl: isDark
|
||||
? im.IntaleqStyles.obsidian(AppConfig.mapApiKey)
|
||||
: im.IntaleqStyles.light(AppConfig.mapApiKey),
|
||||
myLocationEnabled: true,
|
||||
compassEnabled: false,
|
||||
zoomControlsEnabled: false,
|
||||
onMapCreated: (c) => _controller = c,
|
||||
onCameraMove: (position) => _center = position.target,
|
||||
onCameraIdle: () {
|
||||
final c = _center;
|
||||
if (c != null) widget.onCameraIdle?.call(GeoPoint(c.latitude, c.longitude));
|
||||
},
|
||||
markers: {
|
||||
if (widget.origin != null)
|
||||
_marker('origin', widget.origin!),
|
||||
if (widget.destination != null)
|
||||
_marker('destination', widget.destination!),
|
||||
if (widget.driver != null) _marker('driver', widget.driver!),
|
||||
},
|
||||
polylines: {
|
||||
if (widget.route != null && widget.route!.encodedPoints.isNotEmpty)
|
||||
im.Polyline(
|
||||
polylineId: const im.PolylineId('route'),
|
||||
points: im.PolylineUtils.decode(widget.route!.encodedPoints),
|
||||
color: colors.mapRoute,
|
||||
width: 5,
|
||||
),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
im.Marker _marker(String id, GeoPoint p) => im.Marker(
|
||||
markerId: im.MarkerId(id),
|
||||
position: im.LatLng(p.lat, p.lng),
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user