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