diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index 663a6f254d..09839d91eb 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -164,12 +164,15 @@ public class SchemeIntent implements IMogoStatusChangedListener { break; case TYPE_SHOW_ONLINE_CAR_PANEL: handleShowOnlineCarPanel(target); + break; case TYPE_SHOW_HISTORY_PANEL: - handleShowSharePanel(0); + handleShowEventPanel(0); + break; case TYPE_SHOW_SURROUNDING_PANEL: - handleShowSharePanel(1); + handleShowEventPanel(1); + break; case TYPE_SHOW_SHARE_PANEL: - handleShowSharePanel(2); + handleShowEventPanel(2); break; default: break; @@ -225,7 +228,7 @@ public class SchemeIntent implements IMogoStatusChangedListener { /* * 语音打开事件面板 * */ - private void handleShowSharePanel(int item) { + private void handleShowEventPanel(int item) { Logger.d(TAG, "语音打开事件面板" + String.valueOf(item)); mApis.getEventPanelManager().showPanelWithSelectedItem(item); } 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 6d06f2df79..6898259774 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 @@ -9,6 +9,7 @@ import android.text.Spanned import android.text.style.AbsoluteSizeSpan import android.text.style.ForegroundColorSpan import android.text.style.StyleSpan +import android.util.Log import android.view.View import android.widget.ImageView import android.widget.RadioButton @@ -256,20 +257,23 @@ class V2XEventPanelFragment : MvpFragment mV2XScenarioHistoryFragment.ttsForVoiceCheckout() - 1 -> mV2XSurroundingFragment.ttsForVoiceCheckout() - else -> mV2XShareEventsFragment.ttsForVoiceCheck() + try { + when (item) { + 0 -> mV2XScenarioHistoryFragment.ttsForVoiceCheckout() + 1 -> mV2XSurroundingFragment.ttsForVoiceCheckout() + else -> mV2XShareEventsFragment.ttsForVoiceCheckout() + } + } catch (e: java.lang.Exception) { + } + } else { showPanel() selectWithItem(item) } } - private fun initDetail() { mDetailRecyclerView!!.addItemDecoration(SpacesItemDecoration(resources.getDimension(R.dimen.share_item_padding).toInt())) mSurroundingDetailAdapter = V2XSurroundingDetailAdapter(activity, markerExploreWays) @@ -343,10 +347,14 @@ class V2XEventPanelFragment : MvpFragment { try { + mV2XScenarioHistoryFragment.fromVoice = true mRbScenarioHistory?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() @@ -354,6 +362,7 @@ class V2XEventPanelFragment : MvpFragment { try { + mV2XSurroundingFragment.fromVoice = true mRbSurroundingEvent?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() @@ -361,6 +370,7 @@ class V2XEventPanelFragment : MvpFragment { try { + mV2XShareEventsFragment.fromVoice = true mRbShareEvents?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() @@ -372,6 +382,7 @@ class V2XEventPanelFragment : MvpFragment { private String TAG = "ScenarioHistoryFragment"; - + public Boolean fromVoice = false; private V2XListEmptyView mEmptyView; private LinearLayout mClHistoryList; private RecyclerView mRecyclerView; @@ -128,6 +128,10 @@ public class V2XScenarioHistoryFragment mClHistoryList.setVisibility(View.GONE); } mV2XScenarioHistoryAdapter.notifyDataSetChanged(); + if (fromVoice == true){ + ttsForVoiceCheckout(); + fromVoice = false; + } ttsForHistoryFirstToday(); } }); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 9e0574e707..b270254009 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -105,7 +105,7 @@ public class V2XShareEventsFragment extends MvpFragment poiInfosList = new ArrayList<>(); private IMogoServiceApis mApis; private NetworkLoadingView mloadingImage; - + public Boolean fromVoice = false; @Override protected int getLayoutId() { @@ -199,6 +199,10 @@ public class V2XSurroundingFragment extends MvpFragment