diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1f3d18c759..6249850d4f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,7 +74,6 @@ diff --git a/gradle.properties b/gradle.properties index 777b379662..0531e07889 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.8.9 +CARCHATTING_VERSION=1.9.0 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml index f2a8033f4b..e46aa1dcdd 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml index 327e0c3010..a2343c16c2 100644 --- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml @@ -32,8 +32,8 @@ 0px - 2px - 2px + 0px + 0px 6px 6px \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index d7e2dd62a7..d02de41af6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java @@ -98,22 +98,16 @@ public class V2XEventPanelModuleProvider implements @Override public void showPanelWithSelectedItem(int item) { - if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { - V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); - } + V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); } @Override public void showPanel() { - if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { - V2XEventPanelFragment.Companion.getInstance().showPanel(); - } + V2XEventPanelFragment.Companion.getInstance().showPanel(); } @Override public void hidePanel() { - if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { - V2XEventPanelFragment.Companion.getInstance().hidePanel(); - } + V2XEventPanelFragment.Companion.getInstance().hidePanel(); } } diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8fd4be0d32..c975f7af0a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -121,7 +121,7 @@ android:id="@+id/ivFaultHelpEventNavi" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:layout_marginRight="26px" + android:layout_marginRight="@dimen/dp_40" android:src="@drawable/selector_nav_history" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"