Merge branch 'gg' into dev

This commit is contained in:
liujing
2020-11-29 10:58:09 +08:00
5 changed files with 5 additions and 5 deletions

View File

@@ -63,7 +63,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder<V2XHistoryS
mTagEventType.setText(EventTypeUtils.getPoiTypeStr(mExploreWay.getPoiType()));
try {
mTvIllegalNum.setText(mExploreWay.getUserInfo().getUserName() + "的分享 " +
mTvIllegalNum.setText(mExploreWay.getUserInfo().getUserName() + "的分享 " +
TimeUtils.millis2String(mOldScenarioData.getTriggerTime(), "MM月dd日 HH:mm"));
} catch (Exception e) {
e.printStackTrace();

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_24"/>
<corners android:radius="@dimen/dp_22"/>
<gradient
android:startColor="#B35E6079"
android:endColor="#B33F4057"

View File

@@ -25,7 +25,7 @@
android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
android:gravity="center_vertical"
android:text="周围5公里共15条交通信息"
android:textColor="@color/v2x_white"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
<!-- android:layout_centerInParent="true"-->

View File

@@ -39,7 +39,7 @@
android:layout_alignTop="@+id/road_case_style"
android:layout_toLeftOf="@id/road_case_useless"
android:gravity="left"
android:paddingRight="@dimen/dp_28"
android:paddingRight="@dimen/dp_35"
android:text="100"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/share_item_text_size" />

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_21"/>
<corners android:radius="@dimen/dp_22"/>
<gradient
android:startColor="#579EFF"