bug修复

consumer/src/main/java/com/xx/hbhconsumer/ui/hotsales/HotSalesActivity.java

@@ -48,6 +48,10 @@ public class HotSalesActivity extends BaseActivity<ActivityHotSalesBinding, HotS
             @Override
             public void onChanged(List<HotSalesBean> hotSalesBeanList) {
 
+                if (hotSalesBeanList.isEmpty()) {
+                    binding.refresh.setEnableLoadMore(false);
+                }
+
                 if (hotSalesBeanList.size() <= 3) {
                     hotSalesTop3GoodsAdapter.mList = hotSalesBeanList;
                     hotSalesTop3GoodsAdapter.notifyDataSetChanged();
@@ -60,6 +64,11 @@ public class HotSalesActivity extends BaseActivity<ActivityHotSalesBinding, HotS
                         binding.rvGoodsList.setVisibility(View.VISIBLE);
                     }
 
+                    if (viewModel.page == 1) {
+                        binding.refresh.finishRefresh();
+                    } else {
+                        binding.refresh.finishLoadMore();
+                    }
 
                 } else {
                     hotSalesTop3GoodsAdapter.mList = hotSalesBeanList.subList(0, 3);

consumer/src/main/java/com/xx/hbhconsumer/ui/search/SearchActivity.java

@@ -93,12 +93,16 @@ public class SearchActivity extends BaseActivity<ActivitySearchBinding, SearchVi
                     binding.tvShopNoMore.setVisibility(View.GONE);
                     binding.rvSearchShopList.setVisibility(View.GONE);
                     binding.rlSearchBar.setVisibility(View.VISIBLE);
+                    binding.nsvGoods.setVisibility(View.VISIBLE);
+                    binding.nsvShops.setVisibility(View.GONE);
                 } else {
                     binding.rvSearchGoodsList.setVisibility(View.GONE);
                     binding.tvGoodsNoMore.setVisibility(View.GONE);
                     binding.tvShopNoMore.setVisibility(View.VISIBLE);
                     binding.rvSearchShopList.setVisibility(View.VISIBLE);
                     binding.rlSearchBar.setVisibility(View.GONE);
+                    binding.nsvGoods.setVisibility(View.GONE);
+                    binding.nsvShops.setVisibility(View.VISIBLE);
                 }
                 binding.rlSearchTab.setVisibility(View.VISIBLE);
             }

consumer/src/main/res/layout/activity_search.xml

@@ -168,6 +168,7 @@
             </com.google.android.material.tabs.TabLayout>
         </RelativeLayout>
         <androidx.core.widget.NestedScrollView
+            android:id="@+id/nsv_goods"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/rl_search_bar">
@@ -190,6 +191,7 @@
                     android:layout_marginTop="14dp"
                     android:layout_marginBottom="14dp"
                     android:gravity="center"
+                    android:visibility="gone"
                     android:text="~ 没有更多啦 ~"
                     android:textSize="13sp"
                     android:textColor="#FF999999"/>
@@ -197,6 +199,7 @@
         </androidx.core.widget.NestedScrollView>
 
         <androidx.core.widget.NestedScrollView
+            android:id="@+id/nsv_shops"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/rl_search_bar">
@@ -221,6 +224,7 @@
                     android:layout_marginTop="14dp"
                     android:layout_marginBottom="14dp"
                     android:gravity="center"
+                    android:visibility="gone"
                     android:text="~ 没有更多啦 ~"
                     android:textSize="13sp"
                     android:textColor="#FF999999"/>