Browse Source

added code

PankajBranch
Hemant Khadase 2 years ago
parent
commit
9cdef750b2
5 changed files with 85 additions and 74 deletions
  1. +9
    -2
      app/src/main/java/com/nivesh/production/niveshfd/adapter/CustomerListAdapter.kt
  2. +6
    -6
      app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt
  3. +68
    -63
      app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt
  4. +1
    -1
      app/src/main/res/values-hi-rIN/strings.xml
  5. +1
    -2
      app/src/main/res/values/strings.xml

+ 9
- 2
app/src/main/java/com/nivesh/production/niveshfd/adapter/CustomerListAdapter.kt View File

@ -34,8 +34,15 @@ class CustomerListAdapter(
val cList = customerList?.get(position) val cList = customerList?.get(position)
if (cList != null) { if (cList != null) {
holder.txtLabel.text = cList.Label holder.txtLabel.text = cList.Label
holder.tvCustomerName.setOnCheckedChangeListener { _, isChecked ->
cList.isSelected = isChecked
if(holder.txtLabel.text.contains("outside of india",true) ) {
holder.tvCustomerName.isChecked = true
holder.tvCustomerName.setOnCheckedChangeListener { _, isChecked ->
cList.isSelected = isChecked
}
}else {
holder.tvCustomerName.setOnCheckedChangeListener { _, isChecked ->
cList.isSelected = isChecked
}
} }
} }
} }


+ 6
- 6
app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt View File

@ -262,11 +262,11 @@ class NiveshFdMainActivity : BaseActivity() {
val viewPager: DisableAdapter = binding.viewPager val viewPager: DisableAdapter = binding.viewPager
viewPager.adapter = sectionsPagerAdapter viewPager.adapter = sectionsPagerAdapter
viewPager.setPagingEnabled(false) viewPager.setPagingEnabled(false)
if (sectionsPagerAdapter.count > 1) {
// if (sectionsPagerAdapter.count > 1) {
viewPager.offscreenPageLimit = stepCount viewPager.offscreenPageLimit = stepCount
} else {
viewPager.offscreenPageLimit = 1
}
// } else {
// viewPager.offscreenPageLimit = 1
// }
viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
override fun onPageScrolled( override fun onPageScrolled(
position: Int, position: Int,
@ -356,7 +356,7 @@ class NiveshFdMainActivity : BaseActivity() {
} }
// step 2 response // step 2 response
fun stepTwoApi() {
fun stepTwoApi() {
binding.viewPager.currentItem = 2 binding.viewPager.currentItem = 2
if (stepCount == 3) { if (stepCount == 3) {
stepFourBajajFDFragment.displayReceivedData() stepFourBajajFDFragment.displayReceivedData()
@ -364,7 +364,7 @@ class NiveshFdMainActivity : BaseActivity() {
} }
// step 3 response // step 3 response
fun stepThreeApi() {
fun stepThreeApi() {
binding.viewPager.currentItem = 3 binding.viewPager.currentItem = 3
stepFourBajajFDFragment.displayReceivedData() stepFourBajajFDFragment.displayReceivedData()
} }


+ 68
- 63
app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt View File

@ -28,6 +28,7 @@ class StepFourNiveshFDFragment : Fragment() {
private var selectedList: String = "" private var selectedList: String = ""
private var payUrl: String = "" private var payUrl: String = ""
private var value: String = "" private var value: String = ""
private var checkNRI: Boolean = false
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, inflater: LayoutInflater, container: ViewGroup?,
@ -60,7 +61,7 @@ class StepFourNiveshFDFragment : Fragment() {
) )
) )
} }
checkNRI = true
binding.btnNext.setOnClickListener { binding.btnNext.setOnClickListener {
selectedList = "" selectedList = ""
for (getCodes in listOfCustomer) { for (getCodes in listOfCustomer) {
@ -68,6 +69,9 @@ class StepFourNiveshFDFragment : Fragment() {
selectedList = if (selectedList.isEmpty()) { selectedList = if (selectedList.isEmpty()) {
getCodes.Value getCodes.Value
} else { } else {
if (getCodes.Value.contains("outside of india", true)) {
checkNRI = getCodes.isSelected
}
selectedList.plus(",").plus(getCodes.Value) selectedList.plus(",").plus(getCodes.Value)
} }
} }
@ -94,60 +98,48 @@ class StepFourNiveshFDFragment : Fragment() {
(activity as NiveshFdMainActivity).binding.viewPager.currentItem = 1 (activity as NiveshFdMainActivity).binding.viewPager.currentItem = 1
} }
} }
}
private fun validated(): Boolean {
return if (selectedList.isEmpty()) {
showDialogValidation(
activity as NiveshFdMainActivity,
getString(R.string.validTermsCondition)
)
false
} else if (!binding.checkBox.isChecked) {
showDialogValidation(
activity as NiveshFdMainActivity,
resources.getString(R.string.validTermsConditions)
)
false
} else {
true
}
customerListApi()
} }
private fun saveFDOtherData(data: SaveFDOtherDataRequest, payUrl: String, value: String) {
// ProgressUtil.showLoading(activity as NiveshFdMainActivity)
(activity as NiveshFdMainActivity).viewModel.saveFDOtherData(
data,
private fun customerListApi() {
val getCodeRequest = GetCodeRequest()
getCodeRequest.ProductName = getString(R.string.bajajFD)
getCodeRequest.Category = getString(R.string.customerCategory)
getCodeRequest.Language = getString(R.string.language)
getCodeRequest.InputValue = ""
(activity as NiveshFdMainActivity).viewModel.customerListApi(
getCodeRequest,
PreferenceManager(activity as NiveshFdMainActivity).getToken(), PreferenceManager(activity as NiveshFdMainActivity).getToken(),
activity as NiveshFdMainActivity activity as NiveshFdMainActivity
) )
(activity as NiveshFdMainActivity).viewModel.getFDOtherMutableData.observe(
(activity as NiveshFdMainActivity).viewModel.customerListMutableData.observe(
viewLifecycleOwner viewLifecycleOwner
) { response -> ) { response ->
when (response) { when (response) {
is Resource.Success -> { is Resource.Success -> {
Log.e("saveFDOtherData", " response -->${response.data.toString()}")
val saveFDOtherDataResponse: SaveFDOtherDataResponse =
Gson().fromJson(
response.data?.toString(),
SaveFDOtherDataResponse::class.java
)
saveFDOtherDataResponse.Response.StatusCode.let { code ->
Log.e("customerListApi", " response -->${response.data.toString()}")
val getCodeResponse: GetCodeResponse =
Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
getCodeResponse.Response.StatusCode.let { code ->
when (code) { when (code) {
200 -> { 200 -> {
(activity as NiveshFdMainActivity).stepFourApi(payUrl, value)
if (getCodeResponse.Response.GetCodesList.isNotEmpty()) {
listOfCustomer = getCodeResponse.Response.GetCodesList
setUpRecyclerView(listOfCustomer)
}
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
if (saveFDOtherDataResponse.Response.Errors.isNotEmpty()) {
if (getCodeResponse.Response.Errors.isNotEmpty()) {
showDialogValidation( showDialogValidation(
activity as NiveshFdMainActivity, activity as NiveshFdMainActivity,
saveFDOtherDataResponse.Response.Errors[0].ErrorMessage
getCodeResponse.Response.Errors[0].ErrorMessage
) )
}else{
} else {
showDialogValidation( showDialogValidation(
activity as NiveshFdMainActivity, activity as NiveshFdMainActivity,
"".plus(saveFDOtherDataResponse.Response.Message)
"".plus(getCodeResponse.Response.Message)
) )
} }
} }
@ -161,7 +153,7 @@ class StepFourNiveshFDFragment : Fragment() {
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
// ProgressUtil.hideLoading()
} }
is Resource.DataError -> { is Resource.DataError -> {
@ -170,49 +162,58 @@ class StepFourNiveshFDFragment : Fragment() {
} }
} }
fun displayReceivedData() {
getFDDetailsApi()
customerListApi()
private fun validated(): Boolean {
return if (!checkNRI) {
showDialogValidation(
activity as NiveshFdMainActivity,
getString(R.string.validNRI)
)
false
} else if (!binding.checkBox.isChecked) {
showDialogValidation(
activity as NiveshFdMainActivity,
resources.getString(R.string.validTermsConditions)
)
false
} else {
true
}
} }
private fun customerListApi() {
val getCodeRequest = GetCodeRequest()
getCodeRequest.ProductName = getString(R.string.bajajFD)
getCodeRequest.Category = getString(R.string.customerCategory)
getCodeRequest.Language = getString(R.string.language)
getCodeRequest.InputValue = ""
(activity as NiveshFdMainActivity).viewModel.customerListApi(
getCodeRequest,
private fun saveFDOtherData(data: SaveFDOtherDataRequest, payUrl: String, value: String) {
// ProgressUtil.showLoading(activity as NiveshFdMainActivity)
(activity as NiveshFdMainActivity).viewModel.saveFDOtherData(
data,
PreferenceManager(activity as NiveshFdMainActivity).getToken(), PreferenceManager(activity as NiveshFdMainActivity).getToken(),
activity as NiveshFdMainActivity activity as NiveshFdMainActivity
) )
(activity as NiveshFdMainActivity).viewModel.customerListMutableData.observe(
(activity as NiveshFdMainActivity).viewModel.getFDOtherMutableData.observe(
viewLifecycleOwner viewLifecycleOwner
) { response -> ) { response ->
when (response) { when (response) {
is Resource.Success -> { is Resource.Success -> {
Log.e("customerListApi", " response -->${response.data.toString()}")
val getCodeResponse: GetCodeResponse =
Gson().fromJson(response.data?.toString(), GetCodeResponse::class.java)
getCodeResponse.Response.StatusCode.let { code ->
Log.e("saveFDOtherData", " response -->${response.data.toString()}")
val saveFDOtherDataResponse: SaveFDOtherDataResponse =
Gson().fromJson(
response.data?.toString(),
SaveFDOtherDataResponse::class.java
)
saveFDOtherDataResponse.Response.StatusCode.let { code ->
when (code) { when (code) {
200 -> { 200 -> {
if (getCodeResponse.Response.GetCodesList.isNotEmpty()) {
listOfCustomer = getCodeResponse.Response.GetCodesList
setUpRecyclerView(listOfCustomer)
}
(activity as NiveshFdMainActivity).stepFourApi(payUrl, value)
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
if (getCodeResponse.Response.Errors.isNotEmpty()) {
if (saveFDOtherDataResponse.Response.Errors.isNotEmpty()) {
showDialogValidation( showDialogValidation(
activity as NiveshFdMainActivity, activity as NiveshFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage
saveFDOtherDataResponse.Response.Errors[0].ErrorMessage
) )
}else{
} else {
showDialogValidation( showDialogValidation(
activity as NiveshFdMainActivity, activity as NiveshFdMainActivity,
"".plus(getCodeResponse.Response.Message)
"".plus(saveFDOtherDataResponse.Response.Message)
) )
} }
} }
@ -226,7 +227,7 @@ class StepFourNiveshFDFragment : Fragment() {
} }
} }
is Resource.Loading -> { is Resource.Loading -> {
// ProgressUtil.hideLoading()
} }
is Resource.DataError -> { is Resource.DataError -> {
@ -243,6 +244,10 @@ class StepFourNiveshFDFragment : Fragment() {
} }
fun displayReceivedData() {
getFDDetailsApi()
}
private fun getFDDetailsApi() { private fun getFDDetailsApi() {
if (Common.isNetworkAvailable(activity as NiveshFdMainActivity)) { if (Common.isNetworkAvailable(activity as NiveshFdMainActivity)) {
val getFDDetailsRequest = GetFDDetailsRequest() val getFDDetailsRequest = GetFDDetailsRequest()
@ -289,7 +294,7 @@ class StepFourNiveshFDFragment : Fragment() {
activity as NiveshFdMainActivity, activity as NiveshFdMainActivity,
getFDDetailsResponse.Response.Errors[0].ErrorMessage getFDDetailsResponse.Response.Errors[0].ErrorMessage
) )
}else{
} else {
showDialogValidation( showDialogValidation(
activity as NiveshFdMainActivity, activity as NiveshFdMainActivity,
"".plus(getFDDetailsResponse.Response.Message) "".plus(getFDDetailsResponse.Response.Message)
@ -313,10 +318,10 @@ class StepFourNiveshFDFragment : Fragment() {
} }
} }
} }
} }
} }
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()
_binding = null _binding = null


+ 1
- 1
app/src/main/res/values-hi-rIN/strings.xml View File

@ -260,7 +260,7 @@
<string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string> <string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
<string name="eligibleBankError">Selected Bank is Not Eligible For Investment of Bajaj Fd</string> <string name="eligibleBankError">Selected Bank is Not Eligible For Investment of Bajaj Fd</string>
<string name="validNRI">Sorry! We are not serving NRI residents at present.</string>
</resources> </resources>

+ 1
- 2
app/src/main/res/values/strings.xml View File

@ -259,8 +259,7 @@
<string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string> <string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
<string name="eligibleBankError">Selected Bank is Not Eligible For Investment of Bajaj Fd</string> <string name="eligibleBankError">Selected Bank is Not Eligible For Investment of Bajaj Fd</string>
<string name="validNRI">Sorry! We are not serving NRI residents at present.</string>
</resources> </resources>

Loading…
Cancel
Save

Powered by TurnKey Linux.