1:修改礼物背包送礼异常

2：修改添加照片出现错乱问题 3：修改头像框不显示的问题 4：修改我的背包显示不正确的问题 5:修改明细、收支时间问题
2025-09-08 17:22:58 +08:00
parent 77b801cca6
commit 54014fe0f6
27 changed files with 497 additions and 354 deletions
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
@@ -218,6 +218,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
        mBinding.mirroeSky.tvJc.setOnClickListener(this::onClisk);
        mBinding.mirroeSky.tvJl.setOnClickListener(this::onClisk);
        mBinding.mirroeSky.tvStart.setOnClickListener(this::onClisk);
+        mBinding.mirroeSky.exchangeLayout.setOnClickListener(this::onClisk);
        init(0);
        mBinding.mirroeSky.swLockYx.setChecked(true);
        mBinding.mirroeSky.swTex.setChecked(true);
@@ -256,6 +257,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
        mBinding.cityTime.tvJc.setOnClickListener(this::onClisk);
        mBinding.cityTime.tvJl.setOnClickListener(this::onClisk);
        mBinding.cityTime.tvStart.setOnClickListener(this::onClisk);
+        mBinding.cityTime.exchangeLayout.setOnClickListener(this::onClisk);
        init2(0);
        mBinding.cityTime.swLockYx.setChecked(true);
        mBinding.cityTime.swTex.setChecked(true);
@@ -293,6 +295,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
        mBinding.pinnacleTime.tvJc.setOnClickListener(this::onClisk);
        mBinding.pinnacleTime.tvJl.setOnClickListener(this::onClisk);
        mBinding.pinnacleTime.tvStart.setOnClickListener(this::onClisk);
+        mBinding.pinnacleTime.exchangeLayout.setOnClickListener(this::onClisk);
        init3(0);
        mBinding.pinnacleTime.swLockYx.setChecked(true);
        mBinding.pinnacleTime.swTex.setChecked(true);
@@ -375,6 +378,8 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
                    this.dismissAllowingStateLoss();
                }
            }
+        }else if (id == R.id.exchange_layout){
+            ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
        }
    }

--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
@@ -23,6 +23,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearSnapHelper;
 import androidx.recyclerview.widget.RecyclerView;

+import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.TimeUtils;
 import com.xscm.moduleutil.R;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
@@ -34,6 +35,7 @@ import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean;
 import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean;
 import com.xscm.moduleutil.databinding.FragmentTourClubDialogBinding;
 import com.xscm.moduleutil.dialog.WebViewDialog;
+import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.widget.CenterScrollHelper;
 import com.xscm.moduleutil.widget.EqualSpaceItemDecoration;
@@ -71,6 +73,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
    private int totalScrollTime = 5000; // 总滚动时间，单位：毫秒
    private int targetPosition;

+    private boolean isDrawing;//是否正在抽奖

    @Override
    protected GiftLotteryPresenter bindPresenter() {
@@ -142,10 +145,10 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
        mBinding.tvGz.setOnClickListener(this::onClick);
        mBinding.tvBd.setOnClickListener(this::onClick);
        mBinding.tvJl.setOnClickListener(this::onClick);
+        mBinding.exchangeLayout.setOnClickListener(this::onClick);


-
-        giftXlhChouAdapter=new GiftXlhChouAdapter();
+        giftXlhChouAdapter = new GiftXlhChouAdapter();
        // 使用 LinearLayoutManager 横向滚动
        LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false);
        mBinding.recycleView.setLayoutManager(layoutManager);
@@ -185,27 +188,42 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
                com.hjq.toast.ToastUtils.show("奖池数据加载中，请稍后再试");
            }
        } else if (id == R.id.ll_one) {
-            prepareForNewLottery();
-            num="1";
-            MvpPre.xlhChou(roomId,num);
+            if (!isDrawing) {
+                isDrawing = true;
+                prepareForNewLottery();
+                num = "1";
+                MvpPre.xlhChou(roomId, num);
+            } else {
+                com.hjq.toast.ToastUtils.show("正在抽奖中...");
+            }

        } else if (id == R.id.ll_ten) {
-            prepareForNewLottery();
-            num="10";
-            MvpPre.xlhChou(roomId,num);
+            if (!isDrawing) {
+                isDrawing = true;
+                prepareForNewLottery();
+                num = "10";
+                MvpPre.xlhChou(roomId, num);
+            } else {
+                com.hjq.toast.ToastUtils.show("正在抽奖中...");
+            }

        } else if (id == R.id.ll_hundred) {
-            prepareForNewLottery();
-            num="100";
-            MvpPre.xlhChou(roomId,num);
+            if (!isDrawing) {
+                isDrawing = true;
+                prepareForNewLottery();
+                num = "100";
+                MvpPre.xlhChou(roomId, num);
+            } else {
+                com.hjq.toast.ToastUtils.show("正在抽奖中...");
+            }

-        }else if (id == R.id.tv_gz){
+        } else if (id == R.id.tv_gz) {
            Bundle bundle = new Bundle();
            bundle.putString("url", getRule_url);
            bundle.putInt("type", 13);
            WebViewDialog dialog = new WebViewDialog(getActivity(), bundle);
            dialog.show();
-        }else if (id == R.id.tv_bd){
+        } else if (id == R.id.tv_bd) {
            // 如果当前dialog存在且正在显示，先关闭
            if (xlhRankingDialog != null && xlhRankingDialog.isVisible()) {
                xlhRankingDialog.dismiss();
@@ -213,7 +231,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre

            xlhRankingDialog = XlhRankingDialog.newInstance(roomId);
            xlhRankingDialog.show(getChildFragmentManager(), "XlhRankingDialog");
-        }else if (id == R.id.tv_jl){
+        } else if (id == R.id.tv_jl) {
            // 如果当前dialog存在且正在显示，先关闭
            if (xlhRecordDialog != null && xlhRecordDialog.isVisible()) {
                xlhRecordDialog.dismiss();
@@ -221,8 +239,11 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre

            xlhRecordDialog = XlhRecordDialog.newInstance(roomId);
            xlhRecordDialog.show(getChildFragmentManager(), "XlhRecordDialog");
+        } else if (id == R.id.exchange_layout) {//钻石兑换
+            ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
        }
    }
+
    @Override
    protected int getLayoutId() {
        return R.layout.fragment_tour_club_dialog;
@@ -231,7 +252,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
    @Override
    public void getGiftListSuccess(BlindBoxBean blindBoxBean) {
        if (blindBoxBean != null) {
-            getRule_url=blindBoxBean.getRule_url();
+            getRule_url = blindBoxBean.getRule_url();
            upTitle(blindBoxBean.getBox_price());
            giftLists = blindBoxBean.getGift_list();
 // 初始滚动到中间位置，避免边界问题
@@ -254,14 +275,14 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
            if (blindBoxBean.getGive_homeowner_gift() != null) {
                ImageUtils.loadHeadCC(blindBoxBean.getGive_homeowner_gift().getBase_image(), mBinding.giveIm);
            }
-            if (blindBoxBean.getLocking_gift()!=null){
+            if (blindBoxBean.getLocking_gift() != null) {
                ImageUtils.loadHeadCC(blindBoxBean.getLocking_gift().getBase_image(), mBinding.giftImg);
                mBinding.tvGiftName.setText(blindBoxBean.getLocking_gift().getGift_name());
                mBinding.tvGiftPrice.setText(blindBoxBean.getLocking_gift().getGift_price());
                mBinding.tvGiftCount.setText(blindBoxBean.getLocking_gift().getGift_num());
            }

-            if (blindBoxBean.getXlh_user()!=null){
+            if (blindBoxBean.getXlh_user() != null) {
                ImageUtils.loadHeadCC(blindBoxBean.getXlh_user().getAvatar(), mBinding.userPic);
                mBinding.userName.setText(blindBoxBean.getXlh_user().getNickname());
            }
@@ -272,24 +293,25 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
    }

    // TODO: 2025/9/4 设置底部按钮文字
-    private void upTitle(int boxPrice){
-            mBinding.tvOne.setText(boxPrice+"币一次");
-            mBinding.tvTen.setText((boxPrice*10)+"币十次");
-            mBinding.tvHundred.setText((boxPrice*100)+"币百次");
+    private void upTitle(int boxPrice) {
+        mBinding.tvOne.setText(boxPrice + "币一次");
+        mBinding.tvTen.setText((boxPrice * 10) + "币十次");
+        mBinding.tvHundred.setText((boxPrice * 100) + "币百次");
    }

    // TODO: 2025/8/29 接收im推送过来的消息
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onMusicPlay(RoomMessageEvent message) {
-        if (message.getMsgType() == 1057){
+        if (message.getMsgType() == 1057) {
 //            UpView(message.getText().getXlh_data());
-            endTime=Long.parseLong(message.getText().getEnd_time());
+            endTime = Long.parseLong(message.getText().getEnd_time());
            startCountdown();
            mBinding.tvGiftCount.setText(message.getText().getGift_num());
            mBinding.userName.setText(message.getText().getFromUserInfo().getNickname());
            ImageUtils.loadHeadCC(message.getText().getFromUserInfo().getAvatar(), mBinding.userPic);
        }
    }
+
    /**
     * 启动倒计时
     */
@@ -330,6 +352,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre

    /**
     * 更新倒计时显示
+     *
     * @param minutes 分钟数
     * @param seconds 秒数
     */
@@ -357,6 +380,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
        // 或者如果是一个整体的显示：
        // mBinding.tvCountdown.setText(String.format("%02d:%02d", minutes, seconds));
    }
+
    /**
     * 释放倒计时器资源
     */
@@ -409,20 +433,21 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
    @Override
    public void wallet(WalletBean walletBean) {
        if (walletBean != null) {
-          mBinding.tvIcon.setText(walletBean.getCoin());
+            mBinding.tvIcon.setText(walletBean.getCoin());
        }
    }
+
    private Runnable pendingLotteryRunnable;
    private Runnable pendingCenteringRunnable;

    @Override
    public void xlhChouSuccess(List<XlhDrawBean> data) {
-        if (data != null){
+        if (data != null) {

            // 取消之前可能存在的任务
            clearPendingTasks();
-           // 抽奖完成后执行动画滚动
-                    pendingLotteryRunnable = new Runnable() {
+            // 抽奖完成后执行动画滚动
+            pendingLotteryRunnable = new Runnable() {
                @Override
                public void run() {
                    // 清理之前的状态
@@ -487,8 +512,6 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
    }


-
-
    /**
     * 为新的抽奖做准备，清理之前的状态
     */
@@ -517,6 +540,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
        // 重新初始化滚动帮助类
        scrollHelper = new CenterScrollHelper(mBinding.recycleView);
    }
+
    /**
     * 清除所有待执行的任务
     */
@@ -657,8 +681,9 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre

    /**
     * 将指定的原始位置item居中显示
+     *
     * @param originalPosition 原始数据中的位置
-     * @param originalSize 原始数据大小
+     * @param originalSize     原始数据大小
     */
    // 新增优化的居中方法
    private void centerSelectedItem(int originalPosition, int originalSize) {
@@ -711,6 +736,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre

    /**
     * 直接滚动到指定位置并居中
+     *
     * @param targetPosition 目标位置
     */
    private void directScrollToCenter(int targetPosition) {
@@ -740,6 +766,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre

    /**
     * 滚动到指定位置并使该位置的item居中显示
+     *
     * @param selectedPosition 选中的原始位置
     */
    private void scrollToCenterWithSelected(int selectedPosition) {
@@ -768,15 +795,18 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre

    /**
     * 显示抽奖结果对话框
+     *
     * @param data 中奖数据
     */
    private void showResultDialog(List<XlhDrawBean> data) {
+        isDrawing=false;
        // 创建并显示对话框
        XlhObtainDialog dialog = new XlhObtainDialog(getActivity());
        dialog.setOnGiftItemClickListener(new XlhObtainDialog.OnGiftItemClickListener() {

            @Override
            public void onPlayAgainClick() {
+                isDrawing=true;
                // 处理再玩一次点击事件
                MvpPre.xlhChou(roomId, num);
            }
@@ -791,8 +821,10 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
        dialog.show();
        dialog.setGiftList(data);
    }
+
    /**
     * 根据中奖结果找到最高价值奖品在giftLists中的位置
+     *
     * @param data 中奖结果列表
     * @return 最高价值奖品在giftLists中的下标，如果没有找到则返回-1
     */
@@ -837,6 +869,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre

    /**
     * 精确将指定位置的item滚动到中心
+     *
     * @param position 目标位置
     */
    private void preciseScrollToCenter(int position) {
@@ -867,7 +900,4 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
    }


-
-
-
 }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java
@@ -343,7 +343,7 @@ public interface ApiServer {
    Observable<BaseModel<List<HeatedBean>>> getCategories();

    @GET(Constants.GET_CIRCLE_LIST)
-    Observable<BaseModel<List<CircleListBean>>> getCircleList(@Query("page") String page, @Query("page_limit") String page_limit);
+    Call<BaseModel<List<CircleListBean>>> getCircleList(@Query("page") String page, @Query("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.GET_USER_HOME_ZONE)
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -933,7 +933,25 @@ public class RetrofitClient {
    }

    public void getCircleList(String page, String page_limit, BaseObserver<List<CircleListBean>> observer) {//动态列表
-        sApiServer.getCircleList(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer);
+        sApiServer.getCircleList(page, page_limit).enqueue(new Callback<BaseModel<List<CircleListBean>>>() {
+
+            @Override
+            public void onResponse(Call<BaseModel<List<CircleListBean>>> call, Response<BaseModel<List<CircleListBean>>> response) {
+                if (response.code() == 200){
+                    BaseModel<List<CircleListBean>> listBaseModel = response.body();
+                    if (listBaseModel != null) {
+                        observer.onNext(listBaseModel.getData());
+                    } else {
+                        observer.onNext(null);
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<List<CircleListBean>>> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
    }

    public void getCircleUserList(String user_id, String page, String page_limit, BaseObserver<List<CircleListBean>> observer) {//用户主页动态列表
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java
@@ -406,7 +406,8 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
        Logger.d("AvatarFrameView", "Added to queue, queue size: " + playQueue.size() + ", url: " + url);

        if (type2==3){
-            playNextFromQueue();
+//            playNextFromQueue();
+            loadSVGA(url);
        }else {

            // 如果当前没有在播放，则开始播放
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java
@@ -111,6 +111,7 @@ public class RoomFriendshipWheatView extends BaseWheatView {
            if (isMute()) {
                ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex);
            }
+            mIvFrame.stopSvga();
            mIvFrame.setVisibility(INVISIBLE);
            mIvFace.remove();
            //停止声浪
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
@@ -94,6 +94,7 @@ public class RoomMakeWheatView extends BaseWheatView {
            if (isMute()){
                ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex);
            }
+            mIvFrame.stopSvga();
            mIvFrame.setVisibility(INVISIBLE);
            mIvFace.remove();
            //停止声浪
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
@@ -109,7 +109,7 @@ public class RoomSingSongWheatView extends BaseWheatView {
        if (isMute()) {
            ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex);
        }
-
+        mIvFrame.stopSvga();
        mIvFrame.setVisibility(INVISIBLE);
        mIvFace.remove();
        mIvRipple.setVisibility(GONE);
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/ShareDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/ShareDialog.java
@@ -73,6 +73,9 @@ public class ShareDialog extends BaseBottomSheetDialog<RoomDialogShareBinding> {
            mBinding.tvQq.setVisibility(GONE);
            mBinding.tvQqq.setVisibility(GONE);
            mBinding.rl.setVisibility(GONE);
+        }else if (types == 4){
+            mBinding.tvJub.setVisibility(GONE);
+            mBinding.tvCopy.setVisibility(GONE);
        }
        if (mUserId.equals(SpUtil.getUserId()+"")){
            mBinding.shanc.setVisibility(VISIBLE);
--- a/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml
+++ b/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml
@@ -312,6 +312,7 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="@+id/exchange_layout"
            app:layout_constraintBottom_toBottomOf="@+id/exchange_layout"
+            android:visibility="gone"
            />

        <View
@@ -324,6 +325,7 @@
            app:layout_constraintEnd_toStartOf="@+id/tv_option"
            app:layout_constraintTop_toTopOf="@+id/exchange_layout"
            app:layout_constraintBottom_toBottomOf="@+id/exchange_layout"
+            android:visibility="gone"
            />
        <LinearLayout
            android:id="@+id/exchange_layout"
--- a/moduleUtil/src/main/res/layout/room_dialog_share.xml
+++ b/moduleUtil/src/main/res/layout/room_dialog_share.xml
@@ -113,14 +113,15 @@

        </RelativeLayout>

-        <RelativeLayout
+        <LinearLayout
            android:id="@+id/rl"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            >

            <TextView
                android:id="@+id/tv_copy"
@@ -159,7 +160,7 @@
                android:gravity="center"
                android:drawablePadding="@dimen/dp_8"
            />
-        </RelativeLayout>
+        </LinearLayout>

        <View
            android:layout_width="match_parent"
--- a/moduleUtil/src/main/res/layout/room_view_friendship_wheat.xml
+++ b/moduleUtil/src/main/res/layout/room_view_friendship_wheat.xml
@@ -9,7 +9,7 @@

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
        android:clipChildren="false"
        android:clipToPadding="false">

@@ -20,23 +20,40 @@
            android:layout_height="0dp"
            android:layout_marginTop="@dimen/dp_12"
            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintWidth_percent="1"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintVertical_bias="0.0"
            android:src="@mipmap/jiaoy"/>

+        <!-- 头像框，与头像大小相同，覆盖在头像上 -->
+        <com.xscm.moduleutil.widget.AvatarFrameView
+            android:id="@+id/iv_frame"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:adjustViewBounds="true"
+            android:scaleType="fitCenter"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:layout_constraintHeight_percent="1"
+            app:layout_constraintWidth_percent="1.05"
+            app:layout_constraintBottom_toBottomOf="@id/riv"
+            app:layout_constraintEnd_toEndOf="@id/riv"
+            app:layout_constraintStart_toStartOf="@id/riv"
+            app:layout_constraintTop_toTopOf="@id/riv" />
+
        <!-- 说话麦圈，与头像大小相同，覆盖在头像上 -->
        <com.opensource.svgaplayer.SVGAImageView
            android:id="@+id/iv_ripple"
            android:layout_width="0dp"
            android:layout_height="0dp"
            app:autoPlay="false"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
+            app:layout_constraintHeight_percent="0.95"
+            app:layout_constraintWidth_percent="1"
+            app:layout_constraintBottom_toBottomOf="@id/iv_frame"
+            app:layout_constraintEnd_toEndOf="@id/iv_frame"
+            app:layout_constraintStart_toStartOf="@id/iv_frame"
+            app:layout_constraintTop_toTopOf="@id/iv_frame"
            app:loopCount="0"
            app:source="ripple3695.svga" />

@@ -50,19 +67,7 @@
 <!--            app:layout_constraintTop_toTopOf="@id/riv"-->
 <!--            />-->

-        <!-- 头像框，与头像大小相同，覆盖在头像上 -->
-        <com.xscm.moduleutil.widget.AvatarFrameView
-            android:id="@+id/iv_frame"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv" />
+

        <ImageView
            android:id="@+id/iv_online"
--- a/moduleUtil/src/main/res/layout/room_view_make_wheat.xml
+++ b/moduleUtil/src/main/res/layout/room_view_make_wheat.xml
@@ -14,7 +14,6 @@
        android:clipToPadding="false">


-
        <com.xscm.moduleutil.widget.GifAvatarOvalView
            android:id="@+id/riv"
            android:layout_width="@dimen/dp_40"
@@ -25,8 +24,23 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible"
-            />
+            tools:visibility="visible" />
+
+        <com.xscm.moduleutil.widget.AvatarFrameView
+            android:id="@+id/iv_frame"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:contentDescription="@null"
+            android:scaleType="fitXY"
+            app:autoPlay="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:loopCount="0"
+            tools:visibility="visible" />
+
        <!--说话动态图-->
        <com.opensource.svgaplayer.SVGAImageView
            android:id="@+id/iv_ripple"
@@ -35,27 +49,27 @@
            app:autoPlay="false"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintHeight_percent="0.8"
-            app:layout_constraintWidth_percent="0.8"
            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_percent="0.8"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_percent="0.8"
            app:loopCount="0"
            app:source="ripple3695.svga"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />

-<!--        <com.xscm.moduleutil.widget.AvatarFrameView-->
-<!--            android:id="@+id/iv_ripple"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="0dp"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintDimensionRatio="1:1"-->
-<!--            app:layout_constraintHeight_percent="0.8"-->
-<!--            app:layout_constraintWidth_percent="0.8"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="parent"-->
-<!--            />-->
+        <!--        <com.xscm.moduleutil.widget.AvatarFrameView-->
+        <!--            android:id="@+id/iv_ripple"-->
+        <!--            android:layout_width="0dp"-->
+        <!--            android:layout_height="0dp"-->
+        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--            app:layout_constraintDimensionRatio="1:1"-->
+        <!--            app:layout_constraintHeight_percent="0.8"-->
+        <!--            app:layout_constraintWidth_percent="0.8"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toTopOf="parent"-->
+        <!--            />-->

        <ImageView
            android:id="@+id/iv_sex"
@@ -109,29 +123,14 @@
            android:layout_height="@dimen/dp_45"
            android:background="@mipmap/room_ic_owner_offline"
            android:visibility="gone"
-            tools:visibility="visible"
-            app:layout_constraintDimensionRatio="1:1"
            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1:1"
            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="@id/riv"
-            app:loopCount="0"/>
-
-        <com.xscm.moduleutil.widget.AvatarFrameView
-            android:id="@+id/iv_frame"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:scaleType="fitXY"
-            app:autoPlay="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintHeight_percent="0.1"
            app:loopCount="0"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
+

        <View
            android:id="@+id/view_riv_bottom"
@@ -140,45 +139,46 @@
            app:layout_constraintBottom_toBottomOf="@id/riv"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
+
        <ImageView
            android:id="@+id/iv_tag_type"
            android:layout_width="@dimen/dp_30"
            android:layout_height="@dimen/dp_20"
            android:src="@mipmap/zc"
+            android:visibility="gone"
            app:layout_constraintBottom_toBottomOf="@id/riv"
            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            android:visibility="gone"/>
+            app:layout_constraintStart_toStartOf="@id/riv" />

        <TextView
            android:id="@+id/tv_name"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:gravity="center"
+            android:paddingLeft="@dimen/dp_5"
+            android:paddingRight="@dimen/dp_5"
            android:singleLine="true"
            android:textColor="@color/white"
            android:textSize="@dimen/sp_9"
-            android:paddingLeft="@dimen/dp_5"
-            android:paddingRight="@dimen/dp_5"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/riv"
            tools:text="麦位1"
            tools:textColor="@color/color_FF333333"
-            tools:visibility="visible"/>
-<!--        心动-->
+            tools:visibility="visible" />
+        <!--        心动-->
        <com.xscm.moduleutil.widget.WheatCharmView
            android:id="@+id/charm_view"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:clipChildren="false"
            android:clipToPadding="false"
+            android:visibility="gone"
            app:layout_constraintEnd_toEndOf="@id/tv_name"
            app:layout_constraintStart_toStartOf="@id/tv_name"
            app:layout_constraintTop_toBottomOf="@id/tv_name"
-            tools:visibility="visible"
-            android:visibility="gone"/>
+            tools:visibility="visible" />

        <ImageView
            android:id="@+id/iv_shutup"
@@ -186,13 +186,13 @@
            android:layout_height="0dp"
            android:layout_marginRight="5dp"
            android:layout_marginBottom="4dp"
-            app:layout_constraintWidth_percent="0.018"
-            app:layout_constraintHeight_percent="0.018"
            android:src="@mipmap/room_ic_wheat_shutup"
            android:visibility="invisible"
            app:layout_constraintBottom_toBottomOf="@id/riv"
+            app:layout_constraintHeight_percent="0.018"
            app:layout_constraintStart_toStartOf="@id/riv"
-            tools:visibility="visible"  />
+            app:layout_constraintWidth_percent="0.018"
+            tools:visibility="visible" />

        <com.xscm.moduleutil.widget.ExpressionImgView
            android:id="@+id/iv_face"
@@ -227,6 +227,5 @@
            app:layout_constraintTop_toTopOf="parent" />


-
    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
--- a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
+++ b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
@@ -24,7 +24,7 @@
            android:scaleType="fitCenter"
            android:src="@mipmap/room_ic_wheat_default"
            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintDimensionRatio="0.99:0.99"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />
@@ -41,6 +41,23 @@
 <!--            app:layout_constraintStart_toStartOf="parent"-->
 <!--            app:layout_constraintTop_toTopOf="parent"-->
 <!--            />-->
+
+        <com.xscm.moduleutil.widget.AvatarFrameView
+            android:id="@+id/iv_frame"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:adjustViewBounds="true"
+            android:scaleType="fitCenter"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_percent="0.95"
+            android:layout_marginTop="@dimen/dp_5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_percent="0.95" />
+
        <com.opensource.svgaplayer.SVGAImageView
            android:id="@+id/iv_ripple"
            android:layout_width="0dp"
@@ -48,8 +65,8 @@
            android:layout_marginTop="@dimen/dp_8"
            app:autoPlay="false"
            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHeight_percent="0.99"
-            app:layout_constraintWidth_percent="0.99"
+            app:layout_constraintHeight_percent="1"
+            app:layout_constraintWidth_percent="1"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
@@ -131,21 +148,7 @@
            tools:visibility="visible" />


-        <com.xscm.moduleutil.widget.AvatarFrameView
-            android:id="@+id/iv_frame"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_percent="0.98"
-            android:layout_marginTop="@dimen/dp_5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_percent="0.98" />
+

        <View
            android:id="@+id/view_riv_bottom"