修复:
心愿单
This commit is contained in:
parent
9cd44c592c
commit
6316f9489e
@ -417,6 +417,8 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
} else if (Micing == 2) {
|
} else if (Micing == 2) {
|
||||||
manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal);
|
manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal);
|
||||||
} else {
|
} else {
|
||||||
|
manager.exitLiveRoom();
|
||||||
|
manager.onRemove();
|
||||||
super.onBackPressed();
|
super.onBackPressed();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -437,6 +439,7 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
@Override
|
@Override
|
||||||
protected void onDestroy() {
|
protected void onDestroy() {
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
|
|
||||||
Bus.getOff(this);
|
Bus.getOff(this);
|
||||||
L.e("LiveAudienceActivity-------onDestroy------->");
|
L.e("LiveAudienceActivity-------onDestroy------->");
|
||||||
}
|
}
|
||||||
|
@ -115,4 +115,8 @@ public class WishlistItemModel extends BaseModel {
|
|||||||
this.wishlistProgress = wishlistProgress;
|
this.wishlistProgress = wishlistProgress;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getWishlistNumP() {
|
||||||
|
return wishlistProgress + "/" + wishlistNum;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -855,8 +855,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
ViewClicksAntiShake.clicksAntiShake(wishListLayout, () -> startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url", "")));
|
ViewClicksAntiShake.clicksAntiShake(wishListLayout, () -> startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url", "")));
|
||||||
//打招呼消息
|
//打招呼消息
|
||||||
fastMsgRecyclerView = (RecyclerView) findViewById(R.id.room_fast_msg);
|
fastMsgRecyclerView = (RecyclerView) findViewById(R.id.room_fast_msg);
|
||||||
fastMsgRecyclerView.setLayoutManager(new LinearLayoutManager(mContext,LinearLayoutManager.HORIZONTAL,false));
|
fastMsgRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
|
||||||
fastMessageRecyclerViewAdapter=new LiveRoomFastMessageRecyclerViewAdapter(mContext);
|
fastMessageRecyclerViewAdapter = new LiveRoomFastMessageRecyclerViewAdapter(mContext);
|
||||||
fastMsgRecyclerView.setAdapter(fastMessageRecyclerViewAdapter);
|
fastMsgRecyclerView.setAdapter(fastMessageRecyclerViewAdapter);
|
||||||
fastMessageRecyclerViewAdapter.setMessageListener(msg -> {
|
fastMessageRecyclerViewAdapter.setMessageListener(msg -> {
|
||||||
//点击的消息发送出去
|
//点击的消息发送出去
|
||||||
@ -1053,7 +1053,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
ImageView wishPic = wish.findViewById(R.id.wish_pic);
|
ImageView wishPic = wish.findViewById(R.id.wish_pic);
|
||||||
TextView wishIndex = wish.findViewById(R.id.wish_index);
|
TextView wishIndex = wish.findViewById(R.id.wish_index);
|
||||||
ImgLoader.display(mContext, wishlist.get(i).getWishlistIcon(), wishPic);
|
ImgLoader.display(mContext, wishlist.get(i).getWishlistIcon(), wishPic);
|
||||||
wishIndex.setText((i + 1) + "/" + wishlist.size());
|
wishIndex.setText(wishlist.get(i).getWishlistNumP());
|
||||||
wishListFlipper.addView(wish);
|
wishListFlipper.addView(wish);
|
||||||
}
|
}
|
||||||
wishListFlipper.startFlipping();
|
wishListFlipper.startFlipping();
|
||||||
@ -1415,7 +1415,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
|
|
||||||
private void setGuardIcon(LiveUserGiftBean guard) {
|
private void setGuardIcon(LiveUserGiftBean guard) {
|
||||||
if (guard != null) {
|
if (guard != null) {
|
||||||
nowGuardUser=guard;
|
nowGuardUser = guard;
|
||||||
ImgLoader.displayAvatar(mContext, guard.getAvatar(), userGuard);
|
ImgLoader.displayAvatar(mContext, guard.getAvatar(), userGuard);
|
||||||
gift_svga.setVisibility(View.VISIBLE);
|
gift_svga.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
@ -1494,7 +1494,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
} else if (i == R.id.ft_hot_add) {
|
} else if (i == R.id.ft_hot_add) {
|
||||||
((LiveActivity) mContext).openHotListWindow(1);
|
((LiveActivity) mContext).openHotListWindow(1);
|
||||||
} else if (i == R.id.user_guard) {
|
} else if (i == R.id.user_guard) {
|
||||||
// ((LiveActivity) mContext).openUserMoreListWindow(2, true);
|
// ((LiveActivity) mContext).openUserMoreListWindow(2, true);
|
||||||
((LiveActivity) mContext).openGuardListWindow();
|
((LiveActivity) mContext).openGuardListWindow();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1775,7 +1775,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
}
|
}
|
||||||
room_hot.setText(formatBigNum.formatBigNum(bean.getLiveChatBean().getHot_num()));
|
room_hot.setText(formatBigNum.formatBigNum(bean.getLiveChatBean().getHot_num()));
|
||||||
LiveUserGiftBean chatBean = bean.getUserBean();
|
LiveUserGiftBean chatBean = bean.getUserBean();
|
||||||
if(chatBean!=null&&nowGuardUser!=null) {
|
if (chatBean != null && nowGuardUser != null) {
|
||||||
LiveUserGiftBean tmp = null;
|
LiveUserGiftBean tmp = null;
|
||||||
if (chatBean.getGuardType() != 0 && chatBean.getGuardType() > nowGuardUser.getGuardType()) {
|
if (chatBean.getGuardType() != 0 && chatBean.getGuardType() > nowGuardUser.getGuardType()) {
|
||||||
tmp = chatBean;
|
tmp = chatBean;
|
||||||
@ -1788,10 +1788,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户离开房间
|
* 用户离开房间
|
||||||
|
*
|
||||||
* @param bean 用户
|
* @param bean 用户
|
||||||
*/
|
*/
|
||||||
public void onExitRoom(UserBean bean){
|
public void onExitRoom(UserBean bean) {
|
||||||
// getGuardInfo();
|
// getGuardInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1259,7 +1259,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
|||||||
mEnd = true;
|
mEnd = true;
|
||||||
//断开socket
|
//断开socket
|
||||||
|
|
||||||
if (mSocketRyClient != null) {
|
if (mSocketRyClient != null) {
|
||||||
mSocketRyClient.disConnect();
|
mSocketRyClient.disConnect();
|
||||||
}
|
}
|
||||||
mSocketRyClient = null;
|
mSocketRyClient = null;
|
||||||
|
Loading…
Reference in New Issue
Block a user