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 b2c539f83a..14fd496436 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 @@ -343,7 +343,11 @@ class V2XEventPanelFragment : MvpFragment { 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 { 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 { try { mV2XShareEventsFragment.fromVoice = true - mRbShareEvents?.isChecked = true + if (mRbShareEvents?.isChecked == true) { + mV2XShareEventsFragment.ttsForVoiceCheckout() + } else { + mRbShareEvents?.isChecked = true + } } catch (e: java.lang.Exception) { e.printStackTrace() } diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse.xml rename to modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index da409da47c..9355cd3b51 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -87,7 +87,7 @@ android:layout_width="@dimen/dp_79" android:layout_height="@dimen/dp_79" android:layout_marginRight="@dimen/dp_50" - android:background="@drawable/v2x_selector_colse" + android:background="@drawable/v2x_selector_close" app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index 028b4ceb1f..79f85e14d1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -24,9 +24,9 @@ android:id="@+id/btnCloseWindow" android:layout_width="@dimen/dp_88" android:layout_height="@dimen/dp_88" - android:layout_marginEnd="@dimen/dp_28" + android:layout_marginEnd="@dimen/dp_32" android:layout_marginBottom="@dimen/dp_40" - android:background="@drawable/v2x_panel_close" + android:background="@drawable/v2x_selector_close" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_colse_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_colse_light.xml rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml