Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates & Fixes

Browse Source
dev_v3.13.6_BLE_Faiz
haroon amjad 1 year ago
parent c948a1780c
commit 8edf65daf1
10 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File

6
android/app/build.gradle
Unescape Escape View File

@ -94,9 +94,9 @@ android {
debug { debug {
debuggable true debuggable true
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
ndk { // ndk {
abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64' // abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
} // }
} }
release { release {
debuggable false debuggable false

16
android/app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -6,12 +6,26 @@
In most cases you can leave this as-is, but you if you want to provide 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 additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. --> FlutterApplication and put your custom class here. -->
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" tools:node="remove"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
<uses-permission android:name="android.permission.BLUETOOTH" tools:node="remove"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" tools:node="remove"/>
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" tools:node="remove"/>
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" tools:node="remove"/>
<uses-permission android:name="android.permission.BROADCAST_STICKY" tools:node="remove"/>
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/> <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />

6
ios/Runner.xcodeproj/project.pbxproj
Unescape Escape View File

@ -549,7 +549,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 4.5.63; MARKETING_VERSION = 4.5.93;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -696,7 +696,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 4.5.63; MARKETING_VERSION = 4.5.93;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -734,7 +734,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 4.5.63; MARKETING_VERSION = 4.5.93;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

12
lib/config/config.dart
Unescape Escape View File

@ -22,8 +22,8 @@ var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; 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:2018/';
// var BASE_URL = 'http://10.50.100.198:4422/'; // var BASE_URL = 'http://10.50.100.198:4422/';
// var BASE_URL = 'https://uat.hmgwebservices.com/'; var BASE_URL = 'https://uat.hmgwebservices.com/';
var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'http://10.20.200.111:1010/'; // var BASE_URL = 'http://10.20.200.111:1010/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.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 //PAYFORT
var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails";
var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse";
var payFortEnvironment = FortEnvironment.production; // var payFortEnvironment = FortEnvironment.production;
var applePayMerchantId = "merchant.com.hmgwebservices"; // var applePayMerchantId = "merchant.com.hmgwebservices";
// var payFortEnvironment = FortEnvironment.test; var payFortEnvironment = FortEnvironment.test;
// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; var applePayMerchantId = "merchant.com.hmgwebservices.uat";
class AppGlobal { class AppGlobal {
static var context; static var context;

2
lib/core/service/client/base_app_client.dart
Unescape Escape View File

@ -193,7 +193,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217; // body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232 // body['MobileNo'] = "531940021"; //0560717232
// body['PatientID'] = 4767804; //4609100 // body['PatientID'] = 4767978; //4609100
// body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
// Patient ID: 3027574 // Patient ID: 3027574

6
lib/pages/BookAppointment/components/SearchByClinic.dart
Unescape Escape View File

@ -330,7 +330,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
}).toList(), }).toList(),
onChanged: (HospitalsModel? newValue) async { onChanged: (HospitalsModel? newValue) async {
setState(() { setState(() {
HospitalsModel tempselectedHospital = new HospitalsModel.fromJson(newValue!.toJson()); HospitalsModel tempselectedHospital = new HospitalsModel.fromJson(newValue!.toJson());
projectDropdownValue = newValue.mainProjectID.toString(); projectDropdownValue = newValue.mainProjectID.toString();
if (dropdownValue!.split("-")[0] == "253") { if (dropdownValue!.split("-")[0] == "253") {
Navigator.push( Navigator.push(
@ -495,7 +495,6 @@ class _SearchByClinicState extends State<SearchByClinic> {
} }
getClinicsList() async { getClinicsList() async {
GifLoaderDialogUtils.showMyDialog(context);
if (await sharedPref.getObject(CLINICS_LIST) != null) { if (await sharedPref.getObject(CLINICS_LIST) != null) {
dynamic res = await sharedPref.getObject(CLINICS_LIST); dynamic res = await sharedPref.getObject(CLINICS_LIST);
setState(() { setState(() {
@ -505,8 +504,9 @@ class _SearchByClinicState extends State<SearchByClinic> {
}); });
}); });
getProjectsList(); getProjectsList();
GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
} else { } else {
GifLoaderDialogUtils.showMyDialog(context);
ClinicListService service = new ClinicListService(); ClinicListService service = new ClinicListService();
service.getClinicsList(context).then((res) { service.getClinicsList(context).then((res) {
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {

4
lib/pages/BookAppointment/widgets/DoctorView.dart
Unescape Escape View File

@ -88,7 +88,7 @@ class DoctorView extends StatelessWidget {
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
doctor.name!, doctor.name ?? "",
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16), 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, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
LargeAvatar( LargeAvatar(
name: doctor.name!, name: doctor.name ?? "",
url: doctor.doctorImageURL!, url: doctor.doctorImageURL!,
width: 48, width: 48,
height: 48, height: 48,

6
lib/pages/livecare/incoming_call.dart
Unescape Escape View File

@ -217,14 +217,16 @@ class _IncomingCallState extends State<IncomingCall> with SingleTickerProviderSt
player.stop(); player.stop();
changeCallStatusAPI(4); changeCallStatusAPI(4);
if (widget.incomingCallData!.background == "0") { // Zoom Call Page if (widget.incomingCallData!.background == "0") {
// Zoom Call Page
// Navigator.of(context).pop(); // Navigator.of(context).pop();
Navigator.pushReplacementNamed( Navigator.pushReplacementNamed(
context, context,
"zoom_call_page", "zoom_call_page",
arguments: CallArguments(widget.incomingCallData!.sessionId!, "123", "Patient", "40", "0", false), arguments: CallArguments(widget.incomingCallData!.sessionId!, "123", "Patient", "40", "0", false),
); );
} else { // OpenTok Call Page } else {
// OpenTok Call Page
await Navigator.of(context).pushReplacement( await Navigator.of(context).pushReplacement(
MaterialPageRoute( MaterialPageRoute(
// fullscreenDialog: true, // fullscreenDialog: true,

2
lib/pages/livecare/widgets/clinic_list.dart
Unescape Escape View File

@ -894,7 +894,7 @@ class _clinic_listState extends State<ClinicList> {
} else {} } else {}
}).catchError((err) { }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
AppToast.showErrorToast(message: err); AppToast.showErrorToast(message: err, localContext: context);
print(err); print(err);
}); });
projectViewModel.analytics.liveCare.livecare_schedule_video_call_clinic(clinic: selectedClinicName); projectViewModel.analytics.liveCare.livecare_schedule_video_call_clinic(clinic: selectedClinicName);

2
pubspec.yaml
Unescape Escape View File

@ -1,7 +1,7 @@
name: diplomaticquarterapp name: diplomaticquarterapp
description: A new Flutter application. description: A new Flutter application.
version: 4.5.055+4050055 version: 4.5.93+1
environment: environment:
sdk: ">=3.0.0 <3.13.0" sdk: ">=3.0.0 <3.13.0"

Write Preview
Loading…
Cancel
Save