Browse Source

error issue

PankajBranch
Hemant Khadase 2 years ago
parent
commit
cde2f4f7ec
6 changed files with 70 additions and 28 deletions
  1. +49
    -18
      app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt
  2. +3
    -2
      app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt
  3. +7
    -3
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  4. +5
    -1
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
  5. +3
    -2
      app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt
  6. +3
    -2
      app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneBajajFDViewModel.kt

+ 49
- 18
app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt View File

@ -1,59 +1,90 @@
package com.nivesh.production.bajajfd.interfaces
import com.google.gson.JsonObject
import com.nivesh.production.bajajfd.model.GetCodeRequest
import com.nivesh.production.bajajfd.model.GetRatesRequest
import okhttp3.RequestBody
import retrofit2.Response
import retrofit2.http.Body
import retrofit2.http.Header
import retrofit2.http.Headers
import retrofit2.http.POST
import retrofit2.http.*
interface ApiInterface {
// @FormUrlEncoded
@POST("GetRates")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun getRates(@Body getRatesRequest: GetRatesRequest): Response<JsonObject>
@POST("CheckFDCKYC")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun checkFDKYC(@Body requestBody: RequestBody): Response<JsonObject>
@POST("CreateFDApplication")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun createFDApp(@Body requestBody: RequestBody): Response<JsonObject>
@POST("DocumentsUpload")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun documentsUpload(@Body requestBody: RequestBody): Response<JsonObject>
@POST("SaveFDOtherData")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun saveFDOtherData(@Body requestBody: RequestBody): Response<JsonObject>
@POST("GetFDDetails")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun getFDDetails(@Body requestBody: RequestBody): Response<JsonObject>
@POST("UpdateFDPaymentStatus")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun updateFDPaymentStatus(@Body requestBody: RequestBody): Response<JsonObject>
@POST("FinaliseFD")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun finaliseFD(@Body requestBody: RequestBody): Response<JsonObject>
@POST("FinaliseKYC")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun finaliseKYC(@Body requestBody: RequestBody): Response<JsonObject>
@POST("PaymentRequery")
@Headers("token: 636F8F63-06C4-4D95-8562-392B34025FB0")
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun paymentReQuery(@Body requestBody: RequestBody): Response<JsonObject>
// @FormUrlEncoded
@POST("GetCodes")
@Headers({"token: 636F8F63-06C4-4D95-8562-392B34025FB0"; "Content-Type: multipart/form-data"; "Accept: application/json" }.toString())
suspend fun getCodes(@Body requestBody: GetCodeRequest): Response<JsonObject>
@Headers(
"token: 636F8F63-06C4-4D95-8562-392B34025FB0",
"Content-Type: application/json", "charset=UTF-8"
)
suspend fun getCodes(@Body requestBody: RequestBody): Response<JsonObject>
// "token: 636F8F63-06C4-4D95-8562-392B34025FB0";
}

+ 3
- 2
app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt View File

@ -3,6 +3,7 @@ package com.nivesh.production.bajajfd.repositories
import com.nivesh.production.bajajfd.interfaces.ApiInterface
import com.nivesh.production.bajajfd.model.GetCodeRequest
import com.nivesh.production.bajajfd.model.GetRatesRequest
import okhttp3.RequestBody
class MainRepository constructor(private val apiInterface: ApiInterface) {
suspend fun getRatesResponse(getRatesRequest: GetRatesRequest) =
@ -35,7 +36,7 @@ class MainRepository constructor(private val apiInterface: ApiInterface) {
suspend fun paymentReQueryResponse(getRatesRequest: GetRatesRequest) =
apiInterface.getRates(getRatesRequest)
suspend fun getCodesResponse(getCodeRequest: GetCodeRequest) =
apiInterface.getCodes(getCodeRequest)
suspend fun getCodesResponse(requestBody: RequestBody) =
apiInterface.getCodes(requestBody)
}

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

@ -24,6 +24,8 @@ import com.nivesh.production.bajajfd.util.Colors
import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.BajajFDViewModel
import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.RequestBody.Companion.toRequestBody
class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
private lateinit var binding: ActivityBajajFdBinding
@ -44,8 +46,8 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
setContentView(binding.root)
//start Repository
val viewModelProviderFactory = GetRatesModelProviderFactory(MainRepository(ApiClient.getApiClient))
stepOneBajajFDViewModel = ViewModelProvider(this, viewModelProviderFactory)[StepOneBajajFDViewModel::class.java]
// val viewModelProviderFactory = GetRatesModelProviderFactory(MainRepository(ApiClient.getApiClient))
// stepOneBajajFDViewModel = ViewModelProvider(this, viewModelProviderFactory)[StepOneBajajFDViewModel::class.java]
val fdViewModelProviderFactory = FDModelProviderFactory(MainRepository(ApiClient.getApiClient))
viewModel = ViewModelProvider(this, fdViewModelProviderFactory)[BajajFDViewModel::class.java]
@ -140,7 +142,9 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
getCodeRequest.Category = "InterestPayoutFreq"
getCodeRequest.Language = "EN"
getCodeRequest.InputValue = ""
viewModel.getCode(getCodeRequest)
val codeRequest : String = Gson().toJson(getCodeRequest);
val requestBody = codeRequest.toRequestBody("application/json".toMediaTypeOrNull())
viewModel.getCode(requestBody)
viewModel.getRatesMutableData.observe(this) { response ->
when (response) {
is Resource.Success -> {


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

@ -24,6 +24,8 @@ import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
import com.nivesh.production.bajajfd.util.Common
import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.RequestBody.Companion.toRequestBody
class StepOneBajajFDFragment : Fragment() {
private var _binding: FragmentBajajfdStepOneBinding? = null
@ -138,7 +140,9 @@ class StepOneBajajFDFragment : Fragment() {
getCodeRequest.Category = "InterestPayoutFreq"
getCodeRequest.Language = "EN"
getCodeRequest.InputValue = ""
stepOneBajajFDViewModel.getCode(getCodeRequest)
val codeRequest : String = Gson().toJson(getCodeRequest);
val requestBody = codeRequest.toRequestBody("application/json".toMediaTypeOrNull())
stepOneBajajFDViewModel.getCode(requestBody)
stepOneBajajFDViewModel.getRatesMutableData.observe(this) { response ->
when (response) {
is Resource.Success -> {


+ 3
- 2
app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt View File

@ -8,14 +8,15 @@ import com.nivesh.production.bajajfd.model.GetCodeRequest
import com.nivesh.production.bajajfd.repositories.MainRepository
import com.nivesh.production.bajajfd.util.Resource
import kotlinx.coroutines.launch
import okhttp3.RequestBody
class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() {
// TODO: Implement the ViewModel
val getRatesMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
fun getCode(getCodeRequest: GetCodeRequest) = viewModelScope.launch {
fun getCode(requestBody: RequestBody) = viewModelScope.launch {
getRatesMutableData.postValue(Resource.Loading())
val response = mainRepository.getCodesResponse(getCodeRequest)
val response = mainRepository.getCodesResponse(requestBody)
getRatesMutableData.postValue(handleRatesResponse(response))
}


+ 3
- 2
app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepOneBajajFDViewModel.kt View File

@ -9,6 +9,7 @@ import com.nivesh.production.bajajfd.model.GetRatesRequest
import com.nivesh.production.bajajfd.repositories.MainRepository
import com.nivesh.production.bajajfd.util.Resource
import kotlinx.coroutines.launch
import okhttp3.RequestBody
class StepOneBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() {
// TODO: Implement the ViewModel
@ -20,9 +21,9 @@ class StepOneBajajFDViewModel(private val mainRepository: MainRepository) : View
getRatesMutableData.postValue(handleRatesResponse(response))
}
fun getCode(getCodeRequest: GetCodeRequest) = viewModelScope.launch {
fun getCode(requestBody: RequestBody) = viewModelScope.launch {
getRatesMutableData.postValue(Resource.Loading())
val response = mainRepository.getCodesResponse(getCodeRequest)
val response = mainRepository.getCodesResponse(requestBody)
getRatesMutableData.postValue(handleRatesResponse(response))
}


Loading…
Cancel
Save

Powered by TurnKey Linux.