yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2022-08-30 15:51:12 +08:00
commit f27e21b9ae
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -3,7 +3,6 @@ package com.yunbao.live.views;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.graphics.Outline; import android.graphics.Outline;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@ -871,6 +870,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}); });
mBanner2.setVisibility(View.GONE); mBanner2.setVisibility(View.GONE);
if (fastMsgRecyclerView.getVisibility() == View.GONE) {
params1.bottomMargin = 0;
mChatRecyclerView.setLayoutParams(params1);
}
// fastMsgRecyclerView.setItemAnimator(new DefaultItemAnimator()); // fastMsgRecyclerView.setItemAnimator(new DefaultItemAnimator());
} }
@ -1540,8 +1543,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (guard != null) { if (guard != null) {
nowGuardUser = guard; nowGuardUser = guard;
ViewGroup.LayoutParams params = userGuard.getLayoutParams(); ViewGroup.LayoutParams params = userGuard.getLayoutParams();
params.height=DpUtil.dp2px(30); params.height = DpUtil.dp2px(30);
params.width=DpUtil.dp2px(30); params.width = DpUtil.dp2px(30);
userGuard.setLayoutParams(params); userGuard.setLayoutParams(params);
ImgLoader.displayAvatar(mContext, guard.getAvatar(), userGuard); ImgLoader.displayAvatar(mContext, guard.getAvatar(), userGuard);
gift_svga.setVisibility(View.VISIBLE); gift_svga.setVisibility(View.VISIBLE);
@ -2317,7 +2320,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
fastMessageRecyclerViewAdapter.setMessage(greetings); fastMessageRecyclerViewAdapter.setMessage(greetings);
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams)
mChatRecyclerView.getLayoutParams(); mChatRecyclerView.getLayoutParams();
if (greetings.size() > 0) {
params1.bottomMargin = 100; params1.bottomMargin = 100;
}else {
params1.bottomMargin = 0;
}
mChatRecyclerView.setLayoutParams(params1); mChatRecyclerView.setLayoutParams(params1);
} }