1:修改排行榜页面，

2：修改拍卖房刷新数据
3：修改交友房刷新数据

moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutSingManager.java

@@ -1,5 +1,6 @@
 package com.xscm.moduleutil.widget;
 
+import android.app.Activity;
 import android.content.Context;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -17,6 +18,8 @@ import com.xscm.moduleutil.utils.SpUtil;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * @Author lxj$
@@ -50,97 +53,30 @@ public class WheatLayoutSingManager {
         this.container = container;
     }
 
-    public void setWheatData(List<RoomPitBean> pitList) {
+    public void setWheatData(List<RoomPitBean> pitList, boolean isFirst) {
         // 检查容器状态
-        if (container == null || !isContainerValid()) {
+        if (container == null) {
             return;
         }
 
         this.pitList = pitList;
-        restoreMultiWheat();
-    }
-
-    public void setWheatDataPk(List<RoomPitBean> pitList, int layoutType) {
-        // 检查容器状态
-        if (container == null || !isContainerValid()) {
-            return;
-        }
-
-        this.pitList = pitList;
-        restoreMultiWheatPk(layoutType);
+        restoreMultiWheat(isFirst);
     }
 
     public void setOnWheatClickListener(@Nullable OnWheatClickListener listener) {
         this.wheatClickListener = listener;
     }
 
-    public void showSingleWheat(int pitNumber) {
+    public void restoreMultiWheat(boolean isFirst) {
         // 检查容器状态
-        if (container == null || !isContainerValid()) {
-            return;
-        }
-
-        if (isSingleMode && this.currentSinglePit == pitNumber) return;
-
-        try {
-            container.removeAllViews();
-        } catch (Exception e) {
-            // 忽略异常，继续执行
-            return;
-        }
-
-        if (pitNumber < 1 || pitNumber > 10 || pitList == null || pitList.size() < 10)
-            return;
-
-        RoomPitBean bean = pitList.get(pitNumber - 1);
-
-        singleWheatView = new RoomSingSongWheatView(context);
-        singleWheatView.pitNumber = String.valueOf(pitNumber);
-        singleWheatView.setData(bean);
-
-        // 默认设置为 MATCH_PARENT，也可以自定义
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        params.setMargins(20, 20, 20, 20);
-        singleWheatView.setLayoutParams(params);
-
-        GifAvatarOvalView avatarView = (GifAvatarOvalView) singleWheatView.mRiv;
-        avatarView.setOnClickListener(v -> {
-            if (wheatClickListener != null) {
-                wheatClickListener.onWheatClick(singleWheatView, pitNumber);
-            }
-            restoreMultiWheat();
-        });
-
-        WheatCharmView charmView = singleWheatView.mCharmView;
-        charmView.setOnClickListener(v -> {
-            if (wheatClickListener != null) {
-                wheatClickListener.onMeilingClick(singleWheatView, Integer.parseInt(singleWheatView.pitNumber));
-            }
-        });
-//        // 添加点击事件
-        singleWheatView.setOnClickListener(v -> {
-            if (wheatClickListener != null) {
-               wheatClickListener.onMakeWheatClick(singleWheatView, pitNumber);
-            }
-            restoreMultiWheat();
-        });
-
-        container.addView(singleWheatView);
-        isSingleMode = true;
-        currentSinglePit = pitNumber;
-    }
-
-    public void restoreMultiWheat() {
-        // 检查容器状态
-        if (container == null || !isContainerValid()) {
+        if (container == null) {
             return;
         }
 
         try {
-            container.removeAllViews();
+            if (multiWheatViews != null && multiWheatViews.size()  != 10) {
+                container.removeAllViews();
+            }
         } catch (Exception e) {
             // 忽略异常，继续执行
             return;
@@ -150,86 +86,131 @@ public class WheatLayoutSingManager {
             return;
         }
 
-        multiWheatViews.clear();
+//        multiWheatViews.clear();
 
         int screenWidth = getScreenWidth();
         int itemWidth = screenWidth / 4; // 每个控件宽度为屏幕宽度的 1/4
 
         LinearLayout row = new LinearLayout(context);
         row.setOrientation(LinearLayout.HORIZONTAL);
+        if (multiWheatViews.size() == 10){
+            for (int i = 0; i < multiWheatViews.size(); i++){
+                multiWheatViews.get(i).setData(pitList.get(pitIndexMap[i] - 1));
+            }
+        }else {
+            for (int i = 0; i < 10; i++) {
+                int pitNumber = pitIndexMap[i];
+                if (isFirst){
+                    RoomSingSongWheat2View wheatView = new RoomSingSongWheat2View( context);
+                    wheatView.pitNumber = String.valueOf(pitNumber);
+                    wheatView.setData(pitList.get(pitNumber - 1));
 
-        for (int i = 0; i < 10; i++) {
-            int pitNumber = pitIndexMap[i];
-            RoomSingSongWheatView wheatView = new RoomSingSongWheatView(context);
-            wheatView.pitNumber = String.valueOf(pitNumber);
-            wheatView.setData(pitList.get(pitNumber - 1));
-            multiWheatViews.add(wheatView);
-            LinearLayout.LayoutParams params;
+                    LinearLayout.LayoutParams params;
+                    if (i == 0) {
+                        int fixedHeightInDp = 110; // 固定高度为 100dp
+                        int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
+                        // 第一个控件：左边距 86dp，右边距 100dp
+                        params = new LinearLayout.LayoutParams(itemWidth, fixedHeightInPx);
+                        params.rightMargin = dpToPx(50);
+                    } else if (i == 1) {
+                        int fixedHeightInDp = 110; // 固定高度为 100dp
+                        int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
+                        // 第二个控件：右边距 86dp
+                        params = new LinearLayout.LayoutParams(itemWidth, fixedHeightInPx);
+                    } else {
+                        int fixedHeightInDp = 90; // 固定高度为 100dp
+                        int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
+                        params = new LinearLayout.LayoutParams(itemWidth - 30, fixedHeightInPx + 30);
+                        // 其他控件保持原有逻辑
 
-            if (i == 0) {
-                int fixedHeightInDp = 110; // 固定高度为 100dp
-                int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
-                // 第一个控件：左边距 86dp，右边距 100dp
-                params = new LinearLayout.LayoutParams(itemWidth, fixedHeightInPx);
-                params.rightMargin = dpToPx(50);
-            } else if (i == 1) {
-                int fixedHeightInDp = 110; // 固定高度为 100dp
-                int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
-                // 第二个控件：右边距 86dp
-                params = new LinearLayout.LayoutParams(itemWidth, fixedHeightInPx);
-            } else {
-                int fixedHeightInDp = 90; // 固定高度为 100dp
-                int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
-                params = new LinearLayout.LayoutParams(itemWidth - 30, fixedHeightInPx + 30);
-                // 其他控件保持原有逻辑
+                        params.setMargins(0, 0, 0, 0); // 不设右边距，由 row padding 控制
+                    }
+                    wheatView.setLayoutParams(params);
+                    row.addView(wheatView);
+                    // 第一行添加两个后换行
+                    if (i == 1) {
+                        container.addView(row);
+                        row = new LinearLayout(context);
+                        row.setOrientation(LinearLayout.HORIZONTAL);
+                    } else if (i > 1 && (i - 2) % 4 == 3) {
+                        container.addView(row);
+                        row = new LinearLayout(context);
+                        row.setOrientation(LinearLayout.HORIZONTAL);
+                    }
+
+                }else {
+                    RoomSingSongWheatView wheatView = new RoomSingSongWheatView(context);
+                    wheatView.pitNumber = String.valueOf(pitNumber);
+                    wheatView.setData(pitList.get(pitNumber - 1));
+                    multiWheatViews.add(wheatView);
+
+                    LinearLayout.LayoutParams params;
+                    if (i == 0) {
+                        int fixedHeightInDp = 110; // 固定高度为 100dp
+                        int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
+                        // 第一个控件：左边距 86dp，右边距 100dp
+                        params = new LinearLayout.LayoutParams(itemWidth, fixedHeightInPx);
+                        params.rightMargin = dpToPx(50);
+                    } else if (i == 1) {
+                        int fixedHeightInDp = 110; // 固定高度为 100dp
+                        int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
+                        // 第二个控件：右边距 86dp
+                        params = new LinearLayout.LayoutParams(itemWidth, fixedHeightInPx);
+                    } else {
+                        int fixedHeightInDp = 90; // 固定高度为 100dp
+                        int fixedHeightInPx = dpToPx(fixedHeightInDp); // 调用已有的 dpToPx 方法
+                        params = new LinearLayout.LayoutParams(itemWidth - 30, fixedHeightInPx + 30);
+                        // 其他控件保持原有逻辑
+
+                        params.setMargins(0, 0, 0, 0); // 不设右边距，由 row padding 控制
+                    }
+                    wheatView.setLayoutParams(params);
+
+
+                    GifAvatarOvalView avatarView = (GifAvatarOvalView) wheatView.mRiv;
+                    avatarView.setOnClickListener(v -> {
+                        if (wheatClickListener != null) {
+                            wheatClickListener.onWheatClick(wheatView, pitNumber);
+                        }
+                    });
+
+                    WheatCharmView charmView = wheatView.mCharmView;
+                    charmView.setOnClickListener(v -> {
+                        if (wheatClickListener != null) {
+                            ToastUtils.show("点击了麦位");
+                            wheatClickListener.onMeilingClick(wheatView, pitNumber);
+                        }
+                    });
+
+                    wheatView.setOnClickListener(v -> {
+                        if (wheatClickListener != null) {
+                            wheatClickListener.onMeilingClick(wheatView, Integer.parseInt(wheatView.pitNumber));
+                        }
+                    });
+
+                    row.addView(wheatView);
+
+                    // 第一行添加两个后换行
+                    if (i == 1) {
+                        container.addView(row);
+                        row = new LinearLayout(context);
+                        row.setOrientation(LinearLayout.HORIZONTAL);
+                    } else if (i > 1 && (i - 2) % 4 == 3) {
+                        container.addView(row);
+                        row = new LinearLayout(context);
+                        row.setOrientation(LinearLayout.HORIZONTAL);
+                    }
+                }
 
-                params.setMargins(0, 0, 0, 0); // 不设右边距，由 row padding 控制
             }
 
-            wheatView.setLayoutParams(params);
-
-
-            GifAvatarOvalView avatarView = (GifAvatarOvalView) wheatView.mRiv;
-            avatarView.setOnClickListener(v -> {
-                if (wheatClickListener != null) {
-                    wheatClickListener.onWheatClick(wheatView, pitNumber);
-                }
-            });
-
-            WheatCharmView charmView = wheatView.mCharmView;
-            charmView.setOnClickListener(v -> {
-                if (wheatClickListener != null) {
-                    ToastUtils.show("点击了麦位");
-                    wheatClickListener.onMeilingClick(wheatView, pitNumber);
-                }
-            });
-
-            wheatView.setOnClickListener(v -> {
-                if (wheatClickListener != null) {
-                    wheatClickListener.onMeilingClick(wheatView, Integer.parseInt(wheatView.pitNumber));
-                }
-            });
-
-            row.addView(wheatView);
-
-            // 第一行添加两个后换行
-            if (i == 1) {
+            // 添加最后一行可能存在的剩余 view
+            if (row.getChildCount() > 0) {
                 container.addView(row);
-                row = new LinearLayout(context);
-                row.setOrientation(LinearLayout.HORIZONTAL);
-            } else if (i > 1 && (i - 2) % 4 == 3) {
-                container.addView(row);
-                row = new LinearLayout(context);
-                row.setOrientation(LinearLayout.HORIZONTAL);
             }
+            isSingleMode = false;
+            currentSinglePit = -1;
         }
-
-        // 添加最后一行可能存在的剩余 view
-        if (row.getChildCount() > 0) {
-            container.addView(row);
-        }
-        isSingleMode = false;
-        currentSinglePit = -1;
     }
 
     public void restoreMultiWheatPk(int layoutType) {