Browse Source

upload issue

PankajBranch
Manoj 2 years ago
parent
commit
59a0774c11
2 changed files with 71 additions and 31 deletions
  1. +1
    -0
      app/src/main/AndroidManifest.xml
  2. +70
    -31
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt

+ 1
- 0
app/src/main/AndroidManifest.xml View File

@ -20,6 +20,7 @@
<application <application
android:allowBackup="true" android:allowBackup="true"
android:hardwareAccelerated="false"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"


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

@ -39,6 +39,7 @@ 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() {
@ -71,6 +72,8 @@ class StepThreeBajajFDFragment : BaseFragment() {
private val SECOND_UPLOAD: Int = 4 private val SECOND_UPLOAD: Int = 4
private var actionType: Int = -1 private var actionType: Int = -1
private val mapImage: HashMap<String, String> = HashMap()
private val requestPermission = registerForActivityResult( private val requestPermission = registerForActivityResult(
ActivityResultContracts.RequestPermission() ActivityResultContracts.RequestPermission()
) { isGranted: Boolean -> ) { isGranted: Boolean ->
@ -116,11 +119,40 @@ class StepThreeBajajFDFragment : BaseFragment() {
binding.btnNext.setOnClickListener { binding.btnNext.setOnClickListener {
if (validate()) { if (validate()) {
uploadDocApi(
"PAN",
"data:image/".plus(panFileExt).plus(";base64, ").plus(panString),
1
)
// private var panString: String = ""
// private var photoString: String = ""
// private var docString: String = ""
// private var docString2: String = ""
if(panString.isNotEmpty()){
mapImage["PAN"] = "data:image/".plus(panFileExt)
.plus(";base64, ").plus(panString)
}
if(photoString.isNotEmpty()){
mapImage["Photograph"] = "data:image/".plus(photoFileExt)
.plus(";base64, ").plus(photoString)
}
if(docString.isNotEmpty()){
mapImage["docValue"] = "data:image/".plus(doc1FileExt)
.plus(";base64, ").plus(docString)
}
if(docString2.isNotEmpty()){
mapImage["Aadhar"] = "data:image/".plus(doc2fileExt)
.plus(";base64, ").plus(docString2)
}
var uploadPosition = 0
for (entry in mapImage.iterator()) {
uploadPosition++
uploadDocApi(entry.key, entry.value, uploadPosition)
}
// uploadDocApi(
// "PAN",
// "data:image/".plus(panFileExt).plus(";base64, ").plus(panString),
// 1
// )
} }
} }
binding.btnBack.setOnClickListener { binding.btnBack.setOnClickListener {
@ -398,34 +430,41 @@ 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 == 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) {
if(uploadPosition == mapImage.size){
// Common.showDialogValidation(
// activity as BajajFdMainActivity,
// "Documents Uploaded Successfully")
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()


Loading…
Cancel
Save

Powered by TurnKey Linux.