diff --git a/android/app/build.gradle b/android/app/build.gradle
index 19ff9383..f1799225 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -94,9 +94,9 @@ android {
debug {
debuggable true
signingConfig signingConfigs.debug
- ndk {
- abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
- }
+// ndk {
+// abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+// }
}
release {
debuggable false
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index de2d325c..9a3ac334 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -6,12 +6,26 @@
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 40d0ba44..130bc8cc 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -549,7 +549,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 4.5.63;
+ MARKETING_VERSION = 4.5.93;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -696,7 +696,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 4.5.63;
+ MARKETING_VERSION = 4.5.93;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -734,7 +734,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 4.5.63;
+ MARKETING_VERSION = 4.5.93;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/lib/config/config.dart b/lib/config/config.dart
index ec5d650c..550e1279 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -22,8 +22,8 @@ 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 = 'http://10.50.100.198:4422/';
-// 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.20.200.111:1010/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
@@ -668,10 +668,10 @@ var GET_DENTAL_INSTRUCTIONS = 'Services/OUTPs.svc/Rest/getProcedureNotification'
//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/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index 7a1c8a18..a1b9b9c3 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -193,7 +193,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232
- // body['PatientID'] = 4767804; //4609100
+ // body['PatientID'] = 4767978; //4609100
// body['TokenID'] = "@dm!n";
// Patient ID: 3027574
diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart
index b25a488f..6fb76141 100644
--- a/lib/pages/BookAppointment/components/SearchByClinic.dart
+++ b/lib/pages/BookAppointment/components/SearchByClinic.dart
@@ -330,7 +330,7 @@ class _SearchByClinicState extends State {
}).toList(),
onChanged: (HospitalsModel? newValue) async {
setState(() {
- HospitalsModel tempselectedHospital = new HospitalsModel.fromJson(newValue!.toJson());
+ HospitalsModel tempselectedHospital = new HospitalsModel.fromJson(newValue!.toJson());
projectDropdownValue = newValue.mainProjectID.toString();
if (dropdownValue!.split("-")[0] == "253") {
Navigator.push(
@@ -495,7 +495,6 @@ class _SearchByClinicState extends State {
}
getClinicsList() async {
- GifLoaderDialogUtils.showMyDialog(context);
if (await sharedPref.getObject(CLINICS_LIST) != null) {
dynamic res = await sharedPref.getObject(CLINICS_LIST);
setState(() {
@@ -505,8 +504,9 @@ class _SearchByClinicState extends State {
});
});
getProjectsList();
- GifLoaderDialogUtils.hideDialog(context);
+ // GifLoaderDialogUtils.hideDialog(context);
} else {
+ GifLoaderDialogUtils.showMyDialog(context);
ClinicListService service = new ClinicListService();
service.getClinicsList(context).then((res) {
if (res['MessageStatus'] == 1) {
diff --git a/lib/pages/BookAppointment/widgets/DoctorView.dart b/lib/pages/BookAppointment/widgets/DoctorView.dart
index 18a786f1..d186c953 100644
--- a/lib/pages/BookAppointment/widgets/DoctorView.dart
+++ b/lib/pages/BookAppointment/widgets/DoctorView.dart
@@ -88,7 +88,7 @@ class DoctorView extends StatelessWidget {
children: [
Expanded(
child: Text(
- doctor.name!,
+ doctor.name ?? "",
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
),
),
@@ -103,7 +103,7 @@ class DoctorView extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
LargeAvatar(
- name: doctor.name!,
+ name: doctor.name ?? "",
url: doctor.doctorImageURL!,
width: 48,
height: 48,
diff --git a/lib/pages/livecare/incoming_call.dart b/lib/pages/livecare/incoming_call.dart
index 55715445..59b6702f 100644
--- a/lib/pages/livecare/incoming_call.dart
+++ b/lib/pages/livecare/incoming_call.dart
@@ -217,14 +217,16 @@ class _IncomingCallState extends State with SingleTickerProviderSt
player.stop();
changeCallStatusAPI(4);
- if (widget.incomingCallData!.background == "0") { // Zoom Call Page
+ if (widget.incomingCallData!.background == "0") {
+ // Zoom Call Page
// Navigator.of(context).pop();
Navigator.pushReplacementNamed(
context,
"zoom_call_page",
arguments: CallArguments(widget.incomingCallData!.sessionId!, "123", "Patient", "40", "0", false),
);
- } else { // OpenTok Call Page
+ } else {
+ // OpenTok Call Page
await Navigator.of(context).pushReplacement(
MaterialPageRoute(
// fullscreenDialog: true,
diff --git a/lib/pages/livecare/widgets/clinic_list.dart b/lib/pages/livecare/widgets/clinic_list.dart
index 5b431479..0ab1e1c6 100644
--- a/lib/pages/livecare/widgets/clinic_list.dart
+++ b/lib/pages/livecare/widgets/clinic_list.dart
@@ -894,7 +894,7 @@ class _clinic_listState extends State {
} else {}
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
- AppToast.showErrorToast(message: err);
+ AppToast.showErrorToast(message: err, localContext: context);
print(err);
});
projectViewModel.analytics.liveCare.livecare_schedule_video_call_clinic(clinic: selectedClinicName);
diff --git a/pubspec.yaml b/pubspec.yaml
index 58f48afc..9b6839cb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: diplomaticquarterapp
description: A new Flutter application.
-version: 4.5.055+4050055
+version: 4.5.93+1
environment:
sdk: ">=3.0.0 <3.13.0"