Browse Source

added modified code

PankajBranch
Hemant Khadase 2 years ago
parent
commit
0059b5f9e4
5 changed files with 12 additions and 31 deletions
  1. +3
    -7
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  2. +5
    -9
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
  3. +1
    -1
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
  4. +2
    -11
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  5. +1
    -3
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

+ 3
- 7
app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt View File

@ -369,18 +369,14 @@ class BajajFdMainActivity : BaseActivity() {
} }
// step 2 response // step 2 response
fun stepTwoApi(data: CreateFDApplicationResponse) {
Log.e("stepTwoApi", " response ---> " + Gson().toJson(data))
fun stepTwoApi() {
binding.viewPager.currentItem = 2 binding.viewPager.currentItem = 2
stepThreeBajajFDFragment.displayReceivedData(data)
} }
// step 3 response // step 3 response
fun stepThreeApi(data: CreateFDApplicationResponse) {
Log.e("stepThreeApi", " response --->" + Gson().toJson(data))
// call create fd api
fun stepThreeApi() {
binding.viewPager.currentItem = 3 binding.viewPager.currentItem = 3
stepFourBajajFDFragment.displayReceivedData(data)
stepFourBajajFDFragment.displayReceivedData()
} }
// step 4 response // step 4 response


+ 5
- 9
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt View File

@ -31,7 +31,6 @@ class StepFourBajajFDFragment : BaseFragment() {
private val binding get() = _binding!! private val binding get() = _binding!!
private lateinit var listOfCustomer: MutableList<GetCodes> private lateinit var listOfCustomer: MutableList<GetCodes>
private var selectedList: String = "" private var selectedList: String = ""
private var uniqueId: String = ""
private var payUrl: String = "" private var payUrl: String = ""
private var value: String = "" private var value: String = ""
@ -78,7 +77,7 @@ class StepFourBajajFDFragment : BaseFragment() {
if (binding.checkBox.isChecked && selectedList.isNotEmpty()) { if (binding.checkBox.isChecked && selectedList.isNotEmpty()) {
val saveFDOtherDataRequest = SaveFDOtherDataRequest() val saveFDOtherDataRequest = SaveFDOtherDataRequest()
saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj)
saveFDOtherDataRequest.UniqueId = uniqueId
saveFDOtherDataRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId
saveFDOtherDataRequest.Values = selectedList saveFDOtherDataRequest.Values = selectedList
saveFDOtherDataRequest.NiveshClientCode = saveFDOtherDataRequest.NiveshClientCode =
(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
@ -142,14 +141,11 @@ class StepFourBajajFDFragment : BaseFragment() {
} }
} }
fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) {
uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId)
fun displayReceivedData() {
getFDDetailsApi()
customerListApi() customerListApi()
} }
private fun customerListApi() { private fun customerListApi() {
val getCodeRequest = GetCodeRequest() val getCodeRequest = GetCodeRequest()
@ -210,13 +206,13 @@ class StepFourBajajFDFragment : BaseFragment() {
} }
private fun getFDDetailsApi(uniqueId: String) {
private fun getFDDetailsApi() {
if (Common.isNetworkAvailable(mActivity!!)) { if (Common.isNetworkAvailable(mActivity!!)) {
val getFDDetailsRequest = GetFDDetailsRequest() val getFDDetailsRequest = GetFDDetailsRequest()
getFDDetailsRequest.FDProvider = mActivity!!.getString(R.string.bajaj) getFDDetailsRequest.FDProvider = mActivity!!.getString(R.string.bajaj)
getFDDetailsRequest.NiveshClientCode = getFDDetailsRequest.NiveshClientCode =
(mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE (mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
getFDDetailsRequest.UniqueId = uniqueId
getFDDetailsRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId
stepFourBajajFDViewModel.getFDDetails( stepFourBajajFDViewModel.getFDDetails(
getFDDetailsRequest, getFDDetailsRequest,
Constants.token, Constants.token,


+ 1
- 1
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt View File

@ -154,7 +154,7 @@ class StepOneBajajFDFragment : BaseFragment() {
} }
(activity as BajajFdMainActivity).fdInvestmentDetails.CustomerType = "" (activity as BajajFdMainActivity).fdInvestmentDetails.CustomerType = ""
(activity as BajajFdMainActivity).fdInvestmentDetails.CKYCNumber = "" (activity as BajajFdMainActivity).fdInvestmentDetails.CKYCNumber = ""
(activity as BajajFdMainActivity).fdInvestmentDetails.UniqueId = (activity as BajajFdMainActivity).UniqueId
(activity as BajajFdMainActivity).fdInvestmentDetails.UniqueId = (activity as BajajFdMainActivity).uniqueId
(activity as BajajFdMainActivity).createFDApplicantRequest.FDInvestmentDetails = (activity as BajajFdMainActivity).createFDApplicantRequest.FDInvestmentDetails =
(activity as BajajFdMainActivity).fdInvestmentDetails (activity as BajajFdMainActivity).fdInvestmentDetails


+ 2
- 11
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt View File

@ -2,7 +2,6 @@ package com.nivesh.production.bajajfd.ui.fragment
import android.Manifest import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Dialog
import android.content.DialogInterface import android.content.DialogInterface
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.database.Cursor import android.database.Cursor
@ -50,7 +49,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
private val binding get() = _binding!! private val binding get() = _binding!!
private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel
private lateinit var dialog: Dialog
private var takeImageResult: ActivityResultLauncher<Uri>? = null private var takeImageResult: ActivityResultLauncher<Uri>? = null
private var selectImageIntent: ActivityResultLauncher<String>? = null private var selectImageIntent: ActivityResultLauncher<String>? = null
@ -62,7 +60,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
private var photoFileExt: String? = "" private var photoFileExt: String? = ""
private var doc1FileExt: String? = "" private var doc1FileExt: String? = ""
private var doc2fileExt: String? = "" private var doc2fileExt: String? = ""
private var uniqueId: String? = ""
private var docValue: String = "" private var docValue: String = ""
private val mainPANUpload: Int = 1 private val mainPANUpload: Int = 1
private val mainPhotoUpload: Int = 2 private val mainPhotoUpload: Int = 2
@ -399,7 +396,7 @@ class StepThreeBajajFDFragment : BaseFragment() {
du.ImageEncodeToBase64 = imageBase64 du.ImageEncodeToBase64 = imageBase64
du.NiveshClientCode = du.NiveshClientCode =
(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
du.UniqueId = uniqueId
du.UniqueId = (activity as BajajFdMainActivity).uniqueId
stepThreeBajajFDViewModel.documentsUpload( stepThreeBajajFDViewModel.documentsUpload(
du, du,
Constants.token, Constants.token,
@ -468,9 +465,7 @@ class StepThreeBajajFDFragment : BaseFragment() {
createFDApplicationResponse.Response.StatusCode.let { code -> createFDApplicationResponse.Response.StatusCode.let { code ->
when (code) { when (code) {
200 -> { 200 -> {
(activity as BajajFdMainActivity).stepThreeApi(
createFDApplicationResponse
)
(activity as BajajFdMainActivity).stepThreeApi()
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
@ -614,10 +609,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
) )
} }
fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) {
uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
}
private fun uriToBitmap(selectedFileUri: Uri): Bitmap? { private fun uriToBitmap(selectedFileUri: Uri): Bitmap? {
try { try {
val parcelFileDescriptor = val parcelFileDescriptor =


+ 1
- 3
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt View File

@ -742,9 +742,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
when (code) { when (code) {
200 -> { 200 -> {
(activity as BajajFdMainActivity).uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId (activity as BajajFdMainActivity).uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
(activity as BajajFdMainActivity).stepTwoApi(
createFDApplicationResponse
)
(activity as BajajFdMainActivity).stepTwoApi()
} }
// 650 -> refreshToken() // 650 -> refreshToken()


Loading…
Cancel
Save

Powered by TurnKey Linux.