Browse Source

Merge branch 'HemantBranch' of https://git.nivesh.com:443/hemant.khadase/BajajFDLib into ManojBranch

# Conflicts:
#	app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
PankajBranch
Manoj 2 years ago
parent
commit
6bb3c38c43
4 changed files with 118 additions and 171 deletions
  1. +10
    -30
      app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt
  2. +26
    -27
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  3. +52
    -96
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  4. +30
    -18
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

+ 10
- 30
app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt View File

@ -7,13 +7,12 @@ import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.R
import com.nivesh.production.bajajfd.model.BankList
import com.nivesh.production.bajajfd.model.ClientBanklist import com.nivesh.production.bajajfd.model.ClientBanklist
class BankListAdapter( class BankListAdapter(
private val bankList: List<ClientBanklist>?, private val bankList: List<ClientBanklist>?,
private val selectedAccount: String? = null, private val selectedAccount: String? = null,
private val width:Double?
private val width: Double?
) : RecyclerView.Adapter<BankListAdapter.BankListViewHolder>() { ) : RecyclerView.Adapter<BankListAdapter.BankListViewHolder>() {
inner class BankListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { inner class BankListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val bankSelector: ImageView = itemView.findViewById(R.id.bankSelector) val bankSelector: ImageView = itemView.findViewById(R.id.bankSelector)
@ -21,54 +20,36 @@ class BankListAdapter(
val tvBankAccountNumber: TextView = itemView.findViewById(R.id.tvBankAccountNumber) val tvBankAccountNumber: TextView = itemView.findViewById(R.id.tvBankAccountNumber)
val tvBankIFSC: TextView = itemView.findViewById(R.id.tvBankIFSC) val tvBankIFSC: TextView = itemView.findViewById(R.id.tvBankIFSC)
} }
private var checkedPosition: Int = -2
private var checkedPosition: Int = -2
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, parent: ViewGroup,
viewType: Int viewType: Int
): BankListViewHolder { ): BankListViewHolder {
// return BankListViewHolder(
// LayoutInflater.from(parent.context).inflate(
// R.layout.item_bank_list_preview,
// parent,
// false
// )
// )
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_bank_list_preview, parent, false);
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_bank_list_preview, parent, false)
view.layoutParams = width?.div(1.35) view.layoutParams = width?.div(1.35)
?.let { ViewGroup.LayoutParams(it.toInt(),ViewGroup.LayoutParams.WRAP_CONTENT) }
?.let { ViewGroup.LayoutParams(it.toInt(), ViewGroup.LayoutParams.WRAP_CONTENT) }
return BankListViewHolder(view) return BankListViewHolder(view)
} }
override fun onBindViewHolder(holder: BankListViewHolder, position: Int) { override fun onBindViewHolder(holder: BankListViewHolder, position: Int) {
val bankList = bankList?.get(position) val bankList = bankList?.get(position)
if (bankList !=null) {
if (bankList != null) {
holder.itemView.apply { holder.itemView.apply {
holder.tvBankName.text = bankList.BankName holder.tvBankName.text = bankList.BankName
holder.tvBankIFSC.text = bankList.IFSCCode holder.tvBankIFSC.text = bankList.IFSCCode
holder.tvBankAccountNumber.text = bankList.AccountNumber holder.tvBankAccountNumber.text = bankList.AccountNumber
if (selectedAccount == bankList.AccountNumber && (checkedPosition == -2))
{
if (selectedAccount == bankList.AccountNumber && (checkedPosition == -2)) {
holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green) holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green)
checkedPosition = holder.adapterPosition checkedPosition = holder.adapterPosition
}
else if (checkedPosition == -1) {
} else if (checkedPosition == -1) {
holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline) holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline)
}
else if (checkedPosition == holder.adapterPosition) {
} else if (checkedPosition == holder.adapterPosition) {
holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green) holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green)
}
else {
} else {
holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline) holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline)
} }
@ -93,7 +74,6 @@ class BankListAdapter(
onItemClickListener = listener onItemClickListener = listener
} }
fun getSelected(): ClientBanklist? { fun getSelected(): ClientBanklist? {
return if (checkedPosition != -1) { return if (checkedPosition != -1) {
bankList?.get(checkedPosition) bankList?.get(checkedPosition)


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

@ -226,7 +226,7 @@ class BajajFdMainActivity : BaseActivity() {
// set viewPager // set viewPager
sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, fragments, stepsCount) sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, fragments, stepsCount)
val viewPager: DisableAdapter = binding.viewPager val viewPager: DisableAdapter = binding.viewPager
// viewPager.setPagingEnabled(false)
viewPager.setPagingEnabled(false)
viewPager.adapter = sectionsPagerAdapter viewPager.adapter = sectionsPagerAdapter
viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
override fun onPageScrolled( override fun onPageScrolled(
@ -392,35 +392,34 @@ class BajajFdMainActivity : BaseActivity() {
fun paymentDialog(payUrl: String, value: String) { fun paymentDialog(payUrl: String, value: String) {
Log.e("payUrl", "-->$payUrl") Log.e("payUrl", "-->$payUrl")
Log.e("value", "-->$value") Log.e("value", "-->$value")
val dialogWebView = Dialog(this@BajajFdMainActivity)
dialogWebView.setContentView(R.layout.row_fd_pay)
dialogWebView.setCancelable(true)
val tvCancel = dialogWebView.findViewById<TextView>(R.id.tvCancel)
tvCancel.setOnClickListener {
dialogWebView.dismiss()
}
// val dialogWebView = Dialog(this@BajajFdMainActivity)
// dialogWebView.setContentView(R.layout.row_fd_pay)
// dialogWebView.setCancelable(true)
//
// val tvCancel = dialogWebView.findViewById<TextView>(R.id.tvCancel)
// tvCancel.setOnClickListener {
// dialogWebView.dismiss()
// }
//
// 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<WebView>(R.id.wVPay)
// wVPay.webViewClient = MyWebViewClient()
// wVPay.settings.javaScriptEnabled = true
// wVPay.settings.domStorageEnabled = true
// val postData = "name=${URLEncoder.encode("msg", "UTF-8")}" +
// "&value=${URLEncoder.encode(value, "UTF-8")}"
// wVPay.postUrl(payUrl, postData.toByteArray())
// dialogWebView.show()
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<WebView>(R.id.wVPay)
wVPay.webViewClient = MyWebViewClient()
wVPay.settings.javaScriptEnabled = true
wVPay.settings.domStorageEnabled = true
// wVPay.loadUrl(payUrl)
val webView = WebView(this@BajajFdMainActivity)
setContentView(webView)
val postData = "name=${URLEncoder.encode("msg", "UTF-8")}" + val postData = "name=${URLEncoder.encode("msg", "UTF-8")}" +
"&value=${URLEncoder.encode(value, "UTF-8")}" "&value=${URLEncoder.encode(value, "UTF-8")}"
wVPay.postUrl(payUrl, postData.toByteArray())
dialogWebView.show()
// val webView = WebView(this@BajajFdMainActivity)
// val postData = "type=${URLEncoder.encode("hidden", "UTF-8")}" +
// "name=${URLEncoder.encode("msg", "UTF-8")}" +
// "&value=${URLEncoder.encode(value, "UTF-8")}"
// webView.postUrl(payUrl, postData.toByteArray())
webView.postUrl(payUrl, postData.toByteArray())
} }
class MyWebViewClient : WebViewClient() { class MyWebViewClient : WebViewClient() {


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

@ -39,7 +39,6 @@ import com.nivesh.production.bajajfd.util.ImageUtil
import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.StepThreeBajajFDViewModel import com.nivesh.production.bajajfd.viewModel.StepThreeBajajFDViewModel
import java.io.* import java.io.*
import kotlin.system.exitProcess
class StepThreeBajajFDFragment : BaseFragment() { class StepThreeBajajFDFragment : BaseFragment() {
@ -48,9 +47,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
private var latestTmpUri: Uri? = null private var latestTmpUri: Uri? = null
private var _binding: FragmentBajajfdStepThreeBinding? = null private var _binding: FragmentBajajfdStepThreeBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!
private lateinit var listOfDocType: List<GetCodes>
private var docValue: String = ""
private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel
private lateinit var dialog: Dialog private lateinit var dialog: Dialog
@ -66,13 +62,15 @@ class StepThreeBajajFDFragment : BaseFragment() {
private var doc1FileExt: String? = "" private var doc1FileExt: String? = ""
private var doc2fileExt: String? = "" private var doc2fileExt: String? = ""
private var uniqueId: String? = "" private var uniqueId: String? = ""
private val MAIN_PAN_UPLOAD: Int = 1
private val MAIN_PHOTO_UPLOAD: Int = 2
private val FIRST_UPLOAD: Int = 3
private val SECOND_UPLOAD: Int = 4
private var docValue: String = ""
private val mainPANUpload: Int = 1
private val mainPhotoUpload: Int = 2
private val firstDocUpload: Int = 3
private val secondDocUpload: Int = 4
private var actionType: Int = -1 private var actionType: Int = -1
private val mapImage: HashMap<String, String> = HashMap() private val mapImage: HashMap<String, String> = HashMap()
private lateinit var listOfDocType: List<GetCodes>
private val requestPermission = registerForActivityResult( private val requestPermission = registerForActivityResult(
ActivityResultContracts.RequestPermission() ActivityResultContracts.RequestPermission()
@ -104,7 +102,7 @@ class StepThreeBajajFDFragment : BaseFragment() {
{ uri: Uri? -> { uri: Uri? ->
if (uri != null) { if (uri != null) {
bitmap = uriToBitmap(uri) bitmap = uriToBitmap(uri)
uploadDocument(uri,"g")
uploadDocument(uri, "g")
} }
} }
@ -112,47 +110,34 @@ class StepThreeBajajFDFragment : BaseFragment() {
registerForActivityResult(ActivityResultContracts.TakePicture()) { isSuccess -> registerForActivityResult(ActivityResultContracts.TakePicture()) { isSuccess ->
if (isSuccess) { if (isSuccess) {
latestTmpUri?.let { uri -> latestTmpUri?.let { uri ->
uploadDocument(uri,"c")
uploadDocument(uri, "c")
} }
} }
} }
binding.btnNext.setOnClickListener { binding.btnNext.setOnClickListener {
if (validate()) { if (validate()) {
// private var panString: String = ""
// private var photoString: String = ""
// private var docString: String = ""
// private var docString2: String = ""
if(panString.isNotEmpty()){
if (panString.isNotEmpty()) {
mapImage["PAN"] = "data:image/".plus(panFileExt) mapImage["PAN"] = "data:image/".plus(panFileExt)
.plus(";base64, ").plus(panString) .plus(";base64, ").plus(panString)
} }
if(photoString.isNotEmpty()){
if (photoString.isNotEmpty()) {
mapImage["Photograph"] = "data:image/".plus(photoFileExt) mapImage["Photograph"] = "data:image/".plus(photoFileExt)
.plus(";base64, ").plus(photoString) .plus(";base64, ").plus(photoString)
} }
if(docString.isNotEmpty()){
if (docString.isNotEmpty()) {
mapImage["docValue"] = "data:image/".plus(doc1FileExt) mapImage["docValue"] = "data:image/".plus(doc1FileExt)
.plus(";base64, ").plus(docString) .plus(";base64, ").plus(docString)
} }
if(docString2.isNotEmpty()){
if (docString2.isNotEmpty()) {
mapImage["Aadhar"] = "data:image/".plus(doc2fileExt) mapImage["Aadhar"] = "data:image/".plus(doc2fileExt)
.plus(";base64, ").plus(docString2) .plus(";base64, ").plus(docString2)
} }
var uploadPosition = 0 var uploadPosition = 0
for (entry in mapImage.iterator()) { for (entry in mapImage.iterator()) {
uploadPosition++ uploadPosition++
uploadDocApi(entry.key, entry.value, uploadPosition) uploadDocApi(entry.key, entry.value, uploadPosition)
} }
// uploadDocApi(
// "PAN",
// "data:image/".plus(panFileExt).plus(";base64, ").plus(panString),
// 1
// )
} }
} }
binding.btnBack.setOnClickListener { binding.btnBack.setOnClickListener {
@ -160,28 +145,28 @@ class StepThreeBajajFDFragment : BaseFragment() {
} }
binding.btnPANUpload.setOnClickListener { binding.btnPANUpload.setOnClickListener {
actionType = MAIN_PAN_UPLOAD
actionType = mainPANUpload
selectImage() selectImage()
} }
binding.btnPhotoUpload.setOnClickListener { binding.btnPhotoUpload.setOnClickListener {
actionType = MAIN_PHOTO_UPLOAD
actionType = mainPhotoUpload
selectImage() selectImage()
} }
binding.btnAadhaarFrontUpload.setOnClickListener { binding.btnAadhaarFrontUpload.setOnClickListener {
actionType = FIRST_UPLOAD
actionType = firstDocUpload
selectImage() selectImage()
} }
binding.btnAadhaarBackUpload.setOnClickListener { binding.btnAadhaarBackUpload.setOnClickListener {
actionType = SECOND_UPLOAD
actionType = secondDocUpload
selectImage() selectImage()
} }
binding.spDocType.onItemClickListener = binding.spDocType.onItemClickListener =
AdapterView.OnItemClickListener { parent, _, position, _ -> AdapterView.OnItemClickListener { parent, _, position, _ ->
val getCodes : GetCodes = parent.getItemAtPosition(position) as GetCodes
val getCodes: GetCodes = parent.getItemAtPosition(position) as GetCodes
docValue = getCodes.Value docValue = getCodes.Value
docString = "" docString = ""
docString2 = "" docString2 = ""
@ -283,47 +268,47 @@ class StepThreeBajajFDFragment : BaseFragment() {
binding.btnAadhaarFrontUpload.visibility = View.VISIBLE binding.btnAadhaarFrontUpload.visibility = View.VISIBLE
} }
private fun uploadDocument(uri: Uri,type: String) {
private fun uploadDocument(uri: Uri, type: String) {
when (actionType) { when (actionType) {
MAIN_PAN_UPLOAD -> {
mainPANUpload -> {
binding.ivPan.visibility = View.VISIBLE binding.ivPan.visibility = View.VISIBLE
val fileDir: File = requireActivity().cacheDir val fileDir: File = requireActivity().cacheDir
val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri))) val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
panFileExt = getFileExtension(getFileName(uri)) panFileExt = getFileExtension(getFileName(uri))
val size : Double = Common.getFileSizeInMB(fileExtension.length())
if (size < 5){
if(type == "c") encodedPANBase64(fileExtension)
val size: Double = Common.getFileSizeInMB(fileExtension.length())
if (size < 5) {
if (type == "c") encodedPANBase64(fileExtension)
else panString = bitmap?.let { ImageUtil.convert(it) }.toString() else panString = bitmap?.let { ImageUtil.convert(it) }.toString()
} else{
} else {
panString = "" panString = ""
panFileExt = "" panFileExt = ""
} }
} }
MAIN_PHOTO_UPLOAD -> {
mainPhotoUpload -> {
binding.ivPhotograph.visibility = View.VISIBLE binding.ivPhotograph.visibility = View.VISIBLE
binding.ivPan.visibility = View.VISIBLE binding.ivPan.visibility = View.VISIBLE
val fileDir: File = requireActivity().cacheDir val fileDir: File = requireActivity().cacheDir
val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri))) val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
photoFileExt = getFileExtension(getFileName(uri)) photoFileExt = getFileExtension(getFileName(uri))
val size : Double = Common.getFileSizeInMB(fileExtension.length())
val size: Double = Common.getFileSizeInMB(fileExtension.length())
if (size < 5) { if (size < 5) {
if (type == "c") encodedPhotoBase64(fileExtension) if (type == "c") encodedPhotoBase64(fileExtension)
else photoString = bitmap?.let { ImageUtil.convert(it) }.toString() else photoString = bitmap?.let { ImageUtil.convert(it) }.toString()
}else{
} else {
photoString = "" photoString = ""
photoFileExt = "" photoFileExt = ""
} }
} }
FIRST_UPLOAD -> {
firstDocUpload -> {
binding.ivAadharFront.visibility = View.VISIBLE binding.ivAadharFront.visibility = View.VISIBLE
val fileDir: File = requireActivity().cacheDir val fileDir: File = requireActivity().cacheDir
val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri))) val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
doc1FileExt = getFileExtension(getFileName(uri)) doc1FileExt = getFileExtension(getFileName(uri))
val size : Double = Common.getFileSizeInMB(fileExtension.length())
val size: Double = Common.getFileSizeInMB(fileExtension.length())
if (size < 5) { if (size < 5) {
if (type == "c") encodedUpload1Base64(fileExtension) if (type == "c") encodedUpload1Base64(fileExtension)
else docString = bitmap?.let { ImageUtil.convert(it) }.toString() else docString = bitmap?.let { ImageUtil.convert(it) }.toString()
}else{
} else {
docString = "" docString = ""
doc1FileExt = "" doc1FileExt = ""
} }
@ -333,11 +318,11 @@ class StepThreeBajajFDFragment : BaseFragment() {
val fileDir: File = requireActivity().cacheDir val fileDir: File = requireActivity().cacheDir
val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri))) val fileExtension = File(fileDir.toString().plus("/").plus(getFileName(uri)))
doc2fileExt = getFileExtension(getFileName(uri)) doc2fileExt = getFileExtension(getFileName(uri))
val size : Double = Common.getFileSizeInMB(fileExtension.length())
val size: Double = Common.getFileSizeInMB(fileExtension.length())
if (size < 5) { if (size < 5) {
if (type == "c") encodedFileToBase64(fileExtension) if (type == "c") encodedFileToBase64(fileExtension)
else docString2 = bitmap?.let { ImageUtil.convert(it) }.toString() else docString2 = bitmap?.let { ImageUtil.convert(it) }.toString()
}else{
} else {
docString2 = "" docString2 = ""
doc2fileExt = "" doc2fileExt = ""
} }
@ -345,12 +330,11 @@ class StepThreeBajajFDFragment : BaseFragment() {
} }
} }
private fun encodedPANBase64(fileName: File) { private fun encodedPANBase64(fileName: File) {
panString = try { panString = try {
val bytes: ByteArray = loadFile(fileName) val bytes: ByteArray = loadFile(fileName)
Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "").replace("\\s+", "")
Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "")
.replace("\\s+", "")
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
"" ""
@ -360,7 +344,8 @@ class StepThreeBajajFDFragment : BaseFragment() {
private fun encodedPhotoBase64(fileName: File) { private fun encodedPhotoBase64(fileName: File) {
photoString = try { photoString = try {
val bytes: ByteArray = loadFile(fileName) val bytes: ByteArray = loadFile(fileName)
Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "").replace("\\s+", "")
Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "")
.replace("\\s+", "")
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
"" ""
@ -370,7 +355,8 @@ class StepThreeBajajFDFragment : BaseFragment() {
private fun encodedUpload1Base64(fileName: File) { private fun encodedUpload1Base64(fileName: File) {
docString = try { docString = try {
val bytes: ByteArray = loadFile(fileName) val bytes: ByteArray = loadFile(fileName)
Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "").replace("\\s+", "")
Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "")
.replace("\\s+", "")
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
"" ""
@ -380,7 +366,8 @@ class StepThreeBajajFDFragment : BaseFragment() {
private fun encodedFileToBase64(fileName: File) { private fun encodedFileToBase64(fileName: File) {
docString2 = try { docString2 = try {
val bytes: ByteArray = loadFile(fileName) val bytes: ByteArray = loadFile(fileName)
Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "").replace("\\s+", "")
Base64.encodeToString(bytes, Base64.DEFAULT).trim().replace("\n", "")
.replace("\\s+", "")
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
"" ""
@ -430,43 +417,15 @@ class StepThreeBajajFDFragment : BaseFragment() {
when (code) { when (code) {
200 -> { 200 -> {
Log.e("check_upload_res", response.message.toString()) Log.e("check_upload_res", response.message.toString())
if(uploadPosition == mapImage.size){
// Common.showDialogValidation(
// activity as BajajFdMainActivity,
// "Documents Uploaded Successfully")
Toast.makeText(requireActivity(),"Documents Uploaded Successfully",Toast.LENGTH_SHORT).show()
if (uploadPosition == mapImage.size) {
Toast.makeText(
requireActivity(),
"Documents Uploaded Successfully",
Toast.LENGTH_SHORT
).show()
createFDApi((activity as BajajFdMainActivity).createFDRequest) createFDApi((activity as BajajFdMainActivity).createFDRequest)
} }
// if (uploadPosition == 1) {
// uploadDocApi(
// "Photograph",
// "data:image/".plus(photoFileExt).plus(";base64, ")
// .plus(photoString),
// 2
// )
// } else if (uploadPosition == 2) {
// uploadDocApi(
// docValue,
// "data:image/".plus(doc1FileExt).plus(";base64, ")
// .plus(docString),
// 3
// )
// } else if (uploadPosition == 3) {
// if (docValue == "Aadhar") {
// uploadDocApi(
// docValue,
// "data:image/".plus(doc2fileExt).plus(";base64, ")
// .plus(docString2),
// 4
// )
// } else {
// createFDApi((activity as BajajFdMainActivity).createFDRequest)
// }
// } else if (uploadPosition == 4) {
// createFDApi((activity as BajajFdMainActivity).createFDRequest)
// }
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
Common.showDialogValidation( Common.showDialogValidation(
@ -541,9 +500,7 @@ class StepThreeBajajFDFragment : BaseFragment() {
} }
} }
private fun docTypeApi() { private fun docTypeApi() {
val getCodeRequest = GetCodeRequest() val getCodeRequest = GetCodeRequest()
getCodeRequest.ProductName = getString(R.string.bajajFD) getCodeRequest.ProductName = getString(R.string.bajajFD)
getCodeRequest.Category = getString(R.string.docType) getCodeRequest.Category = getString(R.string.docType)
@ -607,7 +564,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
} }
} }
private fun validate(): Boolean { private fun validate(): Boolean {
if (panString.isEmpty()) { if (panString.isEmpty()) {
Common.showDialogValidation( Common.showDialogValidation(
@ -660,19 +616,14 @@ class StepThreeBajajFDFragment : BaseFragment() {
) )
} }
override fun onDestroyView() {
super.onDestroyView()
_binding = null
}
fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) { fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) {
uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
} }
private fun uriToBitmap(selectedFileUri: Uri): Bitmap? { private fun uriToBitmap(selectedFileUri: Uri): Bitmap? {
try { try {
val parcelFileDescriptor = requireActivity().contentResolver.openFileDescriptor(selectedFileUri, "r")
val parcelFileDescriptor =
requireActivity().contentResolver.openFileDescriptor(selectedFileUri, "r")
val fileDescriptor: FileDescriptor = parcelFileDescriptor!!.fileDescriptor val fileDescriptor: FileDescriptor = parcelFileDescriptor!!.fileDescriptor
val image = BitmapFactory.decodeFileDescriptor(fileDescriptor) val image = BitmapFactory.decodeFileDescriptor(fileDescriptor)
parcelFileDescriptor.close() parcelFileDescriptor.close()
@ -682,4 +633,9 @@ class StepThreeBajajFDFragment : BaseFragment() {
} }
return null return null
} }
override fun onDestroyView() {
super.onDestroyView()
_binding = null
}
} }

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

@ -44,6 +44,7 @@ import com.nivesh.production.bajajfd.util.Common.Companion.isValidEmail
import com.nivesh.production.bajajfd.util.Common.Companion.isValidName import com.nivesh.production.bajajfd.util.Common.Companion.isValidName
import com.nivesh.production.bajajfd.util.Common.Companion.isValidPan import com.nivesh.production.bajajfd.util.Common.Companion.isValidPan
import com.nivesh.production.bajajfd.util.Common.Companion.removeError import com.nivesh.production.bajajfd.util.Common.Companion.removeError
import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation
import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Constants.Companion.token
import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel
@ -548,23 +549,10 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
binding.addBankDetail.setOnClickListener { binding.addBankDetail.setOnClickListener {
if (binding.llBankDetails.visibility == View.GONE) {
binding.llBankDetails.visibility = View.VISIBLE
binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.ic_minus,
0
)
if (bankListAdapter.itemCount == 5) {
showDialogValidation(mActivity, "You can not add more than five accounts")
} else { } else {
binding.llBankDetails.visibility = View.GONE
binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.ic_add_icon,
0
)
showHideBankDetail()
} }
} }
@ -943,18 +931,21 @@ class StepTwoBajajFDFragment : BaseFragment() {
listOfBanks, listOfBanks,
clientBankList.AccountNumber.toString() clientBankList.AccountNumber.toString()
) )
showHideBankDetail()
} else { } else {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getBankValidationApiResponse.Message getBankValidationApiResponse.Message
) )
showHideBankDetail()
} }
} }
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getBankValidationApiResponse.Message getBankValidationApiResponse.Message
) )
showHideBankDetail()
} }
} }
} }
@ -1985,6 +1976,27 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
} }
private fun showHideBankDetail() {
if (binding.llBankDetails.visibility == View.GONE) {
binding.llBankDetails.visibility = View.VISIBLE
binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.ic_minus,
0
)
} else {
binding.llBankDetails.visibility = View.GONE
binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.ic_add_icon,
0
)
}
}
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()
_binding = null _binding = null


Loading…
Cancel
Save

Powered by TurnKey Linux.