25-1/31/1
This commit is contained in:
@@ -3,16 +3,16 @@ import 'dart:convert';
|
||||
import 'dart:math' show Random, cos, max, min, pi, pow, sin, sqrt;
|
||||
import 'dart:math' as math;
|
||||
import 'dart:ui';
|
||||
import 'package:SEFER/constant/univeries_polygon.dart';
|
||||
import 'package:SEFER/controller/firebase/local_notification.dart';
|
||||
import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:Tripz/constant/univeries_polygon.dart';
|
||||
import 'package:Tripz/controller/firebase/local_notification.dart';
|
||||
import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter_confetti/flutter_confetti.dart';
|
||||
import 'package:vector_math/vector_math.dart' show radians, degrees;
|
||||
|
||||
import 'package:SEFER/controller/functions/tts.dart';
|
||||
import 'package:SEFER/views/home/map_page_passenger.dart';
|
||||
import 'package:SEFER/views/widgets/my_textField.dart';
|
||||
import 'package:Tripz/controller/functions/tts.dart';
|
||||
import 'package:Tripz/views/home/map_page_passenger.dart';
|
||||
import 'package:Tripz/views/widgets/my_textField.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:geolocator/geolocator.dart';
|
||||
import 'package:get/get.dart';
|
||||
@@ -20,10 +20,10 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:google_polyline_algorithm/google_polyline_algorithm.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:location/location.dart';
|
||||
import 'package:SEFER/constant/colors.dart';
|
||||
import 'package:SEFER/constant/style.dart';
|
||||
import 'package:SEFER/controller/home/points_for_rider_controller.dart';
|
||||
import 'package:SEFER/views/home/map_widget.dart/form_serch_multiy_point.dart';
|
||||
import 'package:Tripz/constant/colors.dart';
|
||||
import 'package:Tripz/constant/style.dart';
|
||||
import 'package:Tripz/controller/home/points_for_rider_controller.dart';
|
||||
import 'package:Tripz/views/home/map_widget.dart/form_serch_multiy_point.dart';
|
||||
import '../../constant/api_key.dart';
|
||||
import '../../constant/box_name.dart';
|
||||
import '../../constant/info.dart';
|
||||
@@ -370,7 +370,7 @@ class MapPassengerController extends GetxController {
|
||||
"order_id": rideId.toString(), // Convert to String
|
||||
"status": 'waiting'
|
||||
});
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
if (AppLink.endPoint != AppLink.tripzCairoServer) {
|
||||
CRUD().post(
|
||||
link: "${AppLink.endPoint}/ride/driver_order/update.php",
|
||||
payload: {
|
||||
@@ -382,7 +382,7 @@ class MapPassengerController extends GetxController {
|
||||
"id": rideId.toString(), // Convert to String
|
||||
"status": 'waiting'
|
||||
});
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
if (AppLink.endPoint != AppLink.tripzCairoServer) {
|
||||
CRUD().post(
|
||||
link: "${AppLink.endPoint}/ride/rides/update.php",
|
||||
payload: {
|
||||
@@ -394,7 +394,7 @@ class MapPassengerController extends GetxController {
|
||||
"id": rideId.toString(), // Convert to String
|
||||
"status": 'wait'
|
||||
});
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
if (AppLink.endPoint != AppLink.tripzCairoServer) {
|
||||
CRUD().post(
|
||||
link:
|
||||
"${AppLink.endPoint}/ride/notificationCaptain/updateWaitingTrip.php",
|
||||
@@ -1354,7 +1354,7 @@ class MapPassengerController extends GetxController {
|
||||
'duration': duration.toStringAsFixed(1),
|
||||
});
|
||||
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
if (AppLink.endPoint != AppLink.tripzCairoServer) {
|
||||
CRUD().post(
|
||||
link: '${AppLink.endPoint}/notificationCaptain/addWaitingRide.php',
|
||||
payload: {
|
||||
@@ -1441,7 +1441,7 @@ class MapPassengerController extends GetxController {
|
||||
|
||||
// // Add ride to database
|
||||
// await CRUD()
|
||||
// .post(link: "${AppLink.seferCairoServer}/ride/rides/add.php", payload: {
|
||||
// .post(link: "${AppLink.TripzCairoServer}/ride/rides/add.php", payload: {
|
||||
// "start_location":
|
||||
// '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
|
||||
// "end_location":
|
||||
@@ -1544,7 +1544,7 @@ class MapPassengerController extends GetxController {
|
||||
// });
|
||||
|
||||
// // If an additional endpoint is available, post data there as well
|
||||
// if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
// if (AppLink.endPoint != AppLink.TripzCairoServer) {
|
||||
// CRUD().post(link: '${AppLink.endPoint}/ride/rides/add.php', payload: {
|
||||
// "start_location":
|
||||
// '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
|
||||
@@ -1876,7 +1876,7 @@ class MapPassengerController extends GetxController {
|
||||
|
||||
try {
|
||||
final response = await CRUD().post(
|
||||
link: "${AppLink.seferCairoServer}/ride/rides/add.php",
|
||||
link: "${AppLink.tripzCairoServer}/ride/rides/add.php",
|
||||
payload: payload);
|
||||
if (response is String) {
|
||||
final parsedValue = jsonDecode(response);
|
||||
@@ -2460,7 +2460,7 @@ class MapPassengerController extends GetxController {
|
||||
}
|
||||
|
||||
// Default case
|
||||
box.write(BoxName.serverChosen, AppLink.seferCairoServer);
|
||||
box.write(BoxName.serverChosen, AppLink.tripzCairoServer);
|
||||
return 'Cairo';
|
||||
}
|
||||
|
||||
@@ -2468,23 +2468,23 @@ class MapPassengerController extends GetxController {
|
||||
// latitude <= 30.198857 &&
|
||||
// longitude >= 31.215009 &&
|
||||
// longitude <= 31.532186) {
|
||||
// box.write(BoxName.serverChosen, AppLink.seferCairoServer);
|
||||
// box.write(BoxName.serverChosen, AppLink.TripzCairoServer);
|
||||
|
||||
// return 'Cairo';
|
||||
// } else if (latitude >= 29.904975 &&
|
||||
// latitude <= 30.143372 &&
|
||||
// longitude >= 30.787030 &&
|
||||
// longitude <= 31.215009) {
|
||||
// box.write(BoxName.serverChosen, AppLink.seferGizaServer);
|
||||
// box.write(BoxName.serverChosen, AppLink.TripzGizaServer);
|
||||
// return 'Giza';
|
||||
// } else if (latitude >= 30.396286 &&
|
||||
// latitude <= 31.654458 &&
|
||||
// longitude >= 29.041139 &&
|
||||
// longitude <= 32.626259) {
|
||||
// box.write(BoxName.serverChosen, AppLink.seferAlexandriaServer);
|
||||
// box.write(BoxName.serverChosen, AppLink.TripzAlexandriaServer);
|
||||
// return 'Alexandria';
|
||||
// } else {
|
||||
// box.write(BoxName.serverChosen, AppLink.seferCairoServer);
|
||||
// box.write(BoxName.serverChosen, AppLink.TripzCairoServer);
|
||||
// return 'Cairo';
|
||||
// }
|
||||
// }
|
||||
@@ -3097,7 +3097,7 @@ class MapPassengerController extends GetxController {
|
||||
"id": rideId.toString(), // Convert to String
|
||||
"status": 'notApplyFromAnyDriver'
|
||||
});
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
if (AppLink.endPoint != AppLink.tripzCairoServer) {
|
||||
CRUD().post(link: "${AppLink.endPoint}/ride/rides/update.php", payload: {
|
||||
"id": rideId.toString(), // Convert to String
|
||||
"status": 'notApplyFromAnyDriver'
|
||||
@@ -3154,7 +3154,7 @@ class MapPassengerController extends GetxController {
|
||||
}),
|
||||
]);
|
||||
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
if (AppLink.endPoint != AppLink.tripzCairoServer) {
|
||||
CRUD().post(
|
||||
link: "${AppLink.endPoint}/ride/driver_order/update.php",
|
||||
payload: {
|
||||
@@ -4878,13 +4878,13 @@ class MapPassengerController extends GetxController {
|
||||
'passengerID': box.read(BoxName.passengerID).toString()
|
||||
});
|
||||
CRUD().post(
|
||||
link: "${AppLink.seferAlexandriaServer}/ride/firebase/add.php",
|
||||
link: "${AppLink.tripzAlexandriaServer}/ride/firebase/add.php",
|
||||
payload: {
|
||||
'token': box.read(BoxName.tokenFCM),
|
||||
'passengerID': box.read(BoxName.passengerID).toString()
|
||||
});
|
||||
CRUD().post(
|
||||
link: "${AppLink.seferGizaServer}/ride/firebase/add.php",
|
||||
link: "${AppLink.tripzGizaServer}/ride/firebase/add.php",
|
||||
payload: {
|
||||
'token': box.read(BoxName.tokenFCM),
|
||||
'passengerID': box.read(BoxName.passengerID).toString()
|
||||
@@ -5070,7 +5070,7 @@ class MapPassengerController extends GetxController {
|
||||
// Get.snackbar('Success'.tr, 'Trip booked successfully'.tr);
|
||||
var id = response['message']['id'].toString();
|
||||
await CRUD().post(
|
||||
link: '${AppLink.seferCairoServer}/ride/rides/add.php',
|
||||
link: '${AppLink.tripzCairoServer}/ride/rides/add.php',
|
||||
payload: {
|
||||
"start_location":
|
||||
'${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
|
||||
@@ -5099,7 +5099,7 @@ class MapPassengerController extends GetxController {
|
||||
Log.print('Unexpected response type: ${value.runtimeType}');
|
||||
}
|
||||
});
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
if (AppLink.endPoint != AppLink.tripzCairoServer) {
|
||||
await CRUD().post(
|
||||
link: "${AppLink.endPoint}/ride/mishwari/add.php",
|
||||
payload: tripData);
|
||||
|
||||
Reference in New Issue
Block a user