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

「优化」

Browse Source 
调整布局
This commit is contained in:
董宏宇
2020-08-05 11:47:03 +08:00
parent 6399ac6e84
commit b4bc267537
6 changed files with 135 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
View File

@@ -55,7 +55,7 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL
private void init(Context context) {
mContext = context;
LayoutInflater.from(context).inflate(R.layout.dialog_v2x_common, this);
LayoutInflater.from(context).inflate(R.layout.dialog_v2x_seek_help, this);
tvContent = findViewById(R.id.tvDialogContent);
tvLeft = findViewById(R.id.tvDialogLeft);
tvRight = findViewById(R.id.tvDialogRight);

0
modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_common.xml → modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
View File

78
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
View File

@@ -121,9 +121,77 @@
app:miv_shape="circle"
app:miv_shapeBorderWidth="@dimen/dp_4" />
<include
android:id="@+id/event_button"
layout="@layout/merge_view_event_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView
android:id="@+id/ivEventLive"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_10"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_live_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventImg"
app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventReportTrue"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:scaleType="fitXY"
android:src="@drawable/icon_report_true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventLive"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventReportErr"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:src="@drawable/icon_report_err"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventReportTrue"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventCallChart"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventEventNav"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_nav_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventCallChart"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventZan"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:src="@drawable/v2x_event_icon_zan"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
</com.mogo.module.v2x.view.RoundConstraintLayout>

65
modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -51,13 +52,69 @@
app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
app:layout_constraintStart_toStartOf="@+id/rlRoadEventList" />
<include
android:id="@+id/bottomButton"
layout="@layout/merge_view_bottom_button"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_25"
app:layout_constraintBottom_toBottomOf="@+id/guideline1"
app:layout_constraintStart_toStartOf="@+id/guideline1"
app:layout_constraintTop_toTopOf="@+id/guideline1" />
app:layout_constraintTop_toTopOf="@+id/guideline1">
<ImageView
android:id="@+id/ivRoadReportTrue"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:layout_marginStart="@dimen/dp_25"
android:padding="@dimen/dp_10"
android:src="@drawable/icon_report_true"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivRoadReportErr"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:padding="@dimen/dp_10"
android:src="@drawable/icon_report_err"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ivRoadReportTrue"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivRoadCallChart"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ivRoadReportErr"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivRoadEventNav"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_nav_btn"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ivRoadCallChart"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivRoadEventLike"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:padding="@dimen/dp_10"
android:src="@drawable/v2x_event_icon_zan"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ivRoadEventNav"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

64
modules/mogo-module-v2x/src/main/res/layout/merge_view_bottom_button.xml
View File

@@ -1,64 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_25">
<ImageView
android:id="@+id/ivRoadReportTrue"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:layout_marginStart="@dimen/dp_25"
android:padding="@dimen/dp_10"
android:src="@drawable/icon_report_true"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivRoadReportErr"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:padding="@dimen/dp_10"
android:src="@drawable/icon_report_err"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ivRoadReportTrue"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivRoadCallChart"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ivRoadReportErr"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivRoadEventNav"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_nav_btn"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ivRoadCallChart"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivRoadEventLike"
android:layout_width="@dimen/dp_123"
android:layout_height="@dimen/dp_123"
android:padding="@dimen/dp_10"
android:src="@drawable/v2x_event_icon_zan"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ivRoadEventNav"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

82
modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml
View File

@@ -1,82 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<ImageView
android:id="@+id/ivEventLive"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_10"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_live_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventImg"
app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventReportTrue"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:scaleType="fitXY"
android:src="@drawable/icon_report_true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventLive"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventReportErr"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:src="@drawable/icon_report_err"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventReportTrue"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventCallChart"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventEventNav"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:src="@drawable/selector_nav_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventCallChart"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivEventZan"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:src="@drawable/v2x_event_icon_zan"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
</merge>