From 252736e890fd50550ab9dec218159356e2a953c1 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期四, 18 七月 2024 17:51:37 +0800
Subject: [PATCH] fix bug
---
app/src/main/res/layout/fragment_include.xml | 106 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 40 deletions(-)
diff --git a/app/src/main/res/layout/fragment_include.xml b/app/src/main/res/layout/fragment_include.xml
index 6f9ee32..c8a2a56 100644
--- a/app/src/main/res/layout/fragment_include.xml
+++ b/app/src/main/res/layout/fragment_include.xml
@@ -12,13 +12,13 @@
android:layout_height="0dp"
android:padding="4dp"
android:elevation="2dp"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="14dp"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintVertical_chainStyle="packed"
android:background="@drawable/bg_white_8dp"
app:layout_constraintTop_toBottomOf="@id/cl_voice1"
app:layout_constraintBottom_toTopOf="@id/cl_4"
- android:layout_marginBottom="140dp"
+ android:layout_marginBottom="130dp"
app:layout_constraintDimensionRatio="3:2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/cl_2"
@@ -82,7 +82,7 @@
android:layout_height="0dp"
android:padding="4dp"
android:elevation="2dp"
- android:layout_marginBottom="10dp"
+ android:layout_marginBottom="5dp"
app:layout_constraintTop_toBottomOf="@id/cl_1"
android:background="@drawable/bg_white_8dp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -143,18 +143,22 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="159dp"
- android:layout_height="52dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
app:layout_constraintStart_toStartOf="@id/cl_1"
+ app:layout_constraintEnd_toEndOf="@id/cl_1"
+ app:layout_constraintDimensionRatio="3:1"
app:layout_constraintTop_toTopOf="parent"
- android:layout_marginTop="24dp"
+ android:layout_marginTop="15dp"
android:id="@+id/cl_voice1"
android:layout_marginStart="4dp"
+ android:layout_marginEnd="40dp"
android:background="@drawable/selector_bg_voice">
<ImageView
android:id="@+id/iv1_1"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/yuyin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -163,7 +167,8 @@
<ImageView
android:id="@+id/iv2_1"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/play"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -181,18 +186,21 @@
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="159dp"
- android:layout_height="52dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
app:layout_constraintStart_toStartOf="@id/cl_2"
- app:layout_constraintTop_toTopOf="parent"
- android:layout_marginTop="24dp"
+ app:layout_constraintEnd_toEndOf="@id/cl_2"
+ app:layout_constraintDimensionRatio="3:1"
+ app:layout_constraintTop_toTopOf="@id/cl_voice1"
android:id="@+id/cl_voice2"
android:layout_marginStart="4dp"
+ android:layout_marginEnd="40dp"
android:background="@drawable/selector_bg_voice">
<ImageView
android:id="@+id/iv1_2"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/yuyin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -201,7 +209,8 @@
<ImageView
android:id="@+id/iv2_2"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/play"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -219,18 +228,21 @@
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="159dp"
- android:layout_height="52dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
app:layout_constraintStart_toStartOf="@id/cl_3"
- app:layout_constraintTop_toTopOf="parent"
- android:layout_marginTop="24dp"
+ app:layout_constraintEnd_toEndOf="@id/cl_3"
+ app:layout_constraintDimensionRatio="3:1"
+ app:layout_constraintTop_toTopOf="@id/cl_voice1"
android:id="@+id/cl_voice3"
android:layout_marginStart="4dp"
+ android:layout_marginEnd="40dp"
android:background="@drawable/selector_bg_voice">
<ImageView
android:id="@+id/iv1_3"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/yuyin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -239,7 +251,8 @@
<ImageView
android:id="@+id/iv2_3"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/play"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -257,18 +270,22 @@
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="159dp"
- android:layout_height="52dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
app:layout_constraintStart_toStartOf="@id/cl_4"
+ app:layout_constraintEnd_toEndOf="@id/cl_4"
+ app:layout_constraintDimensionRatio="3:1"
app:layout_constraintBottom_toTopOf="@id/cl_4"
- android:layout_marginBottom="20dp"
+ android:layout_marginBottom="14dp"
android:id="@+id/cl_voice4"
android:layout_marginStart="4dp"
+ android:layout_marginEnd="40dp"
android:background="@drawable/selector_bg_voice">
<ImageView
android:id="@+id/iv1_4"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/yuyin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -277,7 +294,8 @@
<ImageView
android:id="@+id/iv2_4"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/play"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -295,18 +313,21 @@
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="159dp"
- android:layout_height="52dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
app:layout_constraintStart_toStartOf="@id/cl_5"
- app:layout_constraintBottom_toTopOf="@id/cl_5"
- android:layout_marginBottom="20dp"
+ app:layout_constraintEnd_toEndOf="@id/cl_5"
+ app:layout_constraintDimensionRatio="3:1"
+ android:layout_marginEnd="40dp"
+ app:layout_constraintTop_toTopOf="@id/cl_voice4"
android:id="@+id/cl_voice5"
android:layout_marginStart="4dp"
android:background="@drawable/selector_bg_voice">
<ImageView
android:id="@+id/iv1_5"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/yuyin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -315,7 +336,8 @@
<ImageView
android:id="@+id/iv2_5"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/play"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -333,18 +355,21 @@
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="159dp"
- android:layout_height="52dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
app:layout_constraintStart_toStartOf="@id/cl_6"
- app:layout_constraintBottom_toTopOf="@id/cl_6"
- android:layout_marginBottom="20dp"
+ app:layout_constraintEnd_toEndOf="@id/cl_6"
+ app:layout_constraintDimensionRatio="3:1"
+ android:layout_marginEnd="40dp"
+ app:layout_constraintTop_toTopOf="@id/cl_voice4"
android:id="@+id/cl_voice6"
android:layout_marginStart="4dp"
android:background="@drawable/selector_bg_voice">
<ImageView
android:id="@+id/iv1_6"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/yuyin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -353,7 +378,8 @@
<ImageView
android:id="@+id/iv2_6"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="6dp"
android:src="@mipmap/play"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -412,7 +438,7 @@
android:elevation="2dp"
app:layout_constraintTop_toBottomOf="@id/cl_3"
android:layout_marginEnd="23dp"
- android:layout_marginTop="8dp">
+ android:layout_marginTop="6dp">
<ImageView
android:id="@+id/iv_error_3"
android:layout_width="42dp"
@@ -442,7 +468,7 @@
app:layout_constraintEnd_toStartOf="@id/cl_answer_3"
app:layout_constraintTop_toBottomOf="@id/cl_3"
android:layout_marginEnd="5dp"
- android:layout_marginTop="8dp">
+ android:layout_marginTop="6dp">
<ImageView
android:id="@+id/iv_error_2"
android:layout_width="42dp"
@@ -472,7 +498,7 @@
app:layout_constraintEnd_toStartOf="@id/cl_answer_2"
app:layout_constraintTop_toBottomOf="@id/cl_3"
android:layout_marginEnd="5dp"
- android:layout_marginTop="8dp">
+ android:layout_marginTop="6dp">
<ImageView
android:id="@+id/iv_error_1"
android:layout_width="42dp"
--
Gitblit v1.7.1