diff --git a/android/agconnect-services.json b/android/agconnect-services.json deleted file mode 100644 index 91aad2c..0000000 --- a/android/agconnect-services.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "agcgw":{ - "backurl":"connect-drcn.hispace.hicloud.com", - "url":"connect-drcn.dbankcloud.cn", - "websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com", - "websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn" - }, - "agcgw_all":{ - "CN":"connect-drcn.dbankcloud.cn", - "CN_back":"connect-drcn.hispace.hicloud.com", - "DE":"connect-dre.dbankcloud.cn", - "DE_back":"connect-dre.hispace.hicloud.com", - "RU":"connect-drru.dbankcloud.cn", - "RU_back":"connect-drru.hispace.hicloud.com", - "SG":"connect-dra.dbankcloud.cn", - "SG_back":"connect-dra.hispace.hicloud.com" - }, - "client":{ - "cp_id":"2640966000002322881", - "product_id":"736430079244816567", - "client_id":"563735388191982656", - "client_secret":"650C7C799812AFFD53A10C7756CF05FB9F215A7E49032ABA8EBF3E14B77535CF", - "project_id":"736430079244816567", - "app_id":"102857389", - "api_key":"CgB6e3x9DJzMgRCmnT6dyUEkp6UsIfddb6l3w0ZEXzeiRMHEFi3400Z5fJ5qaHneU0OrAI/JRpk+DMGVs3QpUxlI", - "package_name":"com.ejada.hmg" - }, - "oauth_client":{ - "client_id":"102857389", - "client_type":1 - }, - "app_info":{ - "app_id":"102857389", - "package_name":"com.ejada.hmg" - }, - "service":{ - "analytics":{ - "collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn", - "collector_url_ru":"datacollector-drru.dt.hicloud.com,datacollector-drru.dt.dbankcloud.cn", - "collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn", - "collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn", - "collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn", - "resource_id":"p1", - "channel_id":"" - }, - "search":{ - "url":"https://search-drcn.cloud.huawei.com" - }, - "cloudstorage":{ - "storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn" - }, - "ml":{ - "mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn" - } - }, - "region":"CN", - "configuration_version":"3.0", - "appInfos":[ - { - "package_name":"com.ejada.hmg", - "client":{ - "app_id":"102857389" - }, - "app_info":{ - "package_name":"com.ejada.hmg", - "app_id":"102857389" - }, - "oauth_client":{ - "client_type":1, - "client_id":"102857389" - } - } - ] -} diff --git a/android/app/key b/android/app/key new file mode 100644 index 0000000..15b9f5d Binary files /dev/null and b/android/app/key differ diff --git a/android/app/keystores/keystore b/android/app/keystores/keystore new file mode 100644 index 0000000..e69de29 diff --git a/android/app/libs/PenNavUI.aar b/android/app/libs/PenNavUI.aar new file mode 100644 index 0000000..d423bc1 Binary files /dev/null and b/android/app/libs/PenNavUI.aar differ diff --git a/android/app/libs/Penguin.aar b/android/app/libs/Penguin.aar new file mode 100644 index 0000000..5c789c6 Binary files /dev/null and b/android/app/libs/Penguin.aar differ diff --git a/android/app/libs/PenguinRenderer.aar b/android/app/libs/PenguinRenderer.aar new file mode 100644 index 0000000..b657ac6 Binary files /dev/null and b/android/app/libs/PenguinRenderer.aar differ diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b8bd69e..6a1c47e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -248,9 +248,6 @@ - + + + + + + + + Gradle Configuration Cache + + + +
+ +
+ Loading... +
+ + + + + + diff --git a/android/key b/android/key new file mode 100644 index 0000000..15b9f5d Binary files /dev/null and b/android/key differ diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index 39c761f..29ec562 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -730,7 +730,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart index c1d3ed4..c05fe8b 100644 --- a/lib/core/utils/utils.dart +++ b/lib/core/utils/utils.dart @@ -849,33 +849,6 @@ class Utils { return isHavePrivilege; } - ///method to be used to get the text as per the langauge of the application - static String getTextWRTCurrentLanguage( - String? englishText, String? arabicText) { - String? text = appState.isArabic() ? arabicText : englishText; - return text ?? ''; - } - - static String formatNumberToInternationalFormat(num number, {String? currencySymbol, int decimalDigit = 0}){ - return NumberFormat.currency( - locale: 'en_US', - symbol: currencySymbol??"", - decimalDigits: decimalDigit) - .format(number); - } - - - static PatientDoctorAppointmentList? convertToPatientDoctorAppointmentList( - HospitalsModel? hospital) { - if (hospital == null) return null; - return PatientDoctorAppointmentList( - filterName: hospital.name, - distanceInKMs: hospital.distanceInKilometers?.toString(), - projectTopName: hospital.name, - projectBottomName: hospital.name, - model: hospital, - isHMC: hospital.isHMC); - } } diff --git a/lib/features/emergency_services/emergency_services_repo.dart b/lib/features/emergency_services/emergency_services_repo.dart index e0f7258..b81356e 100644 --- a/lib/features/emergency_services/emergency_services_repo.dart +++ b/lib/features/emergency_services/emergency_services_repo.dart @@ -5,9 +5,9 @@ import 'package:hmg_patient_app_new/core/common_models/generic_api_model.dart'; import 'package:hmg_patient_app_new/core/exceptions/api_failure.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/features/authentication/models/resp_models/authenticated_user_resp_model.dart'; -import 'package:hmg_patient_app_new/features/emergency_services/model/resp_model/EROnlineCheckInPaymentDetailsResponse.dart'; import 'package:hmg_patient_app_new/features/emergency_services/models/request_model/PatientER_RC.dart'; import 'package:hmg_patient_app_new/features/emergency_services/models/resp_model/AmbulanceRequestOrdersModel.dart'; +import 'package:hmg_patient_app_new/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart'; import 'package:hmg_patient_app_new/features/emergency_services/models/resp_model/ProjectAvgERWaitingTime.dart'; import 'package:hmg_patient_app_new/features/emergency_services/models/resp_model/rrt_procedures_response_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/hospital_model.dart'; @@ -37,7 +37,6 @@ abstract class EmergencyServicesRepo { Future>>> getTransportationMethods({int? id}); - Future>>> getProjectList(); Future>> submitAmbulanceRequest(PatientER_RC request); @@ -345,43 +344,6 @@ class EmergencyServicesRepoImp implements EmergencyServicesRepo { } } - @override - Future>>> getProjectList() async { - Map request = {}; - - try { - GenericApiModel>? apiResponse; - Failure? failure; - await apiClient.post( - GET_PROJECT_LIST, - body: request, - onFailure: (error, statusCode, {messageStatus, failureType}) { - failure = failureType; - }, - onSuccess: (response, statusCode, {messageStatus, errorMessage}) { - try { - final list = response['ListProject']; - - final appointmentsList = list.map((item) => HospitalsModel.fromJson(item as Map)).toList().cast(); - - apiResponse = GenericApiModel>( - messageStatus: messageStatus, - statusCode: statusCode, - errorMessage: null, - data: appointmentsList, - ); - } catch (e) { - failure = DataParsingFailure(e.toString()); - } - }, - ); - if (failure != null) return Left(failure!); - if (apiResponse == null) return Left(ServerFailure("Unknown error")); - return Right(apiResponse!); - } catch (e) { - return Left(UnknownFailure(e.toString())); - } - } @override Future>> checkPatientERPaymentInformation({int? projectID}) async { diff --git a/lib/features/emergency_services/emergency_services_view_model.dart b/lib/features/emergency_services/emergency_services_view_model.dart index 00040ac..ec65193 100644 --- a/lib/features/emergency_services/emergency_services_view_model.dart +++ b/lib/features/emergency_services/emergency_services_view_model.dart @@ -4,15 +4,15 @@ import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart' as GMSMapServices; import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/location_util.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/doctor_response_mapper.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart'; import 'package:hmg_patient_app_new/features/authentication/models/resp_models/authenticated_user_resp_model.dart'; import 'package:hmg_patient_app_new/features/emergency_services/emergency_services_repo.dart'; -import 'package:hmg_patient_app_new/features/emergency_services/model/resp_model/EROnlineCheckInPaymentDetailsResponse.dart'; -import 'package:hmg_patient_app_new/features/emergency_services/model/resp_model/ProjectAvgERWaitingTime.dart'; -import 'package:hmg_patient_app_new/features/emergency_services/models/resp_models/rrt_procedures_response_model.dart'; +import 'package:hmg_patient_app_new/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/facility_selection.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/hospital_model.dart'; import 'package:hmg_patient_app_new/features/emergency_services/models/AmbulanceCallingPlace.dart'; @@ -104,6 +104,11 @@ class EmergencyServicesViewModel extends ChangeNotifier { notifyListeners(); } + get isGMSAvailable + { + return appState.isGMSAvailable; + } + EmergencyServicesViewModel({ required this.emergencyServicesRepo, required this.errorHandlerService, @@ -267,6 +272,18 @@ class EmergencyServicesViewModel extends ChangeNotifier { } } + void navigateToEROnlineCheckIn() { + navServices.push( + CustomPageRoute(page: ErOnlineCheckinHome()), + ); + } + + void navigateToEROnlineCheckInPaymentPage() { + navServices.push( + CustomPageRoute(page: ErOnlineCheckinPaymentDetailsPage()), + ); + } + void updateBottomSheetState(BottomSheetType sheetType) { if (sheetType == BottomSheetType.EXPANDED && selectedHospital == null) { dialogService.showErrorBottomSheet(message: "Kindly Select Hospital".needTranslation); @@ -440,9 +457,7 @@ class EmergencyServicesViewModel extends ChangeNotifier { onOkPressed: () { navServices.pop(); print("inside the ok button"); - navServices.pushAndReplace( - AppRoutes.loginScreen - ); + getIt().onLoginPressed(); }); return; } diff --git a/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart b/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart index d0d7c82..5e4b885 100644 --- a/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart +++ b/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart @@ -167,7 +167,7 @@ class CallAmbulancePage extends StatelessWidget { mainAxisSize: MainAxisSize.min, spacing: 24.h, children: [ - // inputFields(context), + inputFields(context), SizedBox( height: 200.h, child: DecoratedBox( diff --git a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_home.dart b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_home.dart index d389414..0dfd081 100644 --- a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_home.dart +++ b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_home.dart @@ -168,6 +168,7 @@ class ErOnlineCheckinHome extends StatelessWidget { selectedFacility: vm.selectedFacility, hmcCount: vm.hmcCount, hmgCount: vm.hmgCount, + searchText: vm.searchController, ), ), isFullScreen: false,