diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 9a3ac334..b1540644 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -14,16 +14,16 @@
-
+
-
+
+
-
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 759e5204..2e0b100b 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:1022/';
// 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/';
@@ -344,7 +344,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari
var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20';
-var VERSION_ID = 15.8;
+var VERSION_ID = 15.9;
var SETUP_ID = '91877';
var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0;
@@ -678,10 +678,10 @@ var GET_PROJECT_FROM_NFC = 'Services/OUTPs.svc/Rest/GetProjectByNFC';
//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/config/localized_values.dart b/lib/config/localized_values.dart
index 5a775c5b..311cb419 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -549,7 +549,7 @@ const Map localizedValues = {
"emergency": {"en": "Emergency", "ar": "الطوارئ"},
"erservices": {"en": "Emergency", "ar": "الطوارئ"},
"services2": {"en": "Services", "ar": "خدمات"},
- "cantSeeProfile": {"en": "To view your medical profile, please log in or register now", "ar": "للتصفح ملفك الطبي الرجاء تسجيل الدخول أو التسجيل الآن"},
+ "cantSeeProfile": {"en": "To view your medical profile, please log in or register now", "ar": "لتصفح ملفك الطبي الرجاء تسجيل الدخول أو التسجيل الآن"},
"loginRegisterNow": {"en": "Login or Register Now", "ar": "تسجيل الدخول أو التسجيل الآن"},
"HMGPharmacy": {"en": "HMG Pharmacy", "ar": "صيدلية HMG"},
"ecommerceSolution": {"en": "Ecommerce Solution", "ar": "حل التجارة الإلكترونية"},
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index a1b9b9c3..d8f30f0c 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'] = 4767978; //4609100
+ // body['PatientID'] = 283093; //4609100
// body['TokenID'] = "@dm!n";
// Patient ID: 3027574
diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart
index 4d92dda0..d2c6c383 100644
--- a/lib/pages/DrawerPages/family/my-family.dart
+++ b/lib/pages/DrawerPages/family/my-family.dart
@@ -476,7 +476,7 @@ class _MyFamily extends State with TickerProviderStateMixin {
var mainUser = await sharedPref.getObject(MAIN_USER);
var loginType = await sharedPref.getInt(LAST_LOGIN);
var pushToken = await sharedPref.getString(PUSH_TOKEN);
- var oneSignalPushToken = await sharedPref.getString(ONESIGNAL_APNS_TOKEN);
+ // var oneSignalPushToken = await sharedPref.getString(ONESIGNAL_APNS_TOKEN ?? "");
this.sharedPref.clear();
if (mainUser["PatientID"] != result.list.patientID) {
result.list.isFamily = true;
@@ -484,7 +484,7 @@ class _MyFamily extends State with TickerProviderStateMixin {
this.sharedPref.setString(APP_LANGUAGE, currentLang);
this.sharedPref.setString(BLOOD_TYPE, bloodType);
this.sharedPref.setString(PUSH_TOKEN, pushToken);
- this.sharedPref.setString(ONESIGNAL_APNS_TOKEN, oneSignalPushToken);
+ // this.sharedPref.setString(ONESIGNAL_APNS_TOKEN, oneSignalPushToken);
this.sharedPref.setInt(LAST_LOGIN, loginType ?? 1);
await this.sharedPref.setObject(MAIN_USER, mainUser);
await this.sharedPref.setObject(USER_PROFILE, result.list);
@@ -497,6 +497,8 @@ class _MyFamily extends State with TickerProviderStateMixin {
Provider.of(context, listen: false).setUser(result.list);
Provider.of(context, listen: false).authenticatedUserObject.user = result.list;
+ await this.sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL);
+
try {
// await appointmentRateViewModel.getIsLastAppointmentRatedList();
await getToDoCount();
diff --git a/lib/pages/conference/zoom/call_screen.dart b/lib/pages/conference/zoom/call_screen.dart
index 194b9f21..2ba0e49e 100644
--- a/lib/pages/conference/zoom/call_screen.dart
+++ b/lib/pages/conference/zoom/call_screen.dart
@@ -50,7 +50,7 @@ class _CallScreenState extends State {
var sharingUser = useState(null);
var videoInfo = useState('');
var isSharing = useState(false);
- var isMuted = useState(true);
+ var isMuted = useState(false);
var isVideoOn = useState(false);
var isSpeakerOn = useState(false);
var isRenameModalVisible = useState(false);
@@ -78,7 +78,7 @@ class _CallScreenState extends State {
Future.microtask(() async {
var token = generateJwt(args.sessionName, args.role);
try {
- Map SDKaudioOptions = {"connect": true, "mute": true, "autoAdjustSpeakerVolume": false};
+ Map SDKaudioOptions = {"connect": true, "mute": false, "autoAdjustSpeakerVolume": false};
Map SDKvideoOptions = {
"localVideoOn": true,
};
diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart
index 5999c8b0..18ed5440 100644
--- a/lib/pages/login/login.dart
+++ b/lib/pages/login/login.dart
@@ -358,7 +358,7 @@ class _Login extends State {
}
this.authService.checkActivationCode(request, code).then((result) async {
sharedPref.remove(FAMILY_FILE);
- registerGeoZones();
+ // registerGeoZones();
projectViewModel.setPrivilege(privilegeList: result);
result = CheckActivationCode.fromJson(result);
result.list.isFamily = false;
diff --git a/lib/pages/medical/radiology/radiology_details_page.dart b/lib/pages/medical/radiology/radiology_details_page.dart
index 2c6974c9..0ef6e0b4 100644
--- a/lib/pages/medical/radiology/radiology_details_page.dart
+++ b/lib/pages/medical/radiology/radiology_details_page.dart
@@ -56,7 +56,7 @@ class RadiologyDetailsPage extends StatelessWidget {
finalRadiology!.projectName!,
finalRadiology!.orderDate,
null,
- finalRadiology!.nationalityFlagURL!,
+ finalRadiology!.nationalityFlagURL ?? "",
finalRadiology!.doctorRate,
finalRadiology!.actualDoctorRate,
finalRadiology!.noOfPatientsRate,
diff --git a/lib/pages/medical/smart_watch_health_data/heartrate/heartrateTracker.dart b/lib/pages/medical/smart_watch_health_data/heartrate/heartrateTracker.dart
index 3ff0beae..97c61ee0 100644
--- a/lib/pages/medical/smart_watch_health_data/heartrate/heartrateTracker.dart
+++ b/lib/pages/medical/smart_watch_health_data/heartrate/heartrateTracker.dart
@@ -132,8 +132,8 @@ class _HeartRateTrackerState extends State with SingleTickerPr
GifLoaderDialogUtils.hideDialog(context);
weekyHearRateList.clear();
res['Med_GetAvgWeekTransactionsStsList'].forEach((element) {
- weekyHearRateList.add(new WeeklyHeartRateResModel.fromJson(element));
if (element['ValueAvg'] != null) {
+ weekyHearRateList.add(new WeeklyHeartRateResModel.fromJson(element));
num value = element['ValueAvg'];
avgWeeklyHearRateValue += value.toInt();
weeklyDataLength++;
diff --git a/lib/uitl/push-notification-handler.dart b/lib/uitl/push-notification-handler.dart
index 843bda38..6372e326 100644
--- a/lib/uitl/push-notification-handler.dart
+++ b/lib/uitl/push-notification-handler.dart
@@ -367,16 +367,16 @@ class PushNotificationHandler {
// print("Push Notification getToken: " + token!);
// onToken(token!);
// });
- FirebaseMessaging.instance.getToken(vapidKey: 'BHRJG8sIzcysWxPw3B6xQjz_85nUuCfU6EAmpH18kyUTmB2cj35IdFwCyWSab80SA1v6oBSWVh-p6PcHPw_y00Y').then((String? token) {
- print("Push Notification getToken: " + token!);
- onToken(token!);
- });
+ // FirebaseMessaging.instance.getToken(vapidKey: 'BHRJG8sIzcysWxPw3B6xQjz_85nUuCfU6EAmpH18kyUTmB2cj35IdFwCyWSab80SA1v6oBSWVh-p6PcHPw_y00Y').then((String? token) {
+ // print("Push Notification getToken: " + token!);
+ // onToken(token!);
+ // });
- if (Platform.isIOS) {
- FirebaseMessaging.instance.getAPNSToken().then((value) {
- print("Push APNS getToken: " + value!);
- });
- }
+ // if (Platform.isIOS) {
+ // FirebaseMessaging.instance.getAPNSToken().then((value) {
+ // print("Push APNS getToken: " + value!);
+ // });
+ // }
FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
}
diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart
index 8d4eaf50..9b59e200 100644
--- a/lib/uitl/utils.dart
+++ b/lib/uitl/utils.dart
@@ -390,7 +390,7 @@ class Utils {
imagePath: 'assets/images/new-design/virtual_tour_icon.png',
isPngImage: true,
subTitle: TranslationBase.of(context).service,
- isEnable: projectViewModel.havePrivilege(85),
+ isEnable: projectViewModel.havePrivilege(105),
),
));
@@ -403,7 +403,7 @@ class Utils {
imagePath: 'medical_instructions.svg',
isPngImage: false,
subTitle: TranslationBase.of(context).service,
- isEnable: projectViewModel.havePrivilege(85),
+ isEnable: projectViewModel.havePrivilege(106),
),
));
diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart
index 84fdb2bf..1b525e21 100644
--- a/lib/widgets/drawer/app_drawer_widget.dart
+++ b/lib/widgets/drawer/app_drawer_widget.dart
@@ -725,6 +725,8 @@ class _AppDrawerState extends State {
int languageID = Provider.of(context, listen: false).isArabic ? 1 : 2;
+ await this.sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL);
+
appointmentRateViewModel
.getIsLastAppointmentRatedList(languageID)
.then((value) => {
diff --git a/lib/widgets/new_design/doctor_header.dart b/lib/widgets/new_design/doctor_header.dart
index 6ef1809d..e3495561 100644
--- a/lib/widgets/new_design/doctor_header.dart
+++ b/lib/widgets/new_design/doctor_header.dart
@@ -107,7 +107,7 @@ class DoctorHeader extends StatelessWidget {
if (headerModel.nationalityFlagURL != null)
Padding(
padding: const EdgeInsets.only(top: 8.0),
- child: headerModel.nationalityFlagURL.isNotEmpty && headerModel.nationalityFlagURL != null && headerModel.nationalityFlagURL != 'null'? Image.network(headerModel.nationalityFlagURL, height: 20) : SizedBox(),
+ child: headerModel.nationalityFlagURL.isNotEmpty && headerModel.nationalityFlagURL != null && headerModel.nationalityFlagURL != 'null'? Image.network(headerModel.nationalityFlagURL, height: 20) : SizedBox(),
),
],
)
diff --git a/pubspec.yaml b/pubspec.yaml
index 9b6839cb..0e9b2bd6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: diplomaticquarterapp
description: A new Flutter application.
-version: 4.5.93+1
+version: 4.5.061+4050061
environment:
sdk: ">=3.0.0 <3.13.0"