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 da93fa5f15..62d57d394c 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 @@ -346,23 +346,19 @@ class V2XEventPanelFragment : MvpFragment { 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 { try { - mV2XShareEventsFragment.fromVoice = true if (mRbShareEvents?.isChecked == true) { mV2XShareEventsFragment.ttsForVoiceCheckout() } else { mRbShareEvents?.isChecked = true + mV2XShareEventsFragment.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 1ce7baece4..2d394ff5fd 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/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); diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml deleted file mode 100644 index 2c36033d92..0000000000 --- a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml deleted file mode 100644 index 70f871f8a9..0000000000 --- a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png new file mode 100644 index 0000000000..1cac08b97c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_normal_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_normal_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml new file mode 100644 index 0000000000..a0367b590f --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml new file mode 100644 index 0000000000..3f12177da6 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png new file mode 100644 index 0000000000..a37dc6a948 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png new file mode 100644 index 0000000000..87bedfbda0 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_normal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_normal_light.png new file mode 100644 index 0000000000..340c7483d2 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_normal_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_pressed_light.png new file mode 100644 index 0000000000..f14204ef21 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_pressed_light.png differ