From 220c954a4aa785492fc5a57bfcb0311a691cd002 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 26 May 2025 11:20:54 +0300 Subject: [PATCH] updates --- lib/config/config.dart | 14 ++++---- lib/pages/conference/zoom/call_screen.dart | 7 ++-- lib/widgets/in_app_browser/InAppBrowser.dart | 4 +-- pubspec.yaml | 36 ++++++++++---------- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 65c02a4d..46e3dcc0 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; - // var BASE_URL = 'https://uat.hmgwebservices.com/'; -var BASE_URL = 'https://hmgwebservices.com/'; + var BASE_URL = 'https://uat.hmgwebservices.com/'; +// var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'http://10.201.204.103/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; @@ -354,7 +354,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal var CHANNEL = 3; var GENERAL_ID = 'Cs2020@2016\$2958'; var IP_ADDRESS = '10.20.10.20'; -var VERSION_ID = 18.6; +var VERSION_ID = 18.7; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; @@ -701,10 +701,10 @@ var IS_DOCTOR_AVAILABLE_BY_CALENDAR_SCHEDULE = 'Services/OUTPs.svc/REST/HIS_IsDo //PAYFORT var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; -var payFortEnvironment = FortEnvironment.production; -var applePayMerchantId = "merchant.com.hmgwebservices"; -// var payFortEnvironment = FortEnvironment.test; -// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; +// var payFortEnvironment = FortEnvironment.production; +// var applePayMerchantId = "merchant.com.hmgwebservices"; +var payFortEnvironment = FortEnvironment.test; +var applePayMerchantId = "merchant.com.hmgwebservices.uat"; class AppGlobal { static var context; diff --git a/lib/pages/conference/zoom/call_screen.dart b/lib/pages/conference/zoom/call_screen.dart index 355842e0..1d71d72c 100644 --- a/lib/pages/conference/zoom/call_screen.dart +++ b/lib/pages/conference/zoom/call_screen.dart @@ -15,6 +15,7 @@ import 'package:flutter_zoom_videosdk/native/zoom_videosdk_event_listener.dart'; import 'package:flutter_zoom_videosdk/native/zoom_videosdk_live_transcription_message_info.dart'; import 'package:flutter_zoom_videosdk/native/zoom_videosdk_user.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; // import '../components/video_view.dart'; // import '../components/comment_list.dart'; @@ -76,6 +77,7 @@ class _CallScreenState extends State { useEffect(() { Future.microtask(() async { + WakelockPlus.enable(); var token = generateJwt(args.sessionName, args.role); try { Map SDKaudioOptions = {"connect": true, "mute": false, "autoAdjustSpeakerVolume": false}; @@ -170,6 +172,7 @@ class _CallScreenState extends State { fullScreenUser.value = null; await zoom.leaveSession(false); Navigator.pop(context); + WakelockPlus.disable(); }); final sessionNeedPasswordListener = emitter.on(EventType.onSessionNeedPassword, (data) async { @@ -472,8 +475,7 @@ class _CallScreenState extends State { ], ), ); - if (errorType == Errors.SessionJoinFailed || - errorType == Errors.SessionDisconnecting) { + if (errorType == Errors.SessionJoinFailed || errorType == Errors.SessionDisconnecting) { Timer( const Duration(milliseconds: 1000), () => Navigator.pop(context), @@ -1157,6 +1159,7 @@ class _CallScreenState extends State { } void onLeaveSession(bool isEndSession) async { + WakelockPlus.disable(); await zoom.leaveSession(isEndSession); Navigator.pop(context); // Navigator.pop(context); diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index ee68f743..6f61ac8a 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser { static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT - // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS diff --git a/pubspec.yaml b/pubspec.yaml index ae96d0bf..dc3da8dc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: diplomaticquarterapp description: A new Flutter application. -version: 4.6.093+4050093 +version: 4.6.014+1 environment: sdk: ">=3.0.0 <3.13.0" @@ -13,10 +13,10 @@ dependencies: # Localizations flutter_localizations: sdk: flutter -# intl: ^0.18.1 + # intl: ^0.18.1 intl: ^0.19.0 -# webview_flutter: ^2.0.4 + # webview_flutter: ^2.0.4 webview_flutter: ^4.8.0 # http client @@ -34,9 +34,9 @@ dependencies: get_it: ^7.2.0 #Google Fit & Apple HealthKit -# health: ^3.0.3 + # health: ^3.0.3 health: ^11.1.0 -# pedometer: ^4.0.2 + # pedometer: ^4.0.2 #chart fl_chart: ^0.64.0 @@ -60,7 +60,7 @@ dependencies: local_auth: ^2.1.7 localstorage: ^4.0.0+1 maps_launcher: ^2.0.1 -# url_launcher: ^6.0.15 + # url_launcher: ^6.0.15 url_launcher: ^6.3.1 url_launcher_ios: ^6.3.2 shared_preferences: ^2.0.0 @@ -144,12 +144,12 @@ dependencies: carousel_slider: ^5.0.0 #Dependencies for video call implementation native_device_orientation: ^1.0.0 -# wakelock: ^0.6.2 + # wakelock: ^0.6.2 wakelock_plus: ^1.1.4 after_layout: ^1.1.0 cached_network_image: ^3.3.0 flutter_tts: ^3.6.1 -# vibration: ^1.7.3 + # vibration: ^1.7.3 flutter_nfc_kit: ^3.3.1 #geofencing: any speech_to_text: ^6.1.1 @@ -159,13 +159,13 @@ dependencies: in_app_review: ^2.0.3 badges: ^3.1.2 -# flutter_app_icon_badge: ^2.0.0 -# dropdown_search: 5.0.6 + # flutter_app_icon_badge: ^2.0.0 + # dropdown_search: 5.0.6 youtube_player_flutter: ^9.1.0 -# shimmer: ^3.0.0 -# carousel_slider: ^4.0.0 -# flutter_staggered_grid_view: ^0.7.0 + # shimmer: ^3.0.0 + # carousel_slider: ^4.0.0 + # flutter_staggered_grid_view: ^0.7.0 huawei_hmsavailability: ^6.11.0+301 huawei_location: ^6.11.0+301 share_plus: ^10.0.2 @@ -174,7 +174,7 @@ dependencies: equatable: ^2.0.3 wave: ^0.2.0 sms_otp_auto_verify: ^2.1.0 -# flutter_ios_voip_kit: ^0.1.0 + # flutter_ios_voip_kit: ^0.1.0 google_api_availability: ^4.0.0 open_filex: ^4.3.2 path_provider: ^2.0.8 @@ -267,10 +267,10 @@ flutter: - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.woff weight: 300 -# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.eot -# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.otf + # - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.eot + # - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.otf - asset: assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf -# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.woff + # - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.woff weight: 400 - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.eot @@ -285,7 +285,7 @@ flutter: - family: SaudiRiyal fonts: -# - asset: assets/fonts/saudi_riyal.ttf + # - asset: assets/fonts/saudi_riyal.ttf - asset: assets/fonts/sar-Regular.otf - family: Poppins