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

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt

@@ -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()
                 }

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" />

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" />