diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 57bdb8d90b..bf71905280 100644 --- a/gradle.properties +++ b/gradle.properties @@ -65,7 +65,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 # 探路 MOGO_MODULE_TANLU_VERSION=1.3.1.24 # 车聊聊 -CARCHATTING_VERSION=1.5.3 +CARCHATTING_VERSION=1.6.2 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java index 005984f991..f0e2739521 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java @@ -20,13 +20,6 @@ public class SpacesItemDecoration extends RecyclerView.ItemDecoration { @Override public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { - outRect.left = space; - outRect.right = space; outRect.bottom = space; - - // Add top margin only for the first item to avoid double space between items - if (parent.getChildPosition(view) == 0) { - outRect.top = space; - } } } 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 fd5a81a5aa..fd51aa6146 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 @@ -1,6 +1,7 @@ package com.mogo.module.v2x.fragment import android.content.Intent +import android.graphics.Typeface import android.view.View import android.widget.ImageView import android.widget.RadioButton @@ -123,14 +124,29 @@ class V2XEventPanelFragment : MvpFragment when (checkedId) { R.id.rbScenarioHistory -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + TrackUtils.trackV2xHistoryEvent(2) mVpEventPanel?.setCurrentItem(0, false) } R.id.rbSurroundingEvent -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + TrackUtils.trackV2xHistoryEvent(3) mVpEventPanel?.setCurrentItem(1, false) } R.id.rbShareEvents -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + TrackUtils.trackV2xHistoryEvent(4) mVpEventPanel?.setCurrentItem(2, false) } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png index 6ab0b1547c..b1ab35dc0a 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png index 2466405ac2..e6a5e8d333 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png index 239b9eb114..07523abcbf 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index a7d161b299..7602d95ba0 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -1,7 +1,7 @@ - + - - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml index 376de58348..da72944890 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml index 12e6ec50cf..2b616f3e68 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml @@ -1,6 +1,6 @@ - + + android:paddingTop="@dimen/dp_40" + android:paddingBottom="@dimen/dp_40">