diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/SendData.kt b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/SendData.kt new file mode 100644 index 0000000..41acf22 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/SendData.kt @@ -0,0 +1,6 @@ +package com.nivesh.production.bajajfd.interfaces + +interface SendData { + fun sendDataFragment(message: String?) + +} \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt index 88b6ba0..f64a894 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt @@ -1,5 +1,6 @@ package com.nivesh.production.bajajfd.ui.activity +import android.R import android.graphics.drawable.Drawable import android.os.Bundle 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.databinding.ActivityBajajFdBinding 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.repositories.MainRepository 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.viewModel.* -class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { + +class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface ,SendData{ lateinit var binding: ActivityBajajFdBinding private lateinit var viewModel: BajajFDViewModel @@ -47,6 +50,8 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { private var stepCount: Int = 0 + + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) init() @@ -107,7 +112,7 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { private fun getStepsCountApi() { val fdStepsCount = FDStepsCountRequest() - fdStepsCount.FDProvider = getString(R.string.bajaj) + fdStepsCount.FDProvider = getString(com.nivesh.production.bajajfd.R.string.bajaj) fdStepsCount.NiveshClientCode = "8872" viewModel.getStepsCount(fdStepsCount, token) viewModel.getStepsCountMutableData.observe(this) { response -> @@ -155,20 +160,20 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { if (Common.isNetworkAvailable(this@BajajFdMainActivity)) { val getClientDetailsRequest = getClientDetailsRequest() 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" val userRequest = UserRequest() userRequest.UID = 19060 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 val deviceInfo = DeviceInfo() deviceInfo.device_id = "" 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_token = "" deviceInfo.device_name = "" @@ -412,8 +417,13 @@ class BajajFdMainActivity : AppCompatActivity(), BajajFDInterface { 200 -> { binding.viewPager.currentItem = currentItem StepFourBajajFDFragment.getInstance(this) - .getFDData(createFDApplicationResponse) + .getFDData(createFDApplicationResponse ,this) + + + sendDataFragment("yaha data dalo") } + + // 650 -> refreshToken() else -> { 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) + + } + } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt index b6358b6..e98521f 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt @@ -25,7 +25,7 @@ class StepFourBajajFDFragment : Fragment() { private lateinit var stepFourBajajFDViewModel: StepFourBajajFDViewModel private var _binding: FragmentBajajfdStepFourBinding? = null private val binding get() = _binding!! - var uniqueId: String? = "" + private var uniqueId: String? = "" private lateinit var bajajFDInterface: BajajFDInterface @@ -52,11 +52,6 @@ class StepFourBajajFDFragment : Fragment() { stepFourBajajFDViewModel = (activity as BajajFdMainActivity).stepFourBajajFDViewModel - binding.tvInvestedAmount.text = "" - binding.tvTenure.text = "" - binding.tvInterestPayout.text = "" - binding.tvRateOfInterest.text = "" - binding.checkBox.setOnCheckedChangeListener { _, _ -> } @@ -74,13 +69,31 @@ class StepFourBajajFDFragment : Fragment() { return root } - fun getFDData(createFDApplicationResponse: CreateFDApplicationResponse) { + + + + fun getFDData( + createFDApplicationResponse: CreateFDApplicationResponse, + activity: BajajFdMainActivity + ) + + { uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId // - getFDDetailsApi(uniqueId!!) + getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId, activity) customerListApi() } + + fun displayReceivedData(message: String) { + + Log.d("received data","Data received : $message") + + } + + + + private fun customerListApi() { if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) { 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() - getFDDetailsRequest.FDProvider = getString(R.string.bajaj) + getFDDetailsRequest.FDProvider = activity.resources.getString(R.string.bajaj) getFDDetailsRequest.NiveshClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + activity.getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE getFDDetailsRequest.UniqueId = uniqueId stepFourBajajFDViewModel.getFDDetails(getFDDetailsRequest, Constants.token) stepFourBajajFDViewModel.getFDDetailsMutableData.observe(viewLifecycleOwner) { response -> diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt index fbe5465..44be1be 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt @@ -145,7 +145,7 @@ class StepOneBajajFDFragment : Fragment() { (activity as BajajFdMainActivity).fdInvestmentDetails.NiveshClientCode = "8872" (activity as BajajFdMainActivity).fdInvestmentDetails.Provider = getString(R.string.bajaj) - (activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = "" + (activity as BajajFdMainActivity).fdInvestmentDetails.IPAddress = "192.168.1.23" (activity as BajajFdMainActivity).fdInvestmentDetails.Device = getString(R.string.app) (activity as BajajFdMainActivity).fdInvestmentDetails.Source = diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index 45290d2..a40a798 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -97,10 +97,10 @@ class StepThreeBajajFDFragment : Fragment() { stepThreeBajajFDViewModel = (activity as BajajFdMainActivity).stepThreeBajajFDViewModel binding.btnNext.setOnClickListener { - if (validate()) { + // if (validate()) { // - // bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest) - } + bajajFDInterface.stepThreeApi((activity as BajajFdMainActivity).createFDRequest) + // } } binding.btnBack.setOnClickListener { (activity as BajajFdMainActivity).binding.viewPager.currentItem = 1 diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml index 314daf8..d10b0e2 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml @@ -1023,29 +1023,6 @@ - - - - - - - - - - - - - - - - - - - - - - -