yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jo' into dev

Browse Source
This commit is contained in:
liujing
2020-11-19 13:53:28 +08:00
parent c0217d559e d00003b837
commit fb43be4f51
2 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
View File

@@ -7,12 +7,51 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_v2x_event_list_item">
<ImageView
android:id="@+id/ivIconP"
android:layout_width="0px"
android:layout_height="0px"
android:src="@drawable/icon_illegal_parking"
app:layout_constraintRight_toLeftOf="@+id/tvAddress"
app:layout_constraintTop_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvAddress"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_30"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
app:layout_constraintStart_toStartOf="@id/tagEventType"
app:layout_constraintTop_toTopOf="parent"
tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
<TextView
android:id="@+id/tvIllegalNum"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:alpha="0.6"
android:gravity="center_vertical"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_26"
app:layout_constraintEnd_toEndOf="@+id/tvAddress"
app:layout_constraintStart_toStartOf="@+id/tvAddress"
app:layout_constraintTop_toBottomOf="@+id/tvAddress"
tools:text="违章人数：10人" />
<TextView
android:id="@+id/tagEventType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_36"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
android:paddingLeft="@dimen/dp_10"
@@ -22,8 +61,9 @@
android:text="违章停车"
android:textColor="#ffffff"
android:textSize="@dimen/panel_list_item_title_size"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvIllegalNum" />
<TextView
android:id="@+id/tagEventEvaluate"
@@ -41,49 +81,7 @@
android:textSize="@dimen/panel_list_item_title_size"
app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
app:layout_constraintStart_toEndOf="@+id/tagEventType"
app:layout_constraintTop_toTopOf="@+id/tagEventType" />
<ImageView
android:id="@+id/ivIconP"
android:layout_width="@dimen/module_v2x_history_event_icon_size"
android:layout_height="@dimen/module_v2x_history_event_icon_size"
android:layout_marginEnd="@dimen/dp_26"
android:src="@drawable/icon_illegal_parking"
app:layout_constraintRight_toLeftOf="@+id/tvAddress"
app:layout_constraintLeft_toLeftOf="@+id/tagEventType"
app:layout_constraintTop_toBottomOf="@+id/tagEventType"
app:layout_constraintTop_toTopOf="@+id/tvAddress" />
<TextView
android:id="@+id/tvAddress"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_30"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
app:layout_constraintTop_toBottomOf="@+id/tagEventType"
tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
<TextView
android:id="@+id/tvIllegalNum"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_24"
android:alpha="0.6"
android:gravity="center_vertical"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_26"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tvAddress"
app:layout_constraintStart_toStartOf="@+id/tvAddress"
app:layout_constraintTop_toBottomOf="@+id/tvAddress"
tools:text="违章人数：10人" />
app:layout_constraintTop_toTopOf="@+id/tagEventType" />¬
<com.mogo.module.v2x.view.HeartLikeView
android:id="@+id/llIllegalParkingLike"

4
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
View File

@@ -26,8 +26,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="今日出行遇到的交通事件"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_36"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_30"
app:layout_scrollFlags="scroll|enterAlways" />
<androidx.recyclerview.widget.RecyclerView