Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
董宏宇
2020-11-24 16:12:04 +08:00
5 changed files with 18 additions and 6 deletions

View File

@@ -343,7 +343,11 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
0 -> {
try {
mV2XScenarioHistoryFragment.fromVoice = true
mRbScenarioHistory?.isChecked = true
if (mRbScenarioHistory?.isChecked == true) {
mV2XScenarioHistoryFragment.ttsForVoiceCheckout()
} else {
mRbScenarioHistory?.isChecked = true
}
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
@@ -351,7 +355,11 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
1 -> {
try {
mV2XSurroundingFragment.fromVoice = true
mRbSurroundingEvent?.isChecked = true
if (mRbSurroundingEvent?.isChecked == true) {
mV2XSurroundingFragment.ttsForVoiceCheckout()
} else {
mRbSurroundingEvent?.isChecked = true
}
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
@@ -359,7 +367,11 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
2 -> {
try {
mV2XShareEventsFragment.fromVoice = true
mRbShareEvents?.isChecked = true
if (mRbShareEvents?.isChecked == true) {
mV2XShareEventsFragment.ttsForVoiceCheckout()
} else {
mRbShareEvents?.isChecked = true
}
} catch (e: java.lang.Exception) {
e.printStackTrace()
}