git忽略/outputs/apk 以及/TabLayout/build
直播的消息发送增加上距离和下距离
This commit is contained in:
parent
927211379f
commit
362bcce5f6
2
.gitignore
vendored
2
.gitignore
vendored
@ -15,3 +15,5 @@ local.properties
|
|||||||
/main/build/
|
/main/build/
|
||||||
/video/build/
|
/video/build/
|
||||||
/tmp/full-r8-config.txt
|
/tmp/full-r8-config.txt
|
||||||
|
/outputs/apk
|
||||||
|
/TabLayout/build
|
||||||
|
@ -206,6 +206,8 @@ import com.yunbao.live.presenter.LiveLightAnimPresenter;
|
|||||||
import com.yunbao.live.utils.LiveRoomVoteManager;
|
import com.yunbao.live.utils.LiveRoomVoteManager;
|
||||||
import com.yunbao.live.utils.LiveTextRender;
|
import com.yunbao.live.utils.LiveTextRender;
|
||||||
|
|
||||||
|
import net.lucode.hackware.magicindicator.buildins.UIUtil;
|
||||||
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
import org.greenrobot.eventbus.EventBus;
|
||||||
import org.greenrobot.eventbus.Subscribe;
|
import org.greenrobot.eventbus.Subscribe;
|
||||||
import org.greenrobot.eventbus.ThreadMode;
|
import org.greenrobot.eventbus.ThreadMode;
|
||||||
@ -1961,7 +1963,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
voteManager.setMarginPosition(topMargin + DpUtil.dp2px(50));
|
voteManager.setMarginPosition(topMargin + DpUtil.dp2px(50));
|
||||||
|
|
||||||
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) mChatRecyclerView.getLayoutParams();
|
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) mChatRecyclerView.getLayoutParams();
|
||||||
params1.topMargin = DpUtil.dp2px(65);
|
|
||||||
|
if (isAnchorLive()) {//普通用户的聊天栏更高一些
|
||||||
|
//将layout_marginBottom修改为0 其余不变
|
||||||
|
params1.topMargin = DpUtil.dp2px(65);
|
||||||
|
params1.bottomMargin = 0;
|
||||||
|
mChatRecyclerView.setLayoutParams(params1);
|
||||||
|
}else {
|
||||||
|
params1.topMargin = DpUtil.dp2px(80);
|
||||||
|
}
|
||||||
mChatRecyclerView.setLayoutParams(params1);
|
mChatRecyclerView.setLayoutParams(params1);
|
||||||
|
|
||||||
mChatRecyclerView.setHasFixedSize(true);
|
mChatRecyclerView.setHasFixedSize(true);
|
||||||
@ -2241,7 +2251,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
//点击的消息发送出去
|
//点击的消息发送出去
|
||||||
((LiveActivity) mContext).sendChatMessage(msg, null, null);
|
((LiveActivity) mContext).sendChatMessage(msg, null, null);
|
||||||
fastMsgRecyclerView.setVisibility(View.GONE);
|
fastMsgRecyclerView.setVisibility(View.GONE);
|
||||||
params1.bottomMargin = 0;
|
params1.bottomMargin = DpUtil.dp2px(10);
|
||||||
mChatRecyclerView.setLayoutParams(params1);
|
mChatRecyclerView.setLayoutParams(params1);
|
||||||
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) newMessage.getLayoutParams();
|
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) newMessage.getLayoutParams();
|
||||||
RelativeLayout.LayoutParams params3 = (RelativeLayout.LayoutParams) atMessage.getLayoutParams();
|
RelativeLayout.LayoutParams params3 = (RelativeLayout.LayoutParams) atMessage.getLayoutParams();
|
||||||
@ -2261,7 +2271,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
});
|
});
|
||||||
// mBanner2.setVisibility(View.GONE);
|
// mBanner2.setVisibility(View.GONE);
|
||||||
if (fastMsgRecyclerView.getVisibility() == View.GONE) {
|
if (fastMsgRecyclerView.getVisibility() == View.GONE) {
|
||||||
params1.bottomMargin = 0;
|
if (isAnchorLive()){
|
||||||
|
params1.bottomMargin =0;
|
||||||
|
}else {
|
||||||
|
params1.bottomMargin = DpUtil.dp2px(10);
|
||||||
|
}
|
||||||
mChatRecyclerView.setLayoutParams(params1);
|
mChatRecyclerView.setLayoutParams(params1);
|
||||||
}
|
}
|
||||||
// fastMsgRecyclerView.setItemAnimator(new DefaultItemAnimator());
|
// fastMsgRecyclerView.setItemAnimator(new DefaultItemAnimator());
|
||||||
@ -5621,11 +5635,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) mChatRecyclerView.getLayoutParams();
|
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) mChatRecyclerView.getLayoutParams();
|
||||||
if (greetings.size() > 0) {
|
if (greetings.size() > 0) {
|
||||||
params1.bottomMargin = 100;
|
params1.bottomMargin = 100;
|
||||||
} else {
|
} else if(isAnchorLive()){
|
||||||
params1.bottomMargin = 0;
|
params1.bottomMargin = 0;
|
||||||
|
}else {
|
||||||
|
params1.bottomMargin = DpUtil.dp2px(10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
mChatRecyclerView.setLayoutParams(params1);
|
mChatRecyclerView.setLayoutParams(params1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user