Hamza/tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4/6/2

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-04-06 23:55:04 +03:00
parent c7595de6c3
commit c6b0bf2645
8 changed files with 91 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
.env
View File

@@ -8,15 +8,20 @@ chatGPTkey=zg-4C26q4SYBKQeHZDqkWowC9XrxgUEfUy9JRw2rm6Q2adb3kjwXrXlBl
transactionCloude=Qhcwilomqcoib:QVO_JNYED2XWA26YXKC2TP:YK1DVH6SJB31N3PE1UXrXlBl transactionCloude=Qhcwilomqcoib:QVO_JNYED2XWA26YXKC2TP:YK1DVH6SJB31N3PE1UXrXlBl
visionApi=3pALsqSSYTvzp69Q5FMIgbzjG6Z1zktJXrXlBl visionApi=3pALsqSSYTvzp69Q5FMIgbzjG6Z1zktJXrXlBl
chatGPTkeySefer=zg-IiR34ooza3Yvhvb9rZk1C9XrxgUE0l8jRRZrHj3Qe5QXPlqVXrXlBl chatGPTkeySefer=zg-IiR34ooza3Yvhvb9rZk1C9XrxgUE0l8jRRZrHj3Qe5QXPlqVXrXlBl
chatGPTkeySeferNew=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 chatGPTkeySeferNew=zg-Z4AJcAROgNXjgrEIU8fKC9XrxgUE4Qtrrlq1yiux0jL3dITSXrXlBl
secretKey=zg_cjzc_57I0TCIYNJPlIFQ5ZXkqiZZ28bBULsuMd1Cr5IYztSseaRvf3LdXWT9wwfV94Cv64CM7VAiMi6jWUrrLoAy9lNWVB33Rl8TY9b1XrXlBl secretKey=mk_femf_56O3CFOSBEVrOUA5MDgaoMM14xXHRzhNy7Fl5OSmcZzjqLpu9RyDTC8ttuP80Fp20FN6PQoNo2eTHllRiQs8rBTPX99Lr4CS8x7DlDrXrXrXlBl
stripe_publishableKe=vg_cjzc_57I0TCIYNJPlIFQ5ZB5j2x4vQpU5FVYF9f9Vou74a60BJAQvH5QunMMJB8D1TOqsuOlHCeeh7vHqpnkijRkx9UL5g33vb0iNWKIXrXlBl stripe_publishableKe=vg_ropj_57Iiv6MFCBFq3C2n6kNJnZByV6nuDtXe9IjEPOfhmpDtWmt3MLR0gQpiHcQmAFMUPrZc3QiCDjxBZLbxDC3efxWxz33bWH1ZgrsXrXlBl
llamaKey=LL-JfdiCXFpcLXNe87cSGQwGE0piZ9Zw179tVjEP1KMxQgVWGxD9Ixz3m8kkKaO5Kdi llamaKey=RR-EuyoFDUvfRDBj46fZKAtKJ3voM8Mt768cPeJV7GNdAkPTKdY8Odm9n4ggGqI5GyoXrXlBl
serverPHP=https://ride.mobile-app.store serverPHP=https://ride.mobile-app.store
cohere=Qfrhx9d5YVHiy4uEuK4wiFc9kIuFFlvc5A6WVzPK cohere=Aulwd8y5SPWos0hJhG0toUf8gOhUUrpf5Q2TPmVGXrXlBl
claudeAiAPI=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 claudeAiAPI=zg-qbc-qvo39-xWOxIGwWTOzCFBnIYSKKhfyz_KVAvrH-6_4ZEJL68G_QBH26oeTOMMoQug9KuOjjKSP_A4S3SUDlbxR9duVzoQ-MkX_UQQQXrXlBl
payPalClientId=AWj9MdPaA5Djpx8gOkvBn2qhP-3KvfB6W-l8USTsm19Xi2NhkNkE9QzosOvTPTsKjCMNffgpqStUA1-x payPalClientId=QALymfNI5Tzt4s-ysoz6vD4_nqX0SUtkC_qYV-Ugk5gaM_8Z-kg4L53k8Uux_4jEWXDkNpXGSWPpIzDFXrXlBl
payPalSecret=EKkasSl9O61lrfrbaJfXp1B-CIs2Rv71J0WPouxxugi38DsWaMhWpovJxN2ftYPQ0l6v9eoBvnyWkemp payPalClientIdLive=QZFjAoZfGtngNserll6r3cC56Xl1sVLQkn5dMbyebhzJY59EQ3hz7YxaEqEDYPTUFcQWqvePaQ5UJJVRXrXlBl
geminiApi=AIzaSyADz49pIaeO1grPEcpV8HNCJijzekd037o payPalSecret=JBAAvqJQGUsKD0Zjh4KjeczxfBFx-38SdlbIS56VRM8NDfe6mjMeZJhNLJek5XgQCqKCHtRf6MjRy-f8XrXlBl
geminiApiMasa=AIzaSyAOxZ8NLyGzqXEIV1xSv5-t7MHctu1VQrA payPalSecretLive=JQDATqnDfiFpEAN60KB4pGpDaJjyqBAd9jxMBPpzWU1P1k3H1jZhQjn73EHsKQna74P8p98hgOnMaWPWXrXlBl
geminiApi=QOmqZsQYm08vOqjI7klVJfvP4WBFEoemjgy396iXrXlBl
geminiApiMasa=QOmqZsQIdM4BRsKmaDJOP7dZp5-c6NWfch7PAlQXrXlBl
agoraAppId=71880f2j636509j24y5294480y30u848XrXlBl
agoraAppCertificate=j17q944u49390q758u1649448q2y6xfuXrXlBl

4
lib/constant/api_key.dart
View File

@@ -33,7 +33,5 @@ class AK {
static final String payPalSecret = Env.payPalSecret; static final String payPalSecret = Env.payPalSecret;
static final String geminiApi = Env.geminiApi; static final String geminiApi = Env.geminiApi;
static const String agoraAppId = '12994c6e707543e68d5638894d04f989'; static const String agoraAppId = '12994c6e707543e68d5638894d04f989';
static const String agoraChannelName = 'sefer1'; static const String agoraAppCertificate = 'e21a388f83034a159f2783889a6d7bcf';
static const String agoraToken =
'007eJxTYAjpCZ9yKVn8k5S5blKObpxhXtrE5vXtO0+cEjrxUnR3cZ8Cg6GRpaVJslmquYG5qYlxqplFiqmZsYWFpUmKgUmapYVlVeGF1IZARoZFOjkMjFAI4rMxFKempRYZMjAAABlgHmg=';
} }

6
lib/controller/functions/crud.dart
View File

@@ -49,8 +49,10 @@ class CRUD {
required String uid, required String uid,
}) async { }) async {
var uid = box.read(BoxName.phone) ?? box.read(BoxName.phoneDriver); var uid = box.read(BoxName.phone) ?? box.read(BoxName.phoneDriver);
var res = await http.get(Uri.parse( var res = await http.get(
'https://repulsive-pig-rugby-shirt.cyclic.app/token?channelName=$channelName')); Uri.parse(
'https://repulsive-pig-rugby-shirt.cyclic.app/token?channelName=$channelName'),
headers: {'Authorization': 'Bearer ${AK.agoraAppCertificate}'});
if (res.statusCode == 200) { if (res.statusCode == 200) {
var response = jsonDecode(res.body); var response = jsonDecode(res.body);

15
lib/controller/home/captin/home_captain_controller.dart
View File

@@ -32,7 +32,7 @@ class HomeCaptainController extends GetxController {
double naturePrice = 0; double naturePrice = 0;
bool isCallOn = false; bool isCallOn = false;
String totalMoneyToday = '0'; String totalMoneyToday = '0';
String rating = '0'; double? rating = 5;
String rideId = '0'; String rideId = '0';
String countRideToday = '0'; String countRideToday = '0';
String totalMoneyInSEFER = '0'; String totalMoneyInSEFER = '0';
@@ -274,11 +274,16 @@ class HomeCaptainController extends GetxController {
var res = await CRUD().get( var res = await CRUD().get(
link: AppLink.getDriverRate, link: AppLink.getDriverRate,
payload: {'driver_id': box.read(BoxName.driverID).toString()}); payload: {'driver_id': box.read(BoxName.driverID).toString()});
if (res != 'failure') {
var decod = jsonDecode(res); var decod = jsonDecode(res);
// print(decod); if (decod['message'][0]['rating'] != null) {
rating = decod['message'][0]['rating'].toString(); rating = double.parse(decod['message'][0]['rating'].toString());
// print('rating $rating'); } else {
update(); rating = 5.0; // Set a default value (e.g., 5.0 for full rating)
}
} else {
rating = 5;
}
} }
getAllPayment() async { getAllPayment() async {

2
lib/controller/home/captin/map_driver_controller.dart
View File

@@ -582,7 +582,7 @@ class MapDriverController extends GetxController {
await Future.delayed(const Duration(seconds: 1)); await Future.delayed(const Duration(seconds: 1));
recentDistanceToDash = Get.find<LocationController>().totalDistance; recentDistanceToDash = Get.find<LocationController>().totalDistance;
rideTimerFromBegin = i; rideTimerFromBegin = i;
price = carType == 'Comfort' || carType == 'Free Ride' price = carType == 'Comfort' // || carType == 'Free Ride'
? (i ~/ 60) + ? (i ~/ 60) +
(recentDistanceToDash * (recentDistanceToDash *
Get.find<HomeCaptainController>().comfortPrice) Get.find<HomeCaptainController>().comfortPrice)

62
lib/views/auth/captin/login_captin.dart
View File

@@ -5,7 +5,9 @@ import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import '../../../constant/box_name.dart'; import '../../../constant/box_name.dart';
import '../../../constant/char_map.dart';
import '../../../constant/colors.dart'; import '../../../constant/colors.dart';
import '../../../constant/credential.dart';
import '../../../constant/info.dart'; import '../../../constant/info.dart';
import '../../../constant/style.dart'; import '../../../constant/style.dart';
import '../../../controller/auth/captin/login_captin_controller.dart'; import '../../../controller/auth/captin/login_captin_controller.dart';
@@ -201,49 +203,51 @@ class LoginCaptin extends StatelessWidget {
// // print(v); // // print(v);
// // sql.deleteAllData(TableName.faceDetectTimes); // // sql.deleteAllData(TableName.faceDetectTimes);
// AC credentials = AC(); // AC credentials = AC();
// // String apiKey = AK.secretKey; // String apiKey =
// 'Qfrhx9d5YVHiy4uEuK4wiFc9kIuFFlvc5A6WVzPK';
// // // // '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'; // // // // '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';
// // credentials.gAK(); // // credentials.gAK();
// // String? apiKeyf = // String? apiKeyf =
// // await storage.read(key: BoxName.chatGPTkey); // await storage.read(key: BoxName.chatGPTkey);
// // print(apiKeyf); // print(apiKeyf);
// // String convertedString = credentials.c(apiKey, s); // String convertedString = credentials.c(apiKey, s);
// // String convertedStrings = credentials.c(apiKey, s); // String convertedStrings = credentials.c(apiKey, s);
// // print('Converted String s: $convertedStrings'); // print('Converted String s: $convertedStrings');
// // String convertedStringC = // String convertedStringC =
// // credentials.c(convertedStrings, c); // credentials.c(convertedStrings, c);
// // print('v: $v'); // print('v: $v');
// // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH' // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH'
// // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH' // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH'
// String convertedStringN = credentials.c( // String convertedStringN = credentials.c(
// credentials.c( // credentials.c(
// credentials.c( // credentials.c(
// '0vQRyaYYDWpsv73A5CZOknseK7S2sgwE', cs), // 'ASCeQiScKwmkMyjlrr7l0tT57Br2yPRAgm5xZndjnusED53JA0us1DbqJaJXDVWFCtAHapjVqA5FEEPL',
// cs),
// cC), // cC),
// cn); // cn);
// print('Converted v: $convertedStringN'); // print('Converted v: $convertedStringN');
// // // // //
// // String retrievedStringN = // String retrievedStringN =
// // credentials.r(convertedStringN, n); // credentials.r(convertedStringN, n);
// // print('Retrieved String: $retrievedStringN'); // print('Retrieved String: $retrievedStringN');
// // String retrievedStringC = // String retrievedStringC =
// // credentials.r(retrievedStringN, c); // credentials.r(retrievedStringN, c);
// // print('Retrieved String: $retrievedStringC'); // print('Retrieved String: $retrievedStringC');
// String retrievedStringS = credentials.r( // String retrievedStringS = credentials.r(
// credentials.r( // credentials.r(
// credentials.r(convertedStringN, cn), cC), // credentials.r(convertedStringN, cn), cC),
// cs); // cs);
// print('Retrieved String: $retrievedStringS'); // print('Retrieved String: $retrievedStringS');
//
// // if (retrievedStringS == apiKey) { // if (retrievedStringS == apiKey) {
// // print('same'); // print('same');
// // } // }
// // print(' AK is ' + AK.chatGPTkey); // // print(' AK is ' + AK.chatGPTkey); //
//
// // print(' ENV is ' + Env.chatGPTkey); // // print(' ENV is ' + Env.chatGPTkey); //
// // // print('storage is ' + v); // // // print('storage is ' + v); //
// // print('storage is ' + apiKeyf!); // // print('storage is ' + apiKeyf!); //
// }, // },
// icon: const Icon( // icon: const Icon(
// Icons.close, // Icons.close,

3
lib/views/home/Captin/home_captain/drawer_captain.dart
View File

@@ -69,8 +69,7 @@ class DrawerCaptain extends StatelessWidget {
horizontal: 4, vertical: 1), horizontal: 4, vertical: 1),
color: AppColor.greenColor, color: AppColor.greenColor,
child: RatingBar.builder( child: RatingBar.builder(
initialRating: double.parse( initialRating: 5,
Get.find<HomeCaptainController>().rating),
minRating: 1, minRating: 1,
direction: Axis.horizontal, direction: Axis.horizontal,
itemCount: 5, itemCount: 5,

2
lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
View File

@@ -67,7 +67,7 @@ GetBuilder<MapDriverController> driverEndRideBar() {
Text( Text(
'${mapDriverController.recentDistanceToDash.toStringAsFixed(0)} ${'KM'.tr}'), '${mapDriverController.recentDistanceToDash.toStringAsFixed(0)} ${'KM'.tr}'),
const Icon(Icons.attach_money), const Icon(Icons.attach_money),
Text(mapDriverController.price.toStringAsFixed(0)), Text(mapDriverController.price.toStringAsFixed(2)),
], ],
), ),
(mapDriverController.carType == 'Free Ride' || (mapDriverController.carType == 'Free Ride' ||