From 643f4f0ac6d6e4cd2d6227c566661f2f35e05d4a Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Thu, 5 Jan 2023 14:09:02 +0530 Subject: [PATCH] added bankvalidation model class --- .../bajajfd/interfaces/ApiInterface.kt | 8 ++++++- .../bajajfd/model/BankValidationApiRequest.kt | 10 +++++++++ .../model/BankValidationApiResponse.kt | 8 +++++++ .../bajajfd/model/ResponseXXXXXXXXXXXXXX.kt | 7 ++++++ .../bajajfd/repositories/MainRepository.kt | 3 +++ .../ui/fragment/StepTwoBajajFDFragment.kt | 22 +++---------------- .../res/layout/fragment_bajajfd_step_two.xml | 17 +++----------- 7 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiRequest.kt create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiResponse.kt create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXX.kt diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt index 6c5c891..23566a7 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt @@ -93,7 +93,7 @@ interface ApiInterface { @Header("token") token: String ): Response - @POST("WebApi/api/GetClientDetailV2_S") + @POST("WebApi_Bajaj/api/GetClientDetailV2_S") suspend fun getClientDetails( @Body getClientDetailsRequest: getClientDetailsRequest, @Header("token") token: String @@ -160,4 +160,10 @@ interface ApiInterface { @Header("token") token: String ): Response + @POST("WebApi_Bajaj/api/BankValidationAPI_S") + suspend fun bankValidationApi( + @Body bankValidationApiRequest: BankValidationApiRequest, + @Header("token") token: String + ): Response + } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiRequest.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiRequest.kt new file mode 100644 index 0000000..10fca16 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiRequest.kt @@ -0,0 +1,10 @@ +package com.nivesh.production.bajajfd.model + +data class BankValidationApiRequest( + var BankAccountNo: String?="", + val BankNo: Int?= 0, + val IFSC: String?= "", + val Name: String? = "", + val PhoneNo: String? = "", + val RoleId: Int? = 0 +) \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiResponse.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiResponse.kt new file mode 100644 index 0000000..ef516a9 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/BankValidationApiResponse.kt @@ -0,0 +1,8 @@ +package com.nivesh.production.bajajfd.model + +data class BankValidationApiResponse( + val DataObject: Any, + val Message: String, + val ObjectResponse: Any, + val response: ResponseXXXXXXXXXXXXXX +) \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXX.kt new file mode 100644 index 0000000..e470814 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXX.kt @@ -0,0 +1,7 @@ +package com.nivesh.production.bajajfd.model + +data class ResponseXXXXXXXXXXXXXX( + val message: String, + val status: String, + val status_code: Int +) \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt index 18113e3..c054d7b 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt @@ -89,4 +89,7 @@ class MainRepository constructor(private val apiInterface: ApiInterface) { suspend fun checkFDKYCRequest(checkFDKYCRequest: CheckFDKYCRequest, token: String) = apiInterface.checkFDKYC(checkFDKYCRequest, token) + suspend fun bankValidationApiRequest(bankValidationApiRequest: BankValidationApiRequest, token: String) = + apiInterface.bankValidationApi(bankValidationApiRequest, token) + } \ No newline at end of file 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 d2ea3ed..699f0ac 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 @@ -792,12 +792,9 @@ class StepTwoBajajFDFragment : BaseFragment() { binding.edtIFSC.setOnItemClickListener { _, _, position, _ -> if (listOfIFSC.size > 0) { - val enteredText = binding.edtIFSC.getText() - Log.d("bankifsc $enteredText",enteredText.toString()) - // binding.edtIFSC.setText(listOfIFSC[position]) binding.edtIFSC.setText(adapter.getItem(position).toString()) binding.edtIFSC.setSelection(binding.edtIFSC.text.toString().length) - getIFSCDetailsApi(enteredText.toString()) + getIFSCDetailsApi(binding.edtIFSC.toString()) } } @@ -1048,7 +1045,8 @@ class StepTwoBajajFDFragment : BaseFragment() { val titleText = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Client_Title val newTitleText = "$titleText." - if (titleText?.isEmpty()!!) { + + if (titleText.isNullOrEmpty()) { binding.spTitle.setText( adapter.getItem(0)?.Value, false @@ -1059,22 +1057,8 @@ class StepTwoBajajFDFragment : BaseFragment() { binding.spTitle.setText(title.Value, false) break } -// binding.spTitle.setOnTouchListener { v, event -> -// when (event?.action) { -// MotionEvent.ACTION_DOWN -> { -// binding.spTitle.setText( -// adapter.getItem(0)?.Value, -// false -// ) -// -// } -// } -// -// v?.onTouchEvent(event) ?: true -// } } } - binding.spNomineeTitle.setAdapter(adapter) binding.spNomineeTitle.setText( adapter.getItem(0)?.Value, diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml index 20c5ec9..62005a5 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml @@ -824,6 +824,7 @@ @@ -1002,6 +1003,7 @@ - -