diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 81ca75a3c9..985900eb31 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -76,9 +76,9 @@ class V2XEventPanelFragment : MvpFragment() - private val mV2XScenarioHistoryFragment = V2XScenarioHistoryFragment() - private val mV2XShareEventsFragment = V2XShareEventsFragment() - private val mV2XSurroundingFragment = V2XSurroundingFragment() + private var mV2XScenarioHistoryFragment: V2XScenarioHistoryFragment? = null + private var mV2XShareEventsFragment: V2XShareEventsFragment? = null + private var mV2XSurroundingFragment: V2XSurroundingFragment? = null companion object { private var fragment: V2XEventPanelFragment? = null @@ -143,6 +143,17 @@ class V2XEventPanelFragment : MvpFragment { try { mRbScenarioHistory?.isChecked = true - mV2XScenarioHistoryFragment.fromVoice = true + mV2XScenarioHistoryFragment?.fromVoice = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -366,10 +372,10 @@ class V2XEventPanelFragment : MvpFragment { try { if (mRbSurroundingEvent?.isChecked == true) { - mV2XSurroundingFragment.ttsForVoiceCheckout() + mV2XSurroundingFragment?.ttsForVoiceCheckout() } else { mRbSurroundingEvent?.isChecked = true - mV2XSurroundingFragment.fromVoice = true + mV2XSurroundingFragment?.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() @@ -378,10 +384,10 @@ class V2XEventPanelFragment : MvpFragment { try { if (mRbShareEvents?.isChecked == true) { - mV2XShareEventsFragment.ttsForVoiceCheckout() + mV2XShareEventsFragment?.ttsForVoiceCheckout() } else { mRbShareEvents?.isChecked = true - mV2XShareEventsFragment.fromVoice = true + mV2XShareEventsFragment?.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() @@ -403,8 +409,8 @@ class V2XEventPanelFragment : MvpFragment