Merge branch 'qa_1.1.8' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_1.1.8

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

@@ -346,23 +346,19 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         when (item) {
             0 -> {
                 try {
+                    mRbScenarioHistory?.isChecked = true
                     mV2XScenarioHistoryFragment.fromVoice = true
-                    if (mRbScenarioHistory?.isChecked == true) {
-                        mV2XScenarioHistoryFragment.ttsForVoiceCheckout()
-                    } else {
-                        mRbScenarioHistory?.isChecked = true
-                    }
                 } catch (e: java.lang.Exception) {
                     e.printStackTrace()
                 }
             }
             1 -> {
                 try {
-                    mV2XSurroundingFragment.fromVoice = true
                     if (mRbSurroundingEvent?.isChecked == true) {
                         mV2XSurroundingFragment.ttsForVoiceCheckout()
                     } else {
                         mRbSurroundingEvent?.isChecked = true
+                        mV2XSurroundingFragment.fromVoice = true
                     }
                 } catch (e: java.lang.Exception) {
                     e.printStackTrace()
@@ -370,11 +366,11 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             }
             2 -> {
                 try {
-                    mV2XShareEventsFragment.fromVoice = true
                     if (mRbShareEvents?.isChecked == true) {
                         mV2XShareEventsFragment.ttsForVoiceCheckout()
                     } else {
                         mRbShareEvents?.isChecked = true
+                        mV2XShareEventsFragment.fromVoice = true
                     }
                 } catch (e: java.lang.Exception) {
                     e.printStackTrace()

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

@@ -128,11 +128,11 @@ public class V2XScenarioHistoryFragment
                     mClHistoryList.setVisibility(View.GONE);
                 }
                 mV2XScenarioHistoryAdapter.notifyDataSetChanged();
-                if (fromVoice == true){
+                ttsForHistoryFirstToday();
+                if (fromVoice == true) {
                     ttsForVoiceCheckout();
                     fromVoice = false;
                 }
-                ttsForHistoryFirstToday();
             }
         });
     }
@@ -155,9 +155,9 @@ public class V2XScenarioHistoryFragment
     }
 
     /*
-    * 语音查询出行动态 TTS播报
-    * */
-    public void ttsForVoiceCheckout(){
+     * 语音查询出行动态 TTS播报
+     * */
+    public void ttsForVoiceCheckout() {
         if (mV2XHistoryScenarioData.size() > 0) {
             AIAssist.getInstance(V2XUtils.getApp()).
                     speakTTSVoice("为您找到以下动态请查看", null);

skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/service_car_pannel_call_pressed_light" android:state_pressed="true" />
-    <item android:drawable="@drawable/service_car_pannel_call_nomal_light" android:state_pressed="false" />
-    <item android:drawable="@drawable/service_car_pannel_call_nomal_light" />
-</selector>

skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/service_car_pannel_detials_pressed_light" android:state_pressed="true" />
-    <item android:drawable="@drawable/service_car_pannel_detials_nomal_light" android:state_pressed="false" />
-    <item android:drawable="@drawable/service_car_pannel_detials_nomal_light" />
-</selector>

skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/service_car_panel_call_pressed_light" android:state_pressed="true" />
+    <item android:drawable="@drawable/service_car_panel_call_normal_light" android:state_pressed="false" />
+    <item android:drawable="@drawable/service_car_panel_call_normal_light" />
+</selector>

skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/service_car_panel_details_pressed_light" android:state_pressed="true" />
+    <item android:drawable="@drawable/service_car_panel_details_normal_light" android:state_pressed="false" />
+    <item android:drawable="@drawable/service_car_panel_details_normal_light" />
+</selector>