diff --git a/android/app/build.gradle b/android/app/build.gradle index a4c0ad63..10fbe461 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -5,6 +5,8 @@ plugins { id "dev.flutter.flutter-gradle-plugin" id "com.google.firebase.crashlytics" id "com.huawei.agconnect" +// id("com.mapbox.gradle.application") +// id("com.mapbox.gradle.plugins.ndk") } @@ -150,6 +152,7 @@ dependencies { annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0' implementation 'com.mapbox.maps:android:11.5.0' +// implementation 'com.mapbox.maps:android:11.4.0' // AARs implementation files('libs/PenNavUI.aar') diff --git a/android/build.gradle b/android/build.gradle index a255ad0a..74abf447 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,6 +3,19 @@ buildscript { mavenCentral() google() maven { url "https://developer.huawei.com/repo/" } + maven { + url = uri("https://api.mapbox.com/downloads/v2/releases/maven") + credentials { + username = "mapbox" + password = "sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg" + if (password == null || password == "") { + throw new GradleException("MAPBOX_DOWNLOADS_TOKEN isn't set. Set it to the project properties or to the environment variables.") + } + } + authentication { + basic(BasicAuthentication) + } + } } dependencies { classpath 'com.android.tools.build:gradle:8.1.0' diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart index 82f2bf94..4d0cea68 100644 --- a/lib/core/model/radiology/final_radiology.dart +++ b/lib/core/model/radiology/final_radiology.dart @@ -44,6 +44,7 @@ class FinalRadiology { bool? isCVI; bool? isRadMedicalReport; bool? isLiveCareAppointment; + String? exam_Id; FinalRadiology( {this.setupID, @@ -88,7 +89,8 @@ class FinalRadiology { this.speciality, this.isCVI, this.isRadMedicalReport, - this.isLiveCareAppointment}); + this.isLiveCareAppointment, + this.exam_Id}); FinalRadiology.fromJson(Map json) { try { @@ -135,6 +137,7 @@ class FinalRadiology { // speciality = json['Speciality'].cast(); isCVI = json['isCVI']; isRadMedicalReport = json['isRadMedicalReport']; + exam_Id = json['Exam_id']; } catch (e) { print(e); } diff --git a/lib/core/service/medical/radiology_service.dart b/lib/core/service/medical/radiology_service.dart index d2c6be86..4805432a 100644 --- a/lib/core/service/medical/radiology_service.dart +++ b/lib/core/service/medical/radiology_service.dart @@ -12,7 +12,7 @@ class RadiologyService extends BaseService { String radReportPDF = ""; - Future getRadImageURL({int? invoiceNo, String? invoiceType, int? lineItem, int? projectId, bool? isVidaPlus}) async { + Future getRadImageURL({int? invoiceNo, String? invoiceType, int? lineItem, int? projectId, bool? isVidaPlus, String? examId}) async { hasError = false; final Map body = new Map(); body['InvoiceNo'] = isVidaPlus! ? "0" : invoiceNo; @@ -20,6 +20,7 @@ class RadiologyService extends BaseService { body['LineItemNo'] = lineItem; body['ProjectID'] = projectId; body['InvoiceType'] = invoiceType; + body['ExamId'] = examId; await baseAppClient.post(GET_RAD_IMAGE_URL, isAllowAny: true, onSuccess: (dynamic response, int statusCode) { url = response['Data']; diff --git a/lib/core/viewModels/medical/radiology_view_model.dart b/lib/core/viewModels/medical/radiology_view_model.dart index 2ab38b70..5e1fdf40 100644 --- a/lib/core/viewModels/medical/radiology_view_model.dart +++ b/lib/core/viewModels/medical/radiology_view_model.dart @@ -56,9 +56,9 @@ class RadiologyViewModel extends BaseViewModel { String get radImageURL => _radiologyService.url; - getRadImageURL({required int invoiceNo, String? invoiceType, required int lineItem, required int projectId, required bool isVidaPlus}) async { + getRadImageURL({required int invoiceNo, String? invoiceType, required int lineItem, required int projectId, required bool isVidaPlus, required String examId}) async { setState(ViewState.Busy); - await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, invoiceType: invoiceType, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus); + await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, invoiceType: invoiceType, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus, examId: examId); if (_radiologyService.hasError) { error = _radiologyService.error!; setState(ViewState.Error); diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 95971d0b..2863dd20 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -95,7 +95,7 @@ class _ConfirmLogin extends State { late ToDoCountProviderModel toDoProvider; var dob; - late int isHijri; + int isHijri = 0; var healthId; @override diff --git a/lib/pages/medical/radiology/radiology_details_page.dart b/lib/pages/medical/radiology/radiology_details_page.dart index 7bfa2522..e86f22d5 100644 --- a/lib/pages/medical/radiology/radiology_details_page.dart +++ b/lib/pages/medical/radiology/radiology_details_page.dart @@ -33,7 +33,8 @@ class RadiologyDetailsPage extends StatelessWidget { invoiceType: finalRadiology!.invoiceType, lineItem: finalRadiology!.invoiceLineItemNo!, invoiceNo: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!) ? finalRadiology!.invoiceNo_VP : finalRadiology!.invoiceNo, - isVidaPlus: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!)), + isVidaPlus: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!), + examId: finalRadiology!.exam_Id ?? ""), builder: (_, model, widget) => AppScaffold( appBarTitle: TranslationBase.of(context).report, isShowAppBar: true,