Browse Source

send data fragment

PankajBranch
pankaj 2 years ago
parent
commit
33d179f06c
6 changed files with 59 additions and 46 deletions
  1. +6
    -0
      app/src/main/java/com/nivesh/production/bajajfd/interfaces/SendData.kt
  2. +24
    -7
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  3. +25
    -12
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
  4. +1
    -1
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
  5. +3
    -3
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  6. +0
    -23
      app/src/main/res/layout/fragment_bajajfd_step_two.xml

+ 6
- 0
app/src/main/java/com/nivesh/production/bajajfd/interfaces/SendData.kt View File

@ -0,0 +1,6 @@
package com.nivesh.production.bajajfd.interfaces
interface SendData {
fun sendDataFragment(message: String?)
}

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

@ -1,5 +1,6 @@
package com.nivesh.production.bajajfd.ui.activity package com.nivesh.production.bajajfd.ui.activity
import android.R
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
@ -12,6 +13,7 @@ import com.nivesh.production.bajajfd.adapter.SectionsPagerAdapter
import com.nivesh.production.bajajfd.api.ApiClient import com.nivesh.production.bajajfd.api.ApiClient
import com.nivesh.production.bajajfd.databinding.ActivityBajajFdBinding import com.nivesh.production.bajajfd.databinding.ActivityBajajFdBinding
import com.nivesh.production.bajajfd.interfaces.BajajFDInterface import com.nivesh.production.bajajfd.interfaces.BajajFDInterface
import com.nivesh.production.bajajfd.interfaces.SendData
import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.model.*
import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.repositories.MainRepository
import com.nivesh.production.bajajfd.ui.fragment.* import com.nivesh.production.bajajfd.ui.fragment.*
@ -25,7 +27,8 @@ 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.* import com.nivesh.production.bajajfd.viewModel.*
class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface ,SendData{
lateinit var binding: ActivityBajajFdBinding lateinit var binding: ActivityBajajFdBinding
private lateinit var viewModel: BajajFDViewModel private lateinit var viewModel: BajajFDViewModel
@ -47,6 +50,8 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
private var stepCount: Int = 0 private var stepCount: Int = 0
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
init() init()
@ -107,7 +112,7 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
private fun getStepsCountApi() { private fun getStepsCountApi() {
val fdStepsCount = FDStepsCountRequest() val fdStepsCount = FDStepsCountRequest()
fdStepsCount.FDProvider = getString(R.string.bajaj)
fdStepsCount.FDProvider = getString(com.nivesh.production.bajajfd.R.string.bajaj)
fdStepsCount.NiveshClientCode = "8872" fdStepsCount.NiveshClientCode = "8872"
viewModel.getStepsCount(fdStepsCount, token) viewModel.getStepsCount(fdStepsCount, token)
viewModel.getStepsCountMutableData.observe(this) { response -> viewModel.getStepsCountMutableData.observe(this) { response ->
@ -155,20 +160,20 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
if (Common.isNetworkAvailable(this@BajajFdMainActivity)) { if (Common.isNetworkAvailable(this@BajajFdMainActivity)) {
val getClientDetailsRequest = getClientDetailsRequest() val getClientDetailsRequest = getClientDetailsRequest()
getClientDetailsRequest.client_code = "8872" getClientDetailsRequest.client_code = "8872"
getClientDetailsRequest.AppOrWeb = getString(R.string.app)
getClientDetailsRequest.AppOrWeb = getString(com.nivesh.production.bajajfd.R.string.app)
getClientDetailsRequest.sub_broker_code = "1038" getClientDetailsRequest.sub_broker_code = "1038"
val userRequest = UserRequest() val userRequest = UserRequest()
userRequest.UID = 19060 userRequest.UID = 19060
userRequest.IPAddress = "" userRequest.IPAddress = ""
userRequest.Source = getString(R.string.source)
userRequest.AppOrWeb = getString(R.string.app)
userRequest.Source = getString(com.nivesh.production.bajajfd.R.string.source)
userRequest.AppOrWeb = getString(com.nivesh.production.bajajfd.R.string.app)
userRequest.LoggedInRoleId = 5 userRequest.LoggedInRoleId = 5
val deviceInfo = DeviceInfo() val deviceInfo = DeviceInfo()
deviceInfo.device_id = "" deviceInfo.device_id = ""
deviceInfo.device_id_for_UMSId = "" deviceInfo.device_id_for_UMSId = ""
deviceInfo.device_type = getString(R.string.app)
deviceInfo.device_type = getString(com.nivesh.production.bajajfd.R.string.app)
deviceInfo.device_model = "" deviceInfo.device_model = ""
deviceInfo.device_token = "" deviceInfo.device_token = ""
deviceInfo.device_name = "" deviceInfo.device_name = ""
@ -412,8 +417,13 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
200 -> { 200 -> {
binding.viewPager.currentItem = currentItem binding.viewPager.currentItem = currentItem
StepFourBajajFDFragment.getInstance(this) StepFourBajajFDFragment.getInstance(this)
.getFDData(createFDApplicationResponse)
.getFDData(createFDApplicationResponse ,this)
sendDataFragment("yaha data dalo")
} }
// 650 -> refreshToken() // 650 -> refreshToken()
else -> { else -> {
showDialogValidation( showDialogValidation(
@ -441,4 +451,11 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface {
} }
override fun sendDataFragment(message: String?) {
val tag = "android:switcher:" + com.nivesh.production.bajajfd.R.id.viewPager.toString() + ":" + 1
val f: StepFourBajajFDFragment? = supportFragmentManager.findFragmentByTag(tag) as StepFourBajajFDFragment?
f.displayReceivedData(message)
}
} }

+ 25
- 12
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt View File

@ -25,7 +25,7 @@ class StepFourBajajFDFragment : Fragment() {
private lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel private lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel
private var _binding: FragmentBajajfdStepFourBinding? = null private var _binding: FragmentBajajfdStepFourBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!
var uniqueId: String? = ""
private var uniqueId: String? = ""
private lateinit var bajajFDInterface: BajajFDInterface private lateinit var bajajFDInterface: BajajFDInterface
@ -52,11 +52,6 @@ class StepFourBajajFDFragment : Fragment() {
stepFourBajajFDViewModel = (activity as BajajFdMainActivity).stepFourBajajFDViewModel stepFourBajajFDViewModel = (activity as BajajFdMainActivity).stepFourBajajFDViewModel
binding.tvInvestedAmount.text = ""
binding.tvTenure.text = ""
binding.tvInterestPayout.text = ""
binding.tvRateOfInterest.text = ""
binding.checkBox.setOnCheckedChangeListener { _, _ -> binding.checkBox.setOnCheckedChangeListener { _, _ ->
} }
@ -74,13 +69,31 @@ class StepFourBajajFDFragment : Fragment() {
return root return root
} }
fun getFDData(createFDApplicationResponse: CreateFDApplicationResponse) {
fun getFDData(
createFDApplicationResponse: CreateFDApplicationResponse,
activity: BajajFdMainActivity
)
{
uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
// //
getFDDetailsApi(uniqueId!!)
getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId, activity)
customerListApi() customerListApi()
} }
fun displayReceivedData(message: String) {
Log.d("received data","Data received : $message")
}
private fun customerListApi() { private fun customerListApi() {
if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) { if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
val getCodeRequest = GetCodeRequest() val getCodeRequest = GetCodeRequest()
@ -131,12 +144,12 @@ class StepFourBajajFDFragment : Fragment() {
} }
private fun getFDDetailsApi(uniqueId: String) {
if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
private fun getFDDetailsApi(uniqueId: String, activity: BajajFdMainActivity) {
if (Common.isNetworkAvailable(activity)) {
val getFDDetailsRequest = GetFDDetailsRequest() val getFDDetailsRequest = GetFDDetailsRequest()
getFDDetailsRequest.FDProvider = getString(R.string.bajaj)
getFDDetailsRequest.FDProvider = activity.resources.getString(R.string.bajaj)
getFDDetailsRequest.NiveshClientCode = getFDDetailsRequest.NiveshClientCode =
(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
activity.getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
getFDDetailsRequest.UniqueId = uniqueId getFDDetailsRequest.UniqueId = uniqueId
stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token) stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token)
stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response -> stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response ->


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

@ -145,7 +145,7 @@ class StepOneBajajFDFragment : Fragment() {
(activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = "8872" (activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = "8872"
(activity as BajajFdMainActivity).fdInvestmentDetails.Provider = (activity as BajajFdMainActivity).fdInvestmentDetails.Provider =
getString(R.string.bajaj) getString(R.string.bajaj)
(activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = ""
(activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = "192.168.1.23"
(activity as BajajFdMainActivity).fdInvestmentDetails.Device = (activity as BajajFdMainActivity).fdInvestmentDetails.Device =
getString(R.string.app) getString(R.string.app)
(activity as BajajFdMainActivity).fdInvestmentDetails.Source = (activity as BajajFdMainActivity).fdInvestmentDetails.Source =


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

@ -97,10 +97,10 @@ class StepThreeBajajFDFragment : Fragment() {
stepThreeBajajFDViewModel = (activity as BajajFdMainActivity).stepThreeBajajFDViewModel stepThreeBajajFDViewModel = (activity as BajajFdMainActivity).stepThreeBajajFDViewModel
binding.btnNext.setOnClickListener { binding.btnNext.setOnClickListener {
if (validate()) {
// if (validate()) {
// //
// bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest)
}
bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest)
// }
} }
binding.btnBack.setOnClickListener { binding.btnBack.setOnClickListener {
(activity as BajajFdMainActivity).binding.viewPager.currentItem = 1 (activity as BajajFdMainActivity).binding.viewPager.currentItem = 1


+ 0
- 23
app/src/main/res/layout/fragment_bajajfd_step_two.xml View File

@ -1023,29 +1023,6 @@
</LinearLayout> </LinearLayout>
<!-- <RadioGroup-->
<!-- android:id="@+id/rgPaymentMode"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/margin_10"-->
<!-- android:orientation="horizontal">-->
<!-- <RadioButton-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:buttonTint="@color/black"-->
<!-- android:checked="true"-->
<!-- android:text="@string/Upi" />-->
<!-- <RadioButton-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="50dp"-->
<!-- android:buttonTint="@color/black"-->
<!-- android:text="@string/netBanking" />-->
<!-- </RadioGroup>-->
<TextView <TextView
style="@style/regularStyle" style="@style/regularStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"


Loading…
Cancel
Save

Powered by TurnKey Linux.