Merge remote-tracking branch 'origin/qa_1.1.8_easy_mode' into qa_1.1.8_easy_mode

This commit is contained in:
wangcongtao
2020-12-07 15:20:05 +08:00

View File

@@ -247,7 +247,9 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
.addBottomLayerView(mV2XEventPanelHistoryCountView, x, y)
changeEventCount()
} else {
selectWithItem(1)
// 模拟手动点击,默认选择第二个,周边事件
// http://jira.zhidaohulian.com/browse/E84XAD-250
mRgTabSelect?.check(R.id.rbSurroundingEvent)
}
} catch (e: Exception) {
@@ -372,9 +374,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
1 -> {
try {
if (mRbSurroundingEvent?.isChecked == true) {
if (DebugConfig.isMapBased()) {
mV2XSurroundingFragment?.ttsForVoiceCheckout()
}
mV2XSurroundingFragment?.ttsForVoiceCheckout()
} else {
mRbSurroundingEvent?.isChecked = true
mV2XSurroundingFragment?.fromVoice = true