amos/android-new-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix: 简化布局文件，使用 LinearLayout 替代 ConstraintLayout
Android Release / release (push) Failing after 30s
Details

Browse Source
This commit is contained in:
CI Bot
2026-06-02 22:31:38 +08:00
parent d1fd9e977e
commit 0e45fb4c3f
1 changed files with 29 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_main.xml
+29 -58
View File
@@ -1,29 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/bg_gradient"> android:background="@drawable/bg_gradient">
<!-- 顶部菜单按钮 --> <!-- 顶部栏 -->
<LinearLayout <LinearLayout
android:id="@+id/headerMenu" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="16dp" android:padding="16dp"
app:layout_constraintTop_toTopOf="parent" android:gravity="end">
app:layout_constraintEnd_toEndOf="parent">
<ImageView <ImageView
android:id="@+id/btnMore" android:id="@+id/btnMore"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:src="@drawable/ic_more" android:src="@drawable/ic_more"
android:padding="8dp"
android:background="@drawable/bg_menu_button" android:background="@drawable/bg_menu_button"
android:padding="8dp"
android:contentDescription="更多"/> android:contentDescription="更多"/>
<ImageView <ImageView
@@ -31,8 +27,8 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:src="@drawable/ic_scan" android:src="@drawable/ic_scan"
android:padding="8dp"
android:background="@drawable/bg_menu_button" android:background="@drawable/bg_menu_button"
android:padding="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:contentDescription="扫描"/> android:contentDescription="扫描"/>
</LinearLayout> </LinearLayout>
@@ -40,17 +36,13 @@
<!-- 搜索栏 --> <!-- 搜索栏 -->
<LinearLayout <LinearLayout
android:id="@+id/searchBar" android:id="@+id/searchBar"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@drawable/bg_search" android:background="@drawable/bg_search"
android:padding="12dp" android:padding="12dp"
android:layout_marginStart="16dp" android:layout_margin="16dp"
android:layout_marginEnd="16dp" android:gravity="center_vertical">
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@id/headerMenu"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
@@ -64,21 +56,16 @@
android:text="@string/search_hint" android:text="@string/search_hint"
android:textColor="#999999" android:textColor="#999999"
android:textSize="16sp" android:textSize="16sp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"/>
android:layout_gravity="center_vertical"/>
</LinearLayout> </LinearLayout>
<!-- 功能网格 --> <!-- 功能网格 -->
<GridLayout <GridLayout
android:id="@+id/functionGrid" android:id="@+id/functionGrid"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:columnCount="4" android:columnCount="4"
android:rowCount="2" android:padding="16dp">
android:padding="16dp"
app:layout_constraintTop_toBottomOf="@id/searchBar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<!-- 备忘录 --> <!-- 备忘录 -->
<LinearLayout <LinearLayout
@@ -86,10 +73,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="12dp"> android:padding="8dp">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@@ -113,10 +99,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="12dp"> android:padding="8dp">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@@ -140,10 +125,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="12dp"> android:padding="8dp">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@@ -167,10 +151,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="12dp"> android:padding="8dp">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@@ -194,10 +177,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="12dp"> android:padding="8dp">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@@ -221,10 +203,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="12dp"> android:padding="8dp">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@@ -248,10 +229,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="12dp"> android:padding="8dp">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@@ -275,10 +255,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="12dp"> android:padding="8dp">
<ImageView <ImageView
android:layout_width="48dp" android:layout_width="48dp"
@@ -300,15 +279,13 @@
<!-- 消息提示 --> <!-- 消息提示 -->
<LinearLayout <LinearLayout
android:id="@+id/messageBanner" android:id="@+id/messageBanner"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@drawable/bg_message" android:background="@drawable/bg_message"
android:padding="12dp" android:padding="12dp"
android:layout_margin="16dp" android:layout_margin="16dp"
app:layout_constraintTop_toBottomOf="@id/functionGrid" android:gravity="center_vertical">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
@@ -322,22 +299,18 @@
android:text="@string/message_hint" android:text="@string/message_hint"
android:textColor="#666666" android:textColor="#666666"
android:textSize="14sp" android:textSize="14sp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"/>
android:layout_gravity="center_vertical"/>
</LinearLayout> </LinearLayout>
<!-- 博客卡片 --> <!-- 博客卡片 -->
<LinearLayout <LinearLayout
android:id="@+id/blogCard" android:id="@+id/blogCard"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/bg_card" android:background="@drawable/bg_card"
android:padding="16dp" android:padding="16dp"
android:layout_margin="16dp" android:layout_margin="16dp">
app:layout_constraintTop_toBottomOf="@id/messageBanner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -359,14 +332,12 @@
<!-- 底部导航 --> <!-- 底部导航 -->
<LinearLayout <LinearLayout
android:id="@+id/bottomNav" android:id="@+id/bottomNav"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@android:color/white" android:background="@android:color/white"
android:elevation="8dp" android:elevation="8dp"
app:layout_constraintBottom_toBottomOf="parent" android:layout_marginTop="0dp">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<!-- 首页 --> <!-- 首页 -->
<LinearLayout <LinearLayout
@@ -436,4 +407,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </LinearLayout>