diff --git a/android/app/libs/PenNavUI.aar b/android/app/libs/PenNavUI.aar index d423bc11..cdec3645 100644 Binary files a/android/app/libs/PenNavUI.aar and b/android/app/libs/PenNavUI.aar differ diff --git a/android/app/libs/Penguin.aar b/android/app/libs/Penguin.aar index 5c789c6f..358d0fe9 100644 Binary files a/android/app/libs/Penguin.aar and b/android/app/libs/Penguin.aar differ diff --git a/android/app/libs/PenguinRenderer.aar b/android/app/libs/PenguinRenderer.aar index b657ac66..881d2d67 100644 Binary files a/android/app/libs/PenguinRenderer.aar and b/android/app/libs/PenguinRenderer.aar differ diff --git a/android/app/libs/libnav_mb.aar b/android/app/libs/libnav_mb.aar new file mode 100644 index 00000000..dea691d4 Binary files /dev/null and b/android/app/libs/libnav_mb.aar differ diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt index df41e342..fdfd2c9a 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt @@ -1,4 +1,6 @@ package com.ejada.hmg +import android.app.Dialog +import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.os.Build @@ -8,11 +10,14 @@ import androidx.annotation.NonNull; import androidx.annotation.RequiresApi import com.cloud.diplomaticquarterapp.PenguinInPlatformBridge import com.ejada.hmg.utils.* +import com.peng.pennavmap.PlugAndPlaySDK +import com.peng.pennavmap.interfaces.PIEventsDelegate +import com.peng.pennavmap.models.PIReportIssue import io.flutter.embedding.android.FlutterFragmentActivity import io.flutter.embedding.engine.FlutterEngine import io.flutter.plugins.GeneratedPluginRegistrant -class MainActivity: FlutterFragmentActivity() { +class MainActivity: FlutterFragmentActivity(), PIEventsDelegate { @RequiresApi(Build.VERSION_CODES.O) override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { GeneratedPluginRegistrant.registerWith(flutterEngine); @@ -22,6 +27,7 @@ class MainActivity: FlutterFragmentActivity() { PlatformBridge(flutterEngine, this).create() OpenTokPlatformBridge(flutterEngine, this).create() PenguinInPlatformBridge(flutterEngine, this).create() + PlugAndPlaySDK.setPiEventsDelegate(this); // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { // val mChannel = NotificationChannel("video_call_noti", "video call", NotificationManager.IMPORTANCE_HIGH) @@ -66,4 +72,29 @@ class MainActivity: FlutterFragmentActivity() { override fun onResume() { super.onResume() } + + override fun onReportIssue(issue: PIReportIssue?) { + + } + + override fun onSharedLocation(link: String?) { + + } + + override fun onBackButtonPressed(mContext: Context?) { + mContext?.let{ + println("onBackButtonPressed: dialog is being called ") + val builder = android.app.AlertDialog.Builder(it) + .setTitle(it.getString(R.string.confirmation)) + .setMessage(it.getString(R.string.confirmation_text)) + .setPositiveButton(it.getString(R.string.yes)) { _, _ -> + PlugAndPlaySDK.dismiss() + } + .setNegativeButton(it.getString(R.string.no), null) + builder.create() + builder.show() + } + + + } } \ No newline at end of file diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/penguin/PenguinView.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/penguin/PenguinView.kt index 9f74103f..d9082e76 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/penguin/PenguinView.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/penguin/PenguinView.kt @@ -1,6 +1,7 @@ package com.cloud.diplomaticquarterapp.penguin import android.app.Activity +import android.app.AlertDialog import android.content.Context import android.content.Context.RECEIVER_EXPORTED import android.content.IntentFilter diff --git a/android/app/src/main/res/values-ar-rSA/strings.xml b/android/app/src/main/res/values-ar-rSA/strings.xml new file mode 100644 index 00000000..f76a9f10 --- /dev/null +++ b/android/app/src/main/res/values-ar-rSA/strings.xml @@ -0,0 +1,7 @@ + + + تأكيد + هل أنت متأكد من أنك تريد الخروج؟ + نعم + لا + \ No newline at end of file diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml new file mode 100644 index 00000000..f76a9f10 --- /dev/null +++ b/android/app/src/main/res/values-ar/strings.xml @@ -0,0 +1,7 @@ + + + تأكيد + هل أنت متأكد من أنك تريد الخروج؟ + نعم + لا + \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 1093435a..72ff82c4 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -20,4 +20,9 @@ Geofence requests happened too frequently. sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg + \"Confirmation\" + Are you sure you want to exit? + Yes + No + diff --git a/lib/config/config.dart b/lib/config/config.dart index 1568c906..1c7cd0eb 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders'; 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 = '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 = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';