diff --git a/LLRiseTabBarDemo/.idea/misc.xml b/LLRiseTabBarDemo/.idea/misc.xml index 7026df5..eca1bb2 100644 --- a/LLRiseTabBarDemo/.idea/misc.xml +++ b/LLRiseTabBarDemo/.idea/misc.xml @@ -186,7 +186,7 @@ diff --git a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/activity/SearchResultsActivity.java b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/activity/SearchResultsActivity.java index 3cb80d8..9a91986 100644 --- a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/activity/SearchResultsActivity.java +++ b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/activity/SearchResultsActivity.java @@ -276,7 +276,7 @@ public class SearchResultsActivity extends AppCompatActivity implements SearchAd } // 设置区域选项点击事件 - 更新为新的区域选项 - String[] regions = {"北京", "上海", "广州", "深圳", "杭州", "成都", "武汉", "其他"}; + String[] regions = {"东丽", "宁河", "其他"}; // 全区域选项 TextView regionAll = dialog.findViewById(R.id.region_all); @@ -289,82 +289,28 @@ public class SearchResultsActivity extends AppCompatActivity implements SearchAd }); } - // 北京选项 - TextView regionBeijing = dialog.findViewById(R.id.region_beijing); + // 东丽选项 + TextView regionBeijing = dialog.findViewById(R.id.region_dongli); if (regionBeijing != null) { regionBeijing.setOnClickListener(v -> { - selectedRegion = "北京"; + selectedRegion = "东丽"; updateFilterUI(); applyFilters(); dialog.dismiss(); }); } - // 上海选项 - TextView regionShanghai = dialog.findViewById(R.id.region_shanghai); + // 宁河选项 + TextView regionShanghai = dialog.findViewById(R.id.region_ninghe); if (regionShanghai != null) { regionShanghai.setOnClickListener(v -> { - selectedRegion = "上海"; + selectedRegion = "宁河"; updateFilterUI(); applyFilters(); dialog.dismiss(); }); } - // 广州选项 - TextView regionGuangzhou = dialog.findViewById(R.id.region_guangzhou); - if (regionGuangzhou != null) { - regionGuangzhou.setOnClickListener(v -> { - selectedRegion = "广州"; - updateFilterUI(); - applyFilters(); - dialog.dismiss(); - }); - } - - // 深圳选项 - TextView regionShenzhen = dialog.findViewById(R.id.region_shenzhen); - if (regionShenzhen != null) { - regionShenzhen.setOnClickListener(v -> { - selectedRegion = "深圳"; - updateFilterUI(); - applyFilters(); - dialog.dismiss(); - }); - } - - // 杭州选项 - TextView regionHangzhou = dialog.findViewById(R.id.region_hangzhou); - if (regionHangzhou != null) { - regionHangzhou.setOnClickListener(v -> { - selectedRegion = "杭州"; - updateFilterUI(); - applyFilters(); - dialog.dismiss(); - }); - } - - // 成都选项 - TextView regionChengdu = dialog.findViewById(R.id.region_chengdu); - if (regionChengdu != null) { - regionChengdu.setOnClickListener(v -> { - selectedRegion = "成都"; - updateFilterUI(); - applyFilters(); - dialog.dismiss(); - }); - } - - // 武汉选项 - TextView regionWuhan = dialog.findViewById(R.id.region_wuhan); - if (regionWuhan != null) { - regionWuhan.setOnClickListener(v -> { - selectedRegion = "武汉"; - updateFilterUI(); - applyFilters(); - dialog.dismiss(); - }); - } // 其他选项 TextView regionOther = dialog.findViewById(R.id.region_other); @@ -501,12 +447,10 @@ public class SearchResultsActivity extends AppCompatActivity implements SearchAd private void setupRegionTags(Dialog dialog) { // 更新为新的区域 ID 数组 int[] regionIds = { - R.id.region_beijing, R.id.region_shanghai, R.id.region_guangzhou, - R.id.region_shenzhen, R.id.region_hangzhou, R.id.region_chengdu, - R.id.region_wuhan, R.id.region_other + R.id.region_dongli, R.id.region_ninghe, R.id.region_other }; - String[] regions = {"北京", "上海", "广州", "深圳", "杭州", "成都", "武汉", "其他"}; + String[] regions = {"东丽", "宁河", "其他"}; // 设置初始状态 for (int i = 0; i < regionIds.length; i++) { @@ -570,9 +514,7 @@ public class SearchResultsActivity extends AppCompatActivity implements SearchAd // 重置区域标签 - 使用新的 ID int[] regionIds = { - R.id.region_beijing, R.id.region_shanghai, R.id.region_guangzhou, - R.id.region_shenzhen, R.id.region_hangzhou, R.id.region_chengdu, - R.id.region_wuhan, R.id.region_other + R.id.region_dongli, R.id.region_ninghe, R.id.region_other }; for (int id : regionIds) { TextView regionView = dialog.findViewById(id); diff --git a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/HomeFragment.java b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/HomeFragment.java index 4ba07eb..41baba1 100644 --- a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/HomeFragment.java +++ b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/HomeFragment.java @@ -182,10 +182,10 @@ public class HomeFragment extends Fragment implements SearchAdapter.OnProductCli if (productList.isEmpty()) { Log.d(TAG, "DataManager中没有数据，使用示例数据"); productList = new ArrayList<>(); - productList.add(new Product("1", "Java编程思想", "计算机专业教材", "学习资料", 45.0, "", 0, "北京", "卖家信用极好", true, "138****1234")); - productList.add(new Product("2", "高等数学教材", "大学数学课本", "学习资料", 30.0, "", 0, "上海", "百分百好评", false, "微信：abc123")); - productList.add(new Product("3", "笔记本电脑", "二手联想笔记本", "数码产品", 1200.0, "", 0, "广州", "卖家信用良好", true, "159****5678")); - productList.add(new Product("4", "台灯", "护眼学习台灯", "生活用品", 25.0, "", 0, "深圳", "卖家信用极好", false, "QQ：123456789")); + productList.add(new Product("1", "Java编程思想", "计算机专业教材", "学习资料", 45.0, "", 0, "东丽", "卖家信用极好", true, "138****1234")); + productList.add(new Product("2", "高等数学教材", "大学数学课本", "学习资料", 30.0, "", 0, "宁河", "百分百好评", false, "微信：abc123")); + productList.add(new Product("3", "笔记本电脑", "二手联想笔记本", "数码产品", 1200.0, "", 0, "东丽", "卖家信用良好", true, "159****5678")); + productList.add(new Product("4", "台灯", "护眼学习台灯", "生活用品", 25.0, "", 0, "宁河", "卖家信用极好", false, "QQ：123456789")); } else { Log.d(TAG, "使用DataManager中的数据"); } diff --git a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/ItemDetailFragment.java b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/ItemDetailFragment.java index a924916..ac6be0d 100644 --- a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/ItemDetailFragment.java +++ b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/ItemDetailFragment.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -82,6 +83,15 @@ public class ItemDetailFragment extends Fragment { TextView tvContact = view.findViewById(R.id.tvContact); TextView tvPublishTime = view.findViewById(R.id.tvPublishTime); + // +++ 新增：获取返回按钮并设置点击监听 +++ + ImageButton backButton = view.findViewById(R.id.back_button); + backButton.setOnClickListener(v -> { + // 关闭当前Fragment或Activity + if (getActivity() != null) { + getActivity().onBackPressed(); + } + }); + // 设置商品信息 tvTitle.setText(item.getTitle()); tvPrice.setText(String.format("¥%.2f", item.getPrice())); diff --git a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/PublishFragment.java b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/PublishFragment.java index 3827e52..04fdfa2 100644 --- a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/PublishFragment.java +++ b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/fragment/PublishFragment.java @@ -81,7 +81,7 @@ public class PublishFragment extends Fragment { categoryAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spinnerCategory.setAdapter(categoryAdapter); - String[] locations = {"北京", "上海", "广州", "深圳", "杭州", "成都", "武汉", "其他"}; + String[] locations = {"东丽", "宁河", "其他"}; ArrayAdapter locationAdapter = new ArrayAdapter<>( requireContext(), android.R.layout.simple_spinner_item, locations); locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); diff --git a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/model/Product.java b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/model/Product.java index 19d18c2..16fe8ff 100644 --- a/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/model/Product.java +++ b/LLRiseTabBarDemo/app/src/main/java/com/startsmake/llrisetabbardemo/model/Product.java @@ -18,7 +18,7 @@ public class Product implements Serializable { public Product() { this.wantCount = 0; // 默认0人想要 - this.location = "北京"; // 默认地区 + this.location = "东丽"; // 默认地区 this.sellerRating = "卖家信用良好"; // 默认信用 this.freeShipping = false; // 默认不包邮 } @@ -31,7 +31,7 @@ public class Product implements Serializable { this.price = price; this.imageUrl = imageUrl; this.wantCount = 0; // 默认0人想要 - this.location = "北京"; // 默认地区 + this.location = "东丽"; // 默认地区 this.sellerRating = "卖家信用良好"; // 默认信用 this.freeShipping = false; // 默认不包邮 } diff --git a/LLRiseTabBarDemo/app/src/main/java/manager/DataManager.java b/LLRiseTabBarDemo/app/src/main/java/manager/DataManager.java index 2761ce4..3c5c58f 100644 --- a/LLRiseTabBarDemo/app/src/main/java/manager/DataManager.java +++ b/LLRiseTabBarDemo/app/src/main/java/manager/DataManager.java @@ -171,7 +171,7 @@ public class DataManager { item1.setDescription("全新未拆封，256GB，远峰蓝色，国行正品，带发票"); item1.setPrice(6999.00); item1.setCategory("数码产品"); - item1.setLocation("北京"); + item1.setLocation("东丽"); item1.setContact("138****1234"); item1.setPublishTime(System.currentTimeMillis() - 2 * 60 * 60 * 1000); // 2小时前发布 item1.setWantCount(5); // 设置初始想要人数 @@ -184,7 +184,7 @@ public class DataManager { item2.setDescription("联想小新，i5处理器，8GB内存，256GB固态硬盘，95成新"); item2.setPrice(2500.00); item2.setCategory("数码产品"); - item2.setLocation("上海"); + item2.setLocation("东丽"); item2.setContact("微信：abc123"); item2.setPublishTime(System.currentTimeMillis() - 5 * 60 * 60 * 1000); // 5小时前发布 item2.setWantCount(3); // 设置初始想要人数 @@ -197,7 +197,7 @@ public class DataManager { item3.setDescription("耐克运动鞋，42码，只穿过几次，几乎全新，原盒在"); item3.setPrice(299.00); item3.setCategory("服装鞋帽"); - item3.setLocation("广州"); + item3.setLocation("宁河"); item3.setContact("159****5678"); item3.setPublishTime(System.currentTimeMillis() - 24 * 60 * 60 * 1000); // 1天前发布 item3.setWantCount(8); // 设置初始想要人数 @@ -210,7 +210,7 @@ public class DataManager { item4.setDescription("Java编程思想第5版，几乎全新，无笔记无划痕"); item4.setPrice(45.00); item4.setCategory("图书文具"); - item4.setLocation("杭州"); + item4.setLocation("东丽"); item4.setContact("QQ：123456789"); item4.setPublishTime(System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000); // 3天前发布 item4.setWantCount(12); // 设置初始想要人数 @@ -297,7 +297,7 @@ public class DataManager { item.setWantCount(0); // 设置默认位置，因为 ProductResponse 可能没有 location 字段 - item.setLocation("北京"); // 或者从其他地方获取，或者设置为空 + item.setLocation("东丽"); // 或者从其他地方获取，或者设置为空 items.add(item); } diff --git a/LLRiseTabBarDemo/app/src/main/res/layout/dialog_filter.xml b/LLRiseTabBarDemo/app/src/main/res/layout/dialog_filter.xml index adde062..71ed9c6 100644 --- a/LLRiseTabBarDemo/app/src/main/res/layout/dialog_filter.xml +++ b/LLRiseTabBarDemo/app/src/main/res/layout/dialog_filter.xml @@ -277,13 +277,13 @@ android:layout_marginBottom="8dp"> - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/LLRiseTabBarDemo/app/src/main/res/layout/dialog_region_filter.xml b/LLRiseTabBarDemo/app/src/main/res/layout/dialog_region_filter.xml index a726da7..b7d784d 100644 --- a/LLRiseTabBarDemo/app/src/main/res/layout/dialog_region_filter.xml +++ b/LLRiseTabBarDemo/app/src/main/res/layout/dialog_region_filter.xml @@ -34,10 +34,10 @@ android:layout_marginVertical="8dp" /> - - - - - - - - - - - + android:orientation="vertical" + android:background="#F5F7FA"> + + android:background="@drawable/gradient_header" + android:orientation="horizontal" + android:padding="1dp" + android:elevation="4dp"> + + + + + + + + + + + + + + + + + + - + android:src="@mipmap/ic_launcher" /> - - + + + + + + android:text="商品标题" + android:textSize="18sp" + android:textStyle="bold" /> - + + - + - + - + + + + + android:orientation="horizontal" + android:gravity="center_vertical"> + + + android:textStyle="bold" + android:layout_marginStart="8dp" /> + - + - + - + + + + + android:orientation="horizontal" + android:gravity="center_vertical"> + + - - - - + android:textStyle="bold" + android:layout_marginStart="8dp" /> + - + - + - + - -