diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cda90aa..66a12ab 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,11 +42,13 @@
-
-
+
$payUrl")
+ Log.e("value", "-->$value")
+ dialogWebView = Dialog(this@PaymentActivity)
+ dialogWebView!!.setContentView(R.layout.row_fd_pay1)
+ dialogWebView!!.setCancelable(true)
+ val tvCancel = dialogWebView!!.findViewById(R.id.tvCancel)
+ tvCancel.setOnClickListener {
+ dialogWebView!!.dismiss()
+ (this@PaymentActivity).setResult(RESULT_OK)
+ (this@PaymentActivity).finish()
+ }
+ val lp = WindowManager.LayoutParams()
+ lp.copyFrom(dialogWebView!!.window?.attributes)
+ lp.width = WindowManager.LayoutParams.MATCH_PARENT
+ lp.height = WindowManager.LayoutParams.MATCH_PARENT
+ dialogWebView!!.window?.attributes = lp
+ val wVPay = dialogWebView!!.findViewById(R.id.wVPay)
+ wVPay.settings.javaScriptEnabled = true
+ wVPay.settings.domStorageEnabled = true
+ wVPay.loadData(
+ " \n" +
+ "",
+ "text/html",
+ "UTF-8"
+ )
+ wVPay.webViewClient = object : WebViewClient() {
+ override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
+ super.onPageStarted(view, url, favicon)
+ Log.e("onPageStarted", "-->$url")
+ if (url.isNotEmpty() && url.contains(Constants.paymentUrl)) {
+ if (dialogWebView!!.isShowing) {
+ dialogWebView!!.dismiss()
+ paymentReQueryApi()
+ }
+ }
+ }
+ }
+ dialogWebView!!.show()
+ }
+
+ fun paymentReQueryApi() {
+ if (Common.isNetworkAvailable(this)) {
+ val paymentReQueryRequest = PaymentReQueryRequest()
+ paymentReQueryRequest.UniqueId = uniqueId
+ paymentReQueryRequest.NiveshClientCode = clientCode
+ ProgressUtil.showLoading(this@PaymentActivity)
+ viewModel.getPaymentReQuery(
+ paymentReQueryRequest,
+ PreferenceManager(this@PaymentActivity).getToken(),
+ this
+ )
+ viewModel.getPaymentReQueryMutableData.observe(this) { response ->
+ when (response) {
+ is Resource.Success -> {
+ Log.e("paymentReQueryApi ", "response -->$response")
+ val paymentReQueryResponse: PaymentReQueryResponse =
+ Gson().fromJson(
+ response.data?.toString(),
+ PaymentReQueryResponse::class.java
+ )
+ paymentReQueryResponse.Response.StatusCode.let { code ->
+ when (code) {
+ 650 -> ""
+ else -> {
+ getData(paymentReQueryResponse)
+ }
+ }
+ }
+ }
+ is Resource.Error -> {
+ response.message?.let { message ->
+ Common.showDialogValidation(this@PaymentActivity, message)
+ }
+ }
+ is Resource.Loading -> {
+ ProgressUtil.hideLoading()
+ }
+ is Resource.DataError -> {
+
+ }
+ else -> {
+ Common.showDialogValidation(this@PaymentActivity, response.message)
+ }
+ }
+ }
+ }
+ }
+
+
+ fun getData(paymentReQueryResponse: PaymentReQueryResponse) {
+ if (paymentReQueryResponse.Response.StatusCode == 200) {
+ if (paymentReQueryResponse.Response.Message.isNotEmpty()) {
+ val arrOfStr: List =
+ paymentReQueryResponse.Response.Message.split(" ", limit = 2)
+ binding.tvCongrats.text = arrOfStr[0]
+ binding.tvCongrats.setTextColor(
+ ContextCompat.getColor(
+ this@PaymentActivity,
+ R.color.green
+ )
+ )
+ binding.tvSuccessMessage.text = arrOfStr[1]
+ }
+ } else {
+ if (paymentReQueryResponse.Response.Message.isNotEmpty()) {
+ if (paymentReQueryResponse.Response.Message.isNotEmpty()) {
+ binding.tvCongrats.text = paymentReQueryResponse.Response.Status
+ binding.tvCongrats.setTextColor(
+ ContextCompat.getColor(
+ this@PaymentActivity,
+ R.color.red
+ )
+ )
+ binding.tvSuccessMessage.text = paymentReQueryResponse.Response.Message
+ }
+ }
+ binding.tvRetry.visibility = View.VISIBLE
+ binding.btnViewOrder.visibility = View.GONE
+ }
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/util/Constants.kt b/app/src/main/java/com/nivesh/production/niveshfd/util/Constants.kt
index 8866613..d9df416 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/util/Constants.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/util/Constants.kt
@@ -5,5 +5,6 @@ class Constants() {
companion object {
const val BASE_URL = "https://providential.in/WebApi_Bajaj/api/"
// const val token = "636F8F63-06C4-4D95-8562-392B34025FB0"
+ const val paymentUrl = "https://uat.nivesh.com/bajajFD/OrderStatus"
}
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_corner_with_line.xml b/app/src/main/res/drawable/rounded_corner_with_line1.xml
similarity index 100%
rename from app/src/main/res/drawable/rounded_corner_with_line.xml
rename to app/src/main/res/drawable/rounded_corner_with_line1.xml
diff --git a/app/src/main/res/layout/fragment_niveshfd_step_one.xml b/app/src/main/res/layout/fragment_niveshfd_step_one.xml
index 07922cd..024ceed 100644
--- a/app/src/main/res/layout/fragment_niveshfd_step_one.xml
+++ b/app/src/main/res/layout/fragment_niveshfd_step_one.xml
@@ -103,7 +103,7 @@
android:id="@+id/spInterestPayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectInterestPayout"
android:inputType="none"
android:padding="@dimen/margin_10"
@@ -127,7 +127,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/margin_10"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectInterestTenure"
android:inputType="none"
android:labelFor="@+id/spInterestTenure"
diff --git a/app/src/main/res/layout/fragment_niveshfd_step_three.xml b/app/src/main/res/layout/fragment_niveshfd_step_three.xml
index faa6090..f7e55bb 100644
--- a/app/src/main/res/layout/fragment_niveshfd_step_three.xml
+++ b/app/src/main/res/layout/fragment_niveshfd_step_three.xml
@@ -190,7 +190,7 @@
android:id="@+id/spDocType"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/addressProofType"
android:inputType="none"
android:padding="@dimen/margin_5"
diff --git a/app/src/main/res/layout/fragment_niveshfd_step_two.xml b/app/src/main/res/layout/fragment_niveshfd_step_two.xml
index 71cf944..68fb750 100644
--- a/app/src/main/res/layout/fragment_niveshfd_step_two.xml
+++ b/app/src/main/res/layout/fragment_niveshfd_step_two.xml
@@ -196,7 +196,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/margin_5"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectTitle"
android:inputType="none"
android:labelFor="@+id/spInterestPayout"
@@ -222,7 +222,7 @@
android:id="@+id/spGender"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectGender"
android:inputType="none"
android:padding="@dimen/margin_5"
@@ -310,7 +310,7 @@
android:id="@+id/spOccupation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/enterOccupation"
android:padding="@dimen/margin_5"
android:inputType="none"
@@ -335,7 +335,7 @@
android:id="@+id/spIncome"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectIncome"
android:padding="@dimen/margin_5"
android:inputType="none"
@@ -383,7 +383,7 @@
android:id="@+id/spMarital"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectMaritalStatus"
android:inputType="none"
android:padding="@dimen/margin_5"
@@ -488,7 +488,7 @@
android:id="@+id/spState"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectState"
android:padding="@dimen/margin_5"
android:inputType="none"
@@ -513,7 +513,7 @@
android:id="@+id/spCity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectCity"
android:padding="@dimen/margin_5"
android:inputType="none"
@@ -586,7 +586,7 @@
android:id="@+id/spNomineeTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectTitle"
android:padding="@dimen/margin_5"
android:inputType="none"
@@ -695,7 +695,7 @@
android:id="@+id/spNomineeRelation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectRelation"
android:padding="@dimen/margin_5"
android:inputType="none"
@@ -766,7 +766,7 @@
android:id="@+id/spGuardianRelation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/rounded_corner_with_line"
+ android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/selectRelation"
android:padding="@dimen/margin_5"
android:inputType="none"
diff --git a/app/src/main/res/layout/row_bank_list.xml b/app/src/main/res/layout/row_bank_list.xml
index cbcbe21..e109dab 100644
--- a/app/src/main/res/layout/row_bank_list.xml
+++ b/app/src/main/res/layout/row_bank_list.xml
@@ -6,7 +6,7 @@
android:orientation="vertical">