From ee12b51ad9b031652f5136cdb43fec15ded9eb7d Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Fri, 6 Jan 2023 16:28:23 +0530 Subject: [PATCH] unique id handling --- .../ui/activity/BajajFdMainActivity.kt | 107 +++++++++--------- .../ui/fragment/StepThreeBajajFDFragment.kt | 4 +- .../ui/fragment/StepTwoBajajFDFragment.kt | 3 +- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt index 4083daf..70a50f4 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt @@ -50,7 +50,7 @@ class BajajFdMainActivity : BaseActivity() { var nomineeDetails: NomineeDetails = NomineeDetails() var nomineeGuardianDetails: NomineeGuardianDetails = NomineeGuardianDetails() var getClientDetailsResponse: getClientDetailsResponse = getClientDetailsResponse() - + var UniqueId :String = "" private var stepCount: Int = 0 private lateinit var sectionsPagerAdapter: SectionsPagerAdapter private lateinit var fragments: Array @@ -128,59 +128,6 @@ class BajajFdMainActivity : BaseActivity() { } } - private fun paymentReQueryApi() { - if (Common.isNetworkAvailable(this)) { - val paymentReQueryRequest = PaymentReQueryRequest() - paymentReQueryRequest.UniqueId = "" - paymentReQueryRequest.NiveshClientCode = - getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - // client code =8872 /60476 - - viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) - viewModel.getPaymentReQueryMutableData.observe(this) { response -> - when (response) { - is Resource.Success -> { - Log.e("response", "-->$response") - val paymentReQueryResponse: PaymentReQueryResponse = - Gson().fromJson( - response.data?.toString(), - PaymentReQueryResponse::class.java - ) - paymentReQueryResponse.Response.StatusCode.let { code -> - when (code) { - 200 -> { - if (stepCount == 4) { - binding.viewPager.currentItem = 4 - } else { - binding.viewPager.currentItem = 3 - } - stepFiveBajajFDFragment.getData() - } - 650 -> refreshToken("") - else -> { - showDialogValidation( - this@BajajFdMainActivity, - paymentReQueryResponse.Response.Errors[0].ErrorMessage - ) - } - } - } - } - is Resource.Error -> { - response.message?.let { message -> - showDialogValidation(this@BajajFdMainActivity, message) - } - } - is Resource.Loading -> { - - } - is Resource.DataError -> { - - } - } - } - } - } private fun refreshToken(fdStepsCount: String) { @@ -481,4 +428,56 @@ class BajajFdMainActivity : BaseActivity() { super.onPageFinished(view, url) } } + + private fun paymentReQueryApi() { + if (Common.isNetworkAvailable(this)) { + val paymentReQueryRequest = PaymentReQueryRequest() + paymentReQueryRequest.UniqueId = UniqueId + paymentReQueryRequest.NiveshClientCode = getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) + viewModel.getPaymentReQueryMutableData.observe(this) { response -> + when (response) { + is Resource.Success -> { + Log.e("response", "-->$response") + val paymentReQueryResponse: PaymentReQueryResponse = + Gson().fromJson( + response.data?.toString(), + PaymentReQueryResponse::class.java + ) + paymentReQueryResponse.Response.StatusCode.let { code -> + when (code) { + 200 -> { + if (stepCount == 4) { + binding.viewPager.currentItem = 4 + } else { + binding.viewPager.currentItem = 3 + } + stepFiveBajajFDFragment.getData() + } + 650 -> refreshToken("") + else -> { + showDialogValidation( + this@BajajFdMainActivity, + paymentReQueryResponse.Response.Errors[0].ErrorMessage + ) + } + } + } + } + is Resource.Error -> { + response.message?.let { message -> + showDialogValidation(this@BajajFdMainActivity, message) + } + } + is Resource.Loading -> { + + } + is Resource.DataError -> { + + } + } + } + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index a936bba..74c782d 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -2,7 +2,6 @@ package com.nivesh.production.bajajfd.ui.fragment import android.Manifest import android.annotation.SuppressLint -import android.app.ActionBar.LayoutParams import android.app.Dialog import android.content.DialogInterface import android.content.pm.PackageManager @@ -213,7 +212,8 @@ class StepThreeBajajFDFragment : BaseFragment() { mActivity!! ) builder.setTitle("Add Photo!") - builder.setItems(check + builder.setItems( + check ) { dialog: DialogInterface, item: Int -> if (check[item] == "Take Photo") { val permission = ContextCompat.checkSelfPermission( diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt index 829ed81..bb96c60 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt @@ -710,7 +710,7 @@ class StepTwoBajajFDFragment : BaseFragment() { (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeGuardianDetails = (activity as BajajFdMainActivity).nomineeGuardianDetails - (activity as BajajFdMainActivity).createFDApplicantRequest.UniqueId = "" + (activity as BajajFdMainActivity).createFDApplicantRequest.UniqueId = (activity as BajajFdMainActivity).UniqueId (activity as BajajFdMainActivity).createFDRequest.CreateFDApplicationRequest = (activity as BajajFdMainActivity).createFDApplicantRequest @@ -742,6 +742,7 @@ class StepTwoBajajFDFragment : BaseFragment() { createFDApplicationResponse.Response.StatusCode.let { code -> when (code) { 200 -> { + (activity as BajajFdMainActivity).UniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId (activity as BajajFdMainActivity).stepTwoApi( createFDApplicationResponse )