diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index bab8690..0c0f635 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -41,7 +41,7 @@ CFBundleSignature ???? CFBundleVersion - 4.3.48 + 4.3.47 FirebaseAppDelegateProxyEnabled NO GMSApiKey diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 363e74d..a54952a 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -3287,7 +3287,29 @@ class MapPassengerController extends GetxController { costLady, costRayehGai = 0; update(); - if (currentTime.hour >= 22 && currentTime.hour < 5) { + if (startNameAddress.toLowerCase().contains('airport') || + endNameAddress.toLowerCase().contains('airport') || + startNameAddress.contains('مطار') || + startNameAddress.contains('المطار') || + endNameAddress.contains('مطار') || + endNameAddress.contains('المطار')) { + costComfort = + (distance * comfortPrice) + (costDuration * latePrice) + 20; + costSpeed = (distance * speedPrice) + (costDuration * latePrice) + 20; + costBalash = + (distance * (speedPrice - 1)) + (costDuration * latePrice) + 20; + costDelivery = + (distance * deliveryPrice) + (costDuration * latePrice) + 20; + costLady = + (distance * comfortPrice + 2) + (costDuration * latePrice) + 20; + costRayehGai = (distance * 2 * speedPrice) - + ((distance * 1 * speedPrice) * .4) + + costDuration * 2 * latePrice + + 20; + + update(); + } + if (currentTime.hour >= 21 && currentTime.hour < 0) { // costDistance = distance * latePrice; costComfort = (distance * comfortPrice) + costDuration * latePrice; costSpeed = (distance * speedPrice) + costDuration * latePrice; @@ -3298,6 +3320,43 @@ class MapPassengerController extends GetxController { ((distance * 1 * speedPrice) * .4) + costDuration * 2 * latePrice; + update(); + } else if (currentTime.hour >= 1 && currentTime.hour < 5) { + // costDistance = distance * latePrice; + if (startNameAddress.contains('club') || + startNameAddress.contains('nightclub') || + startNameAddress.contains('ديسكو') || + startNameAddress.contains('ملهى ليلي') || + startNameAddress.contains('Night club')) { + // Your code here costComfort = + (distance * comfortPrice) + costDuration * (latePrice + .5) * 2; + costSpeed = + (distance * speedPrice) + costDuration * (latePrice + .5) * 2; + costBalash = (distance * (speedPrice - 1)) + + costDuration * (latePrice + .5) * 2; + costDelivery = + (distance * deliveryPrice) + costDuration * (latePrice + .5) * 2; + costLady = (distance * comfortPrice + 2) + + costDuration * (latePrice + .5) * 2; + costRayehGai = (distance * 2 * speedPrice) - + ((distance * 1 * speedPrice) * .4) + + costDuration * 2 * (latePrice + .5) * 2; + + update(); + } + costComfort = + (distance * comfortPrice) + costDuration * (latePrice + .5); + costSpeed = (distance * speedPrice) + costDuration * (latePrice + .5); + costBalash = + (distance * (speedPrice - 1)) + costDuration * (latePrice + .5); + costDelivery = + (distance * deliveryPrice) + costDuration * (latePrice + .5); + costLady = + (distance * comfortPrice + 2) + costDuration * (latePrice + .5); + costRayehGai = (distance * 2 * speedPrice) - + ((distance * 1 * speedPrice) * .4) + + costDuration * 2 * latePrice; + update(); } else if (currentTime.hour >= 13 && currentTime.hour <= 16) { // if (averageDuration > 2.5) { diff --git a/lib/views/home/map_widget.dart/left_main_menu_icons.dart b/lib/views/home/map_widget.dart/left_main_menu_icons.dart index f8eb189..d004ed5 100644 --- a/lib/views/home/map_widget.dart/left_main_menu_icons.dart +++ b/lib/views/home/map_widget.dart/left_main_menu_icons.dart @@ -112,23 +112,23 @@ GetBuilder leftMainMenuIcons() { // ), // ), // ), - AnimatedContainer( - duration: const Duration(microseconds: 200), - width: controller.widthMapTypeAndTraffic, - decoration: BoxDecoration( - color: AppColor.secondaryColor, - border: Border.all(), - borderRadius: BorderRadius.circular(15)), - child: IconButton( - onPressed: () async { - Get.to(SmsSignupEgypt()); - }, - icon: const Icon( - Icons.chat, - size: 29, - ), - ), - ), + // AnimatedContainer( + // duration: const Duration(microseconds: 200), + // width: controller.widthMapTypeAndTraffic, + // decoration: BoxDecoration( + // color: AppColor.secondaryColor, + // border: Border.all(), + // borderRadius: BorderRadius.circular(15)), + // child: IconButton( + // onPressed: () async { + // Get.to(SmsSignupEgypt()); + // }, + // icon: const Icon( + // Icons.chat, + // size: 29, + // ), + // ), + // ), // AnimatedContainer( // duration: const Duration(microseconds: 200), // width: controller.widthMapTypeAndTraffic,