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

fix: 使用 ScrollView + LinearLayout 替代 GridLayout
Android Release / release (push) Failing after 31s
Details

Browse Source
This commit is contained in:
CI Bot
2026-06-02 22:45:16 +08:00
parent 7c4e48f3bc
commit d0b42566dc
1 changed files with 393 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_main.xml
+37 -27
View File
@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/bg_gradient">
android:background="@drawable/bg_gradient"
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- 顶部栏 -->
<LinearLayout
@@ -59,20 +64,18 @@
android:layout_marginStart="12dp"/>
</LinearLayout>
<!-- 功能网格 -->
<GridLayout
android:id="@+id/functionGrid"
<!-- 功能网格 - 第一行 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="4"
android:padding="16dp">
android:orientation="horizontal"
android:padding="8dp">
<!-- 备忘录 -->
<LinearLayout
android:id="@+id/btnMemo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="8dp">
@@ -93,12 +96,11 @@
android:layout_marginTop="4dp"/>
</LinearLayout>
<!-- 二维码 -->
<LinearLayout
android:id="@+id/btnQRCode"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="8dp">
@@ -119,12 +121,11 @@
android:layout_marginTop="4dp"/>
</LinearLayout>
<!-- 谁在干活 -->
<LinearLayout
android:id="@+id/btnWhoWorking"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="8dp">
@@ -145,12 +146,11 @@
android:layout_marginTop="4dp"/>
</LinearLayout>
<!-- PVE -->
<LinearLayout
android:id="@+id/btnPVE"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="8dp">
@@ -170,13 +170,20 @@
android:textSize="12sp"
android:layout_marginTop="4dp"/>
</LinearLayout>
</LinearLayout>
<!-- 功能网格 - 第二行 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
<!-- 快递 -->
<LinearLayout
android:id="@+id/btnExpress"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="8dp">
@@ -197,12 +204,11 @@
android:layout_marginTop="4dp"/>
</LinearLayout>
<!-- 纪念日 -->
<LinearLayout
android:id="@+id/btnAnniversary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="8dp">
@@ -223,12 +229,11 @@
android:layout_marginTop="4dp"/>
</LinearLayout>
<!-- 记账 -->
<LinearLayout
android:id="@+id/btnAccounting"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="8dp">
@@ -249,12 +254,11 @@
android:layout_marginTop="4dp"/>
</LinearLayout>
<!-- 资料 -->
<LinearLayout
android:id="@+id/btnMaterials"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="8dp">
@@ -274,7 +278,7 @@
android:textSize="12sp"
android:layout_marginTop="4dp"/>
</LinearLayout>
</GridLayout>
</LinearLayout>
<!-- 消息提示 -->
<LinearLayout
@@ -329,6 +333,12 @@
android:layout_marginTop="8dp"/>
</LinearLayout>
<!-- 占位空间，把底部导航推到底部 -->
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<!-- 底部导航 -->
<LinearLayout
android:id="@+id/bottomNav"
@@ -336,8 +346,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@android:color/white"
android:elevation="8dp"
android:layout_marginTop="0dp">
android:elevation="8dp">
<!-- 首页 -->
<LinearLayout
@@ -408,3 +417,4 @@
</LinearLayout>
</LinearLayout>
</ScrollView>