From 97d7f9225e6420cfff32ef9caae48e90bb86c2f4 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 10 Aug 2021 17:15:08 +0300 Subject: [PATCH] package name changed --- android/app/build.gradle | 8 +++++--- android/app/google-services.json | 2 +- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 2 +- .../com/cloud/diplomaticquarterapp/MainActivity.kt | 4 ++-- .../diplomaticquarterapp/geofence/GeoZoneModel.kt | 2 +- .../diplomaticquarterapp/geofence/HMG_Geofence.kt | 8 ++++---- .../intent_receivers/GeofenceBroadcastReceiver.kt | 8 ++++---- .../GeofenceBroadcastReceiverWithJobService.kt | 4 ++-- .../intent_receivers/GeofenceErrorMessages.kt | 6 +++--- .../GeofenceTransitionsJobIntentService.kt | 8 ++++---- .../GeofencingRebootBroadcastReceiver.kt | 6 +++--- .../LocationProviderChangeReceiver.kt | 8 ++++---- .../intent_receivers/ReregisterGeofenceJobService.kt | 6 +++--- .../cloud/diplomaticquarterapp/hmgwifi/HMG_Guest.kt | 8 ++++---- .../diplomaticquarterapp/hmgwifi/HMG_Internet.kt | 8 ++++---- .../com/cloud/diplomaticquarterapp/hmgwifi/WPA.kt | 6 +++--- .../com/cloud/diplomaticquarterapp/utils/API.kt | 2 +- .../cloud/diplomaticquarterapp/utils/Constants.kt | 2 +- .../cloud/diplomaticquarterapp/utils/FlutterText.kt | 2 +- .../com/cloud/diplomaticquarterapp/utils/HMGUtils.kt | 10 +++++----- .../cloud/diplomaticquarterapp/utils/HMG_Wifi_.kt | 6 +++--- .../com/cloud/diplomaticquarterapp/utils/Logs.kt | 4 ++-- .../diplomaticquarterapp/utils/PlatformBridge.kt | 12 ++++++------ android/app/src/profile/AndroidManifest.xml | 2 +- lib/config/config.dart | 4 ++-- lib/services/authentication/auth_provider.dart | 7 +++++-- 27 files changed, 76 insertions(+), 71 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 336e8e53..5fd11eb3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,13 +34,15 @@ android { } lintOptions { - disable 'InvalidPackage' + disable 'MissingTranslation' + checkReleaseBuilds false + } + defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). -// applicationId "com.cloud.diplomaticquarterapp" - applicationId "com.ejada.hmg.uat" + applicationId "com.ejada.hmg" minSdkVersion 21 targetSdkVersion 30 versionCode flutterVersionCode.toInteger() diff --git a/android/app/google-services.json b/android/app/google-services.json index 6d1d75a9..dd4038cf 100755 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -10,7 +10,7 @@ "client_info": { "mobilesdk_app_id": "1:815750722565:android:62281cd3e5df4063", "android_client_info": { - "package_name": "com.ejada.hmg.uat" + "package_name": "com.ejada.hmg" } }, "oauth_client": [ diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index d8fd4e88..ab5e631b 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.ejada.hmg"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 63f94294..b90d91e3 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.ejada.hmg"> diff --git a/lib/config/config.dart b/lib/config/config.dart index f8bca863..1a309e96 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -13,8 +13,8 @@ const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_ORDERS = '/api/orders'; -//const BASE_URL = 'https://uat.hmgwebservices.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; +//const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs //const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; diff --git a/lib/services/authentication/auth_provider.dart b/lib/services/authentication/auth_provider.dart index 3ad128d4..926ee2bc 100644 --- a/lib/services/authentication/auth_provider.dart +++ b/lib/services/authentication/auth_provider.dart @@ -117,8 +117,10 @@ class AuthProvider with ChangeNotifier { var imei = await sharedPref.getString(PUSH_TOKEN); // if (!request.) { newRequest.iMEI = imei; //imei!=null ? imei : ''; - newRequest.firstName = request.firstName??"" + " " + request.lastName??""; - newRequest.firstNameN = request.firstNameN??"" + " " + request.lastNameN??""; + newRequest.firstName = + request.firstName ?? "" + " " + request.lastName ?? ""; + newRequest.firstNameN = + request.firstNameN ?? "" + " " + request.lastNameN ?? ""; newRequest.lastNameN = request.lastNameN ?? ""; newRequest.outSA = request.outSA == 1 ? true : false; newRequest.biometricEnabled = false; @@ -325,6 +327,7 @@ class AuthProvider with ChangeNotifier { request['DeviceTypeID'] = DeviceTypeID; request['LanguageID'] = LANGUAGE_ID; var requestN = RegisterUserRequest.fromJson(request); + requestN.patientOutSA = requestN.patientobject.patientOutSA; // request.tokenID = ''; dynamic localRes; try {