From ef20591cba97b5c18b12b6ea3d0d751a6669d9d7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 26 三月 2025 14:22:04 +0800
Subject: [PATCH] fix 修改表字段前版本
---
app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt | 17 +++-----
app/src/main/res/layout/item_express_group.xml | 11 ++++-
app/src/main/res/layout/fragment_home.xml | 34 +++--------------
app/src/main/res/layout/item_express_package_home.xml | 2
4 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt b/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
index 623c67e..230fb9c 100644
--- a/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/example/firstapp/ui/home/HomeFragment.kt
@@ -8,18 +8,15 @@
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.example.firstapp.R
import com.example.firstapp.activity.PickupActivity
import com.example.firstapp.adapter.ExpressAdapter
import com.example.firstapp.adapter.FinanceAdapter
-import com.example.firstapp.core.Core
import com.example.firstapp.databinding.FragmentHomeBinding
class HomeFragment : Fragment() {
@@ -98,7 +95,7 @@
adapter = financeAdapter
// 设置初始状态 - 添加这行
- binding.financeContent.visibility = View.GONE
+ binding.financeRecycler.visibility = View.GONE
// 设置点击监听
financeAdapter.setOnPackageClickListener { group, pack ->
@@ -128,8 +125,8 @@
// 快递标签点击事件
tabExpress.setOnClickListener {
- expressContent.visibility = View.VISIBLE
- financeContent.visibility = View.GONE
+ expressRecycler.visibility = View.VISIBLE
+ financeRecycler.visibility = View.GONE
tabExpress.setTextColor(ContextCompat.getColor(requireContext(), R.color.tab_selected))
tabFinance.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
others.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
@@ -140,8 +137,8 @@
// 财务标签点击事件
tabFinance.setOnClickListener {
- expressContent.visibility = View.GONE
- financeContent.visibility = View.VISIBLE
+ expressRecycler.visibility = View.GONE
+ financeRecycler.visibility = View.VISIBLE
tabExpress.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
tabFinance.setTextColor(ContextCompat.getColor(requireContext(), R.color.tab_selected))
others.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
@@ -155,8 +152,8 @@
// 其他标签点击事件
others.setOnClickListener {
- expressContent.visibility = View.GONE
- financeContent.visibility = View.GONE
+ expressRecycler.visibility = View.GONE
+ financeRecycler.visibility = View.GONE
tabExpress.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
tabFinance.setTextColor(ContextCompat.getColor(requireContext(), R.color.gray))
others.setTextColor(ContextCompat.getColor(requireContext(), R.color.tab_selected))
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 79dd0bb..82554fe 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -69,39 +69,17 @@
android:layout_height="wrap_content"
android:layout_margin="16dp">
- <!-- 快递内容 -->
- <androidx.cardview.widget.CardView
- android:id="@+id/expressContent"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/express_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:cardBackgroundColor="@color/light_blue_50"
- app:cardCornerRadius="8dp"
- app:cardElevation="0dp">
+ android:padding="8dp"/>
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/express_recycler"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="8dp"/>
-
- </androidx.cardview.widget.CardView>
-
- <!-- 财务内容 -->
- <androidx.cardview.widget.CardView
- android:id="@+id/financeContent"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/finance_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:cardBackgroundColor="@color/light_blue_50"
- app:cardCornerRadius="8dp"
- app:cardElevation="0dp">
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/finance_recycler"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="8dp"/>
-
- </androidx.cardview.widget.CardView>
+ android:padding="8dp"/>
</FrameLayout>
diff --git a/app/src/main/res/layout/item_express_group.xml b/app/src/main/res/layout/item_express_group.xml
index 4a13e84..cd76b31 100644
--- a/app/src/main/res/layout/item_express_group.xml
+++ b/app/src/main/res/layout/item_express_group.xml
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- strokeColor黑色边框颜色 --> <!--strokeWidth 边框宽度 -->
+<com.google.android.material.card.MaterialCardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginVertical="6dp"
app:cardCornerRadius="8dp"
- app:cardElevation="2dp">
+ app:cardElevation="2dp"
+ app:cardBackgroundColor="@android:color/white"
+ app:strokeColor="#FF000000"
+ app:strokeWidth="2dp">
<LinearLayout
android:layout_width="match_parent"
@@ -51,4 +56,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_express_package_home.xml b/app/src/main/res/layout/item_express_package_home.xml
index a172550..ef12f23 100644
--- a/app/src/main/res/layout/item_express_package_home.xml
+++ b/app/src/main/res/layout/item_express_package_home.xml
@@ -30,7 +30,7 @@
android:id="@+id/tv_create_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="12sp"
+ android:textSize="10sp"
android:textColor="#666666"
android:layout_marginTop="4dp"/>
</LinearLayout>
--
Gitblit v1.9.3