diff --git a/lib/controller/functions/audio_recorder_controller.dart b/lib/controller/functions/audio_recorder_controller.dart index 99f33eb..f33e998 100644 --- a/lib/controller/functions/audio_recorder_controller.dart +++ b/lib/controller/functions/audio_recorder_controller.dart @@ -1,159 +1,159 @@ -// import 'dart:io'; -// +// // import 'dart:io'; +// // +// // import 'package:flutter/material.dart'; +// // import 'package:flutter_sound/flutter_sound.dart'; +// // import 'package:get/get.dart'; +// // import 'package:permission_handler/permission_handler.dart'; +// // +// // import '../home/map_passenger_controller.dart'; +// // +// // class AudioController extends GetxController { +// // final recorder = FlutterSoundRecorder(); +// // bool isRecording = false; +// // +// // @override +// // void onInit() { +// // super.onInit(); +// // initRecorder(); +// // } +// // +// // Future initRecorder() async { +// // final status = await Permission.microphone.request(); +// // if (status != PermissionStatus.granted) { +// // if (status.isPermanentlyDenied) { +// // // Handle permission permanently denied +// // showPermissionDeniedDialog(); +// // } else if (status.isDenied) { +// // // Handle permission denied +// // showPermissionDeniedSnackbar(); +// // } else if (status.isRestricted) { +// // // Handle permission restricted +// // showPermissionDeniedSnackbar(); +// // } +// // return; +// // } +// // await recorder.openRecorder(); +// // recorder.setSubscriptionDuration(const Duration(minutes: 50)); +// // } +// // +// // Future startRecording() async { +// // if (!recorder.isStopped) { +// // await recorder.startRecorder(); +// // } +// // isRecording = true; +// // update(); +// // } +// // +// // Future stopRecording() async { +// // final filePath = await recorder.stopRecorder(); +// // final audioFile = File(filePath!); +// // print('Recorded file path: $audioFile'); +// // // Now you can send this file to the server +// // isRecording = false; +// // update(); +// // } +// // +// // @override +// // void onClose() { +// // recorder.stopRecorder(); +// // super.onClose(); +// // } +// // +// // void showPermissionDeniedDialog() { +// // showDialog( +// // context: Get.context!, +// // builder: (context) => AlertDialog( +// // title: const Text('Microphone Permission'), +// // content: +// // const Text('Microphone permission is required to record audio.'), +// // actions: [ +// // TextButton( +// // onPressed: () { +// // Navigator.of(context).pop(); +// // openAppSettings(); +// // }, +// // child: const Text('Open Settings'), +// // ), +// // TextButton( +// // onPressed: () { +// // Navigator.of(context).pop(); +// // }, +// // child: const Text('Cancel'), +// // ), +// // ], +// // ), +// // ); +// // } +// // +// // void showPermissionDeniedSnackbar() { +// // Get.snackbar( +// // 'Microphone Permission', +// // 'Microphone permission is required to record audio.', +// // snackPosition: SnackPosition.BOTTOM, +// // duration: const Duration(seconds: 5), +// // mainButton: TextButton( +// // onPressed: () { +// // openAppSettings(); +// // }, +// // child: const Text( +// // 'Open Settings', +// // style: TextStyle(color: Colors.white), +// // ), +// // ), +// // ); +// // } +// // } // import 'package:flutter/material.dart'; -// import 'package:flutter_sound/flutter_sound.dart'; // import 'package:get/get.dart'; +// // import 'package:flutter_sound/flutter_sound.dart'; // import 'package:permission_handler/permission_handler.dart'; // -// import '../home/map_passenger_controller.dart'; -// // class AudioController extends GetxController { -// final recorder = FlutterSoundRecorder(); +// final flutterSoundHelper = FlutterSoundHelper(); +// // bool isRecording = false; // -// @override -// void onInit() { -// super.onInit(); -// initRecorder(); -// } +// Future startRecording() async { +// if (!await flutterSoundHelper.hasPermissions()) { +// await flutterSoundHelper.requestPermissions(); +// } // -// Future initRecorder() async { -// final status = await Permission.microphone.request(); -// if (status != PermissionStatus.granted) { -// if (status.isPermanentlyDenied) { -// // Handle permission permanently denied -// showPermissionDeniedDialog(); -// } else if (status.isDenied) { -// // Handle permission denied -// showPermissionDeniedSnackbar(); -// } else if (status.isRestricted) { -// // Handle permission restricted -// showPermissionDeniedSnackbar(); -// } +// if (!await flutterSoundHelper.hasPermissions()) { // return; // } -// await recorder.openRecorder(); -// recorder.setSubscriptionDuration(const Duration(minutes: 50)); -// } // -// Future startRecording() async { -// if (!recorder.isStopped) { -// await recorder.startRecorder(); -// } +// await flutterSoundHelper.startRecorder(); // isRecording = true; -// update(); // } // // Future stopRecording() async { -// final filePath = await recorder.stopRecorder(); -// final audioFile = File(filePath!); -// print('Recorded file path: $audioFile'); -// // Now you can send this file to the server +// if (!isRecording) { +// return; +// } +// +// await flutterSoundHelper.stopRecorder(); // isRecording = false; -// update(); -// } -// -// @override -// void onClose() { -// recorder.stopRecorder(); -// super.onClose(); -// } -// -// void showPermissionDeniedDialog() { -// showDialog( -// context: Get.context!, -// builder: (context) => AlertDialog( -// title: const Text('Microphone Permission'), -// content: -// const Text('Microphone permission is required to record audio.'), -// actions: [ -// TextButton( -// onPressed: () { -// Navigator.of(context).pop(); -// openAppSettings(); -// }, -// child: const Text('Open Settings'), -// ), -// TextButton( -// onPressed: () { -// Navigator.of(context).pop(); -// }, -// child: const Text('Cancel'), -// ), -// ], -// ), -// ); -// } -// -// void showPermissionDeniedSnackbar() { -// Get.snackbar( -// 'Microphone Permission', -// 'Microphone permission is required to record audio.', -// snackPosition: SnackPosition.BOTTOM, -// duration: const Duration(seconds: 5), -// mainButton: TextButton( -// onPressed: () { -// openAppSettings(); -// }, -// child: const Text( -// 'Open Settings', -// style: TextStyle(color: Colors.white), -// ), -// ), -// ); // } // } -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:flutter_sound/flutter_sound.dart'; -import 'package:permission_handler/permission_handler.dart'; - -class AudioController extends GetxController { - final flutterSoundHelper = FlutterSoundHelper(); - - bool isRecording = false; - - Future startRecording() async { - if (!await flutterSoundHelper.hasPermissions()) { - await flutterSoundHelper.requestPermissions(); - } - - if (!await flutterSoundHelper.hasPermissions()) { - return; - } - - await flutterSoundHelper.startRecorder(); - isRecording = true; - } - - Future stopRecording() async { - if (!isRecording) { - return; - } - - await flutterSoundHelper.stopRecorder(); - isRecording = false; - } -} - -class FlutterSoundHelper { - final flutterSound = FlutterSoundRecorder(); - - Future hasPermissions() async { - return await Permission.microphone.isGranted; - } - - Future requestPermissions() async { - await Permission.microphone.request(); - } - - Future startRecorder() async { - await flutterSound.openRecorder(); - await flutterSound.startRecorder(toFile: 'audio.wav'); - } - - Future stopRecorder() async { - await flutterSound.stopRecorder(); - await flutterSound.closeRecorder(); - } -} +// +// class FlutterSoundHelper { +// final flutterSound = FlutterSoundRecorder(); +// +// Future hasPermissions() async { +// return await Permission.microphone.isGranted; +// } +// +// Future requestPermissions() async { +// await Permission.microphone.request(); +// } +// +// Future startRecorder() async { +// await flutterSound.openRecorder(); +// await flutterSound.startRecorder(toFile: 'audio.wav'); +// } +// +// Future stopRecorder() async { +// await flutterSound.stopRecorder(); +// await flutterSound.closeRecorder(); +// } +// } diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index ee4dd85..fba54b3 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -937,13 +937,13 @@ class MapPassengerController extends GetxController { passengerRate.toStringAsFixed(2), ]; print(body); - FirebaseMessagesController().sendNotificationToDriverMapPolyline( - 'Order', - jsonDecode(value)['message'].toString(), - dataCarsLocationByPassenger['message'][carsOrder]['token'] - .toString(), - body, - polylineCoordinates.toString()); + FirebaseMessagesController().sendNotificationToDriverMAP( + 'Order', + jsonDecode(value)['message'].toString(), + dataCarsLocationByPassenger['message'][carsOrder]['token'].toString(), + body, + // polylineCoordinates.toString() + ); print(dataCarsLocationByPassenger); // //print(dataCarsLocationByPassenger['message'][0]['token'].toString()); }); @@ -1777,7 +1777,7 @@ class MapPassengerController extends GetxController { if (!rideConfirm) { reloadMarkers(); } else { - runWhenRideIsBegin(); + // runWhenRideIsBegin(); } if (reloadCount >= 35) { diff --git a/lib/views/Rate/rate_passenger.dart b/lib/views/Rate/rate_passenger.dart index df0f5ec..a02fb2d 100644 --- a/lib/views/Rate/rate_passenger.dart +++ b/lib/views/Rate/rate_passenger.dart @@ -48,16 +48,7 @@ class RatePassenger extends StatelessWidget { child: Padding( padding: const EdgeInsets.all(4), child: Text( - Get.find().carType == - 'Comfort' || - Get.find() - .carType == - 'Free Ride' - ? Get.find() - .price - .toStringAsFixed(1) - : Get.find() - .totalPassenger, + Get.find().paymentAmount, style: AppStyle.number, ), ), diff --git a/lib/views/home/Captin/orderCaptin/order_speed_request.dart b/lib/views/home/Captin/orderCaptin/order_speed_request.dart index 3cd95fa..bcba03b 100644 --- a/lib/views/home/Captin/orderCaptin/order_speed_request.dart +++ b/lib/views/home/Captin/orderCaptin/order_speed_request.dart @@ -436,6 +436,7 @@ class OrderSpeedRequest extends StatelessWidget { title: 'Ok'.tr, onPressed: () { Get.back(); + Get.back(); })); }, kolor: AppColor.redColor, diff --git a/lib/views/home/map_widget.dart/ride_begin_passenger.dart b/lib/views/home/map_widget.dart/ride_begin_passenger.dart index bd9e3f4..a02f2c9 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -19,7 +19,7 @@ class RideBeginPassenger extends StatelessWidget { @override Widget build(BuildContext context) { ProfileController profileController = Get.put(ProfileController()); - AudioController audioController = Get.put(AudioController()); + // AudioController audioController = Get.put(AudioController()); return GetBuilder(builder: (controller) { if (controller.rideTimerBegin || controller.statusRide == 'Begin' && !controller.statusRideFromStart) { @@ -82,29 +82,29 @@ class RideBeginPassenger extends StatelessWidget { ), tooltip: ' Add Note', // Optional tooltip for clarity ), - audioController.isRecording == false - ? IconButton( - onPressed: () async { - await audioController.startRecording(); - }, - icon: const Icon( - Icons.play_circle_fill_outlined, - color: AppColor.greenColor, - ), - tooltip: - ' Add Note', // Optional tooltip for clarity - ) - : IconButton( - onPressed: () async { - await audioController.stopRecording(); - }, - icon: const Icon( - Icons.stop_circle, - color: AppColor.greenColor, - ), - tooltip: - ' Add Note', // Optional tooltip for clarity - ), + // audioController.isRecording == false + // ? IconButton( + // onPressed: () async { + // await audioController.startRecording(); + // }, + // icon: const Icon( + // Icons.play_circle_fill_outlined, + // color: AppColor.greenColor, + // ), + // tooltip: + // ' Add Note', // Optional tooltip for clarity + // ) + // : IconButton( + // onPressed: () async { + // await audioController.stopRecording(); + // }, + // icon: const Icon( + // Icons.stop_circle, + // color: AppColor.greenColor, + // ), + // tooltip: + // ' Add Note', // Optional tooltip for clarity + // ), ], ), Row( diff --git a/pubspec.lock b/pubspec.lock index db10ca7..e0adec6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -638,30 +638,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" - flutter_sound: - dependency: "direct main" - description: - name: flutter_sound - sha256: "090a4694b11ecc744c2010621c4ffc5fe7c3079d304ea014961a72c7b72cfe6c" - url: "https://pub.dev" - source: hosted - version: "9.2.13" - flutter_sound_platform_interface: - dependency: transitive - description: - name: flutter_sound_platform_interface - sha256: "4537eaeb58a32748c42b621ad6116f7f4c6ee0a8d6ffaa501b165fe1c9df4753" - url: "https://pub.dev" - source: hosted - version: "9.2.13" - flutter_sound_web: - dependency: transitive - description: - name: flutter_sound_web - sha256: ad4ca92671a1879e1f613e900bbbdb8170b20d57d1e4e6363018fe56b055594f - url: "https://pub.dev" - source: hosted - version: "9.2.13" flutter_spinkit: dependency: transitive description: @@ -1304,14 +1280,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.2.0" - logger: - dependency: transitive - description: - name: logger - sha256: "7ad7215c15420a102ec687bb320a7312afd449bac63bfb1c60d9787c27b9767f" - url: "https://pub.dev" - source: hosted - version: "1.4.0" logging: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b242201..73885b3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -50,14 +50,14 @@ dependencies: cached_network_image: ^3.3.0 calendar_builder: ^0.0.6 fl_chart: ^0.66.0 - agora_rtc_engine: ^6.3.0 + agora_rtc_engine: ^6.2.6 flutter_tts: ^3.8.5 permission_handler: ^11.3.0 google_generative_ai: ^0.0.1-dev vibration: ^1.8.4 wakelock_plus: background_location: ^0.13.0 - flutter_sound: ^9.2.13 +# flutter_sound: ^9.2.13