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">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
index 7bd7a12d7a..251c55419e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
@@ -5,9 +5,6 @@
android:id="@+id/rlContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="10px"
- android:layout_marginRight="10px"
- android:layout_marginBottom="14px"
android:background="@drawable/bg_v2x_event_list_item">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index 4639a92675..03bb4325ce 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -13,10 +13,11 @@
@@ -27,17 +28,17 @@
android:button="@null"
android:checked="true"
android:gravity="center"
- android:paddingStart="@dimen/dp_40"
- android:paddingEnd="@dimen/dp_40"
+ android:paddingStart="@dimen/dp_48"
+ android:paddingEnd="@dimen/dp_35"
android:text="出行动态"
android:textColor="@color/radiobutton_textcolor"
- android:textSize="@dimen/dp_40"
+ android:textSize="@dimen/dp_36"
android:textStyle="bold" />
+ android:background="#CE757575" />
+ android:textSize="@dimen/dp_36" />
+ android:background="#CE757575" />
+ android:textSize="@dimen/dp_36" />
-
-
-
-
-
+
+
+
+
+
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
index ade8f9ebe6..d02313fb49 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
@@ -13,27 +13,27 @@
tools:visibility="visible" />
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingStart="@dimen/dp_48"
+ android:paddingEnd="@dimen/dp_48">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index f35d333ec2..ba0580b33c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -27,8 +27,9 @@
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/share_empty_btn_padding"
+ android:paddingBottom="@dimen/dp_10">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index e85015dc28..5b9ea8d44f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -13,7 +13,7 @@
android:id="@+id/road_case_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="20px"
+ android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
@@ -76,7 +76,7 @@
android:layout_toLeftOf="@id/road_case_uselful"
android:ellipsize="end"
android:gravity="left"
- android:layout_marginTop="@dimen/dp_24"
+ android:layout_marginTop="@dimen/dp_12"
android:lines="1"
android:text="东城区北三环附近维多欧美"
android:textColor="@color/v2x_FFF_333"
@@ -88,7 +88,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/road_case_address"
android:layout_alignLeft="@id/road_case_style"
- android:layout_marginTop="@dimen/dp_10"
+ android:layout_marginTop="@dimen/dp_3"
android:layout_marginBottom="@dimen/dp_24"
android:alpha="0.5"
android:gravity="left"
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index b16f4bb593..3ebb6bb0f5 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -73,5 +73,7 @@
29px
-8px
+ 84px
+
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 3d3e928c43..deaa4519ee 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -54,7 +54,8 @@
28px
16px
42px
- 16px
120px
+ 158px
+
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 780529c46a..2c46bd98ac 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -72,5 +72,7 @@
-10px
114px
+ 158px
+
diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml
index 38626c8a0e..ab2038889e 100644
--- a/modules/mogo-module-v2x/src/main/res/values/colors.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml
@@ -9,7 +9,7 @@
#B3FFFFFF
#1F2131
#10121E
- #99FFFFFF
+ #4BFFFFFF
#FFFFFF
#FFFFFF
#ff616381
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index cec87bea7c..ca37a6f59e 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -74,5 +74,7 @@
-8px
+ 84px
+
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png
new file mode 100644
index 0000000000..5d2560955c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
new file mode 100644
index 0000000000..f68dcac5f8
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png
new file mode 100644
index 0000000000..b531156ba1
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml
deleted file mode 100644
index 9f1369808c..0000000000
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png
deleted file mode 100644
index 245c2e855c..0000000000
Binary files a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png and /dev/null differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png
index 36ea7d6655..5ff5526ff8 100644
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png
index 245c2e855c..9954c018db 100644
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png
index c351b20250..61d0b6c1d5 100644
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
index b41bb1f336..48d0b7deb6 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
@@ -1,7 +1,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
index fc0bfb4660..c665f666f0 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
@@ -1,7 +1,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml
index 1c9c0b5e05..e74f11358f 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml
@@ -4,7 +4,7 @@
@@ -13,7 +13,7 @@
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
index b05b80f6bd..4eb258787e 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
@@ -8,7 +8,7 @@
#333333
#FFFFFF
#FFFFFF
- #333333
+ #CB333333
#999999
#B2333333
#666666