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

update 礼物墙

Browse Source
This commit is contained in:
zlzw
2024-07-16 16:39:30 +08:00
parent 96c45820b0
commit 7a6dfe5a3d
18 changed files with 209 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@@ -778,6 +778,12 @@ public class SocketSwClient {
case "SendMoneyLongEnd":
Bus.get().post(new SendMoneyLongEndEvent());
break;
case Constants.SOCKET_LIVE_ANCHOR_PK_DIALOG:
item = map.getJSONObject("ct");
//DialogUitl.showSimpleDialog(mContext,WordUtil.isNewZh()?item.getString("text"):item.getString("text_en"),null);
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_DIALOG_ANCHOR_TIPS)
.setObject(WordUtil.isNewZh() ? item.getString("text") : item.getString("text_en")));
}
}

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

@@ -224,7 +224,9 @@ import io.rong.imkit.userinfo.RongUserInfoManager;
import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.UserInfo;
import com.bumptech.glide.load.resource.gif.GifDrawable;
import pl.droidsonroids.gif.GifImageView;
/**
@@ -1789,13 +1791,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
});
//点击收起整蛊icon
prank_small_icon.setOnClickListener(v->{
prank_small_icon.setOnClickListener(v -> {
prank_group.setVisibility(View.VISIBLE);
prank_small_icon.setVisibility(View.GONE);
});
//点击图片转盘整蛊(跳转转盘整蛊)
prank_group_turntable_icon.setOnClickListener(v->{
prank_group_turntable_icon.setOnClickListener(v -> {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.WE_CHEAT));
});
@@ -1808,15 +1810,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
/**
* 收起整蛊列表
*/
public void closePrankView(){
if(prank_group.getVisibility()==View.VISIBLE){
public void closePrankView() {
if (prank_group.getVisibility() == View.VISIBLE) {
prank_group.setVisibility(View.GONE);
prank_small_icon.setVisibility(View.VISIBLE);
}
}
public void sendMsgPrank(){
public void sendMsgPrank() {
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
@@ -1830,7 +1832,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
//初始化整蛊列表进度
public void initPrankProgress(int isShow){
public void initPrankProgress(int isShow) {
// LogUtils.e("yqw=====>主播id:"+mLiveUid);
//获取整蛊列表
LiveNetManager.get(mContext).getPrankProgressList(mLiveUid, new com.yunbao.common.http.base.HttpCallback<PrankProgressBean>() {
@@ -1843,7 +1845,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
prankAndComboList.addAll(data.getPrank_list());
completedList.clear();
completedList.addAll(data.getCompleted_list());
setPrankList(isShow,data.getStatus(),data.getPrank_type(),data.getPrank_turntable_status());
setPrankList(isShow, data.getStatus(), data.getPrank_type(), data.getPrank_turntable_status());
}
@Override
@@ -1851,62 +1853,65 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
prank_group.setVisibility(View.GONE);
prank_small_icon.setVisibility(View.GONE);
prank_group_turntable_icon.setVisibility(View.GONE);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
ToastUtil.show(WordUtil.isNewZh() ? "抱歉！出錯了！" : "i \\'m sorry! An error occurred");
}
});
}
//刷新整蛊礼物列表
public void refreshPrank(String newPrankData){
public void refreshPrank(String newPrankData) {
try {
// LogUtils.e("yqw=====>整蛊礼物数据1:"+newPrankData);
org.json.JSONObject ctString = new org.json.JSONObject(newPrankData);
if (ctString.getInt("is_update") == 1){
if (ctString.getInt("is_update") == 1) {
//列表全部更新
if (ctString.getInt("status")==1){
if (ctString.getInt("status") == 1) {
//编辑添加整蛊
initPrankProgress(1);
}else {
} else {
//编辑取消整蛊
prank_group.setVisibility(View.GONE);
prank_small_icon.setVisibility(View.GONE);
}
if(CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
if (CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
return;
}
if (Integer.parseInt(ctString.getString("prank_turntable_status")) == 0){
if (Integer.parseInt(ctString.getString("prank_turntable_status")) == 0) {
prank_group_turntable_icon.setVisibility(View.GONE);
}else {
} else {
prank_group_turntable_icon.setVisibility(View.VISIBLE);
//ZeusKt.visible(prank_group_turntable_icon);
}
}else {
} else {
//送整蛊礼物更新
String prankListString = ctString.getString("prank_list");
List<PrankProgressBean.PrankList> prankList = GsonUtils.fromJson(prankListString,new TypeToken<List<PrankProgressBean.PrankList>>() {}.getType());
List<PrankProgressBean.PrankList> prankList = GsonUtils.fromJson(prankListString, new TypeToken<List<PrankProgressBean.PrankList>>() {
}.getType());
// LogUtils.e("yqw=====>整蛊礼物数据2:"+prankList.toString());
prankAndComboList.clear();
prankAndComboList.addAll(prankList);
String completedString = ctString.getString("completed_list");
List<PrankProgressBean.PrankList> completeds = GsonUtils.fromJson(completedString,new TypeToken<List<PrankProgressBean.PrankList>>() {}.getType());
List<PrankProgressBean.PrankList> completeds = GsonUtils.fromJson(completedString, new TypeToken<List<PrankProgressBean.PrankList>>() {
}.getType());
completedList.clear();
completedList.addAll(completeds);
setPrankList(0,Integer.parseInt(ctString.getString("status")), Integer.parseInt(ctString.getString("prank_type")), Integer.parseInt(ctString.getString("prank_turntable_status")));
setPrankList(0, Integer.parseInt(ctString.getString("status")), Integer.parseInt(ctString.getString("prank_type")), Integer.parseInt(ctString.getString("prank_turntable_status")));
}
}catch (Exception e){
LogUtils.e("yqw=====>转换错误:"+e.getMessage());
} catch (Exception e) {
LogUtils.e("yqw=====>转换错误:" + e.getMessage());
}
}
private void initPrankAdapter() {
prankAdapter = new PrankAdapter(mContext);
//整蛊礼物点击
prankAdapter.addOnItemClickListener(new PrankAdapter.OnItemClickListener() {
@Override
public void onItemClick(View view, int giftId) {
if(CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
if (CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
return;
}
openGiftDialog(String.valueOf(giftId));
@@ -1925,67 +1930,68 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
});
L.e("onItemDel:"+giftId);
L.e("onItemDel:" + giftId);
}
});
}
//设置整蛊礼物数据
private void setPrankList(int isShow,int status,int mPrankType,int prankTurntableStatus){
this.mPrankType =mPrankType;
private void setPrankList(int isShow, int status, int mPrankType, int prankTurntableStatus) {
this.mPrankType = mPrankType;
// LogUtils.e("yqw=====>显示转盘icon:是否显示："+(prankTurntableStatus == 1)+",是否在倒计时"+(lt_trickery.getVisibility() == View.VISIBLE));
if (prankTurntableStatus == 1 && lt_trickery.getVisibility() == View.GONE){
if(!CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
if (prankTurntableStatus == 1 && lt_trickery.getVisibility() == View.GONE) {
if (!CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
prank_group_turntable_icon.setVisibility(View.VISIBLE);
}
}else {
} else {
prank_group_turntable_icon.setVisibility(View.GONE);
}
// LogUtils.e("yqw=====>显示整蛊列表或者投票列表:"+status);
if (status == 1){
if(isShow==1){
if (status == 1) {
if (isShow == 1) {
prank_group.setVisibility(View.VISIBLE);
prank_small_icon.setVisibility(View.GONE);
}else if(isShow==2){
} else if (isShow == 2) {
prank_group.setVisibility(View.GONE);
prank_small_icon.setVisibility(View.VISIBLE);
}
//主播可能打开整蛊功能，但是不设置整蛊礼物，这里会是空列表
if (!prankAndComboList.isEmpty()){
if (!prankAndComboList.isEmpty()) {
initPrankAdapter();
recycler_prank.setAdapter(prankAdapter);
if (mPrankType == 1){//礼物
if (mPrankType == 1) {//礼物
// sortByCompletionRate(prankAndComboList);
prankAdapter.setViewType(PrankAdapter.TYPE_GIFT);
//prankAdapter.setList(prankAndComboList);
if(prankAnisShow){
prankAdapter.showAnView(completedList,prankAnisShow);
prank_group_title.setText(WordUtil.isNewZh()?"待完成整蠱":"To do");
prank_group_turntable.setText(WordUtil.isNewZh()?"整蠱進度":"progress");
if (!completedList.isEmpty()){
limitItem(1,Math.min(completedList.size(), 4));
}else {
if (prankAnisShow) {
prankAdapter.showAnView(completedList, prankAnisShow);
prank_group_title.setText(WordUtil.isNewZh() ? "待完成整蠱" : "To do");
prank_group_turntable.setText(WordUtil.isNewZh() ? "整蠱進度" : "progress");
if (!completedList.isEmpty()) {
limitItem(1, Math.min(completedList.size(), 4));
} else {
recycler_prank.setVisibility(View.GONE);
}
}else{
prankAdapter.showAnView(prankAndComboList,prankAnisShow);
prank_group_title.setText(WordUtil.isNewZh()?"整蠱進度":"progress");
prank_group_turntable.setText(WordUtil.isNewZh()?"待完成整蠱":"To do");
limitItem(1,Math.min(prankAndComboList.size(), 4));
} else {
prankAdapter.showAnView(prankAndComboList, prankAnisShow);
prank_group_title.setText(WordUtil.isNewZh() ? "整蠱進度" : "progress");
prank_group_turntable.setText(WordUtil.isNewZh() ? "待完成整蠱" : "To do");
limitItem(1, Math.min(prankAndComboList.size(), 4));
}
}else { //连击
} else { //连击
// sortBySendNum(prankAndComboList);
prank_group_title.setText(R.string.combo_vote);
prankAdapter.setViewType(PrankAdapter.TYPE_COMBO);
prankAdapter.setList(prankAndComboList);
limitItem(2,Math.min(prankAndComboList.size(), 4));
limitItem(2, Math.min(prankAndComboList.size(), 4));
}
}else {
} else {
prank_group.setVisibility(View.GONE);
prank_small_icon.setVisibility(View.GONE);
}
if(CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
if (CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
prank_top_layout.setOnClickListener(new View.OnClickListener() {
@Override
@@ -1996,24 +2002,24 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
});
prank_group_top_icon.setVisibility(View.VISIBLE);
if(mPrankType==1){
if (mPrankType == 1) {
prank_group_turntable.setVisibility(View.VISIBLE);
}else{
} else {
prank_group_turntable.setVisibility(View.GONE);
}
prank_group_bottom_icon.setVisibility(View.GONE);
switchGifDrawable(!completedList.isEmpty());
}else{
} else {
switchGifDrawable(false);
if(mPrankType==1){
if (mPrankType == 1) {
prank_group_title.setText(R.string.prank_progress);
}else{
} else {
prank_group_title.setText(R.string.combo_vote);
}
prank_group_turntable.setVisibility(View.GONE);
prank_group_top_icon.setVisibility(View.GONE);
}
}else {
} else {
prank_group.setVisibility(View.GONE);
prank_small_icon.setVisibility(View.GONE);
}
@@ -2033,12 +2039,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
//设置最多显示4个项目
private void limitItem(int prankType,int maxItem){
private void limitItem(int prankType, int maxItem) {
recycler_prank.post(() -> {
View itemView = recycler_prank.getChildAt(0);
if (itemView != null){
if (itemView != null) {
int gap = prankType == 1 ? SizeUtils.dp2px(3f) : 0;
int height = (itemView.getHeight() + gap)*maxItem;
int height = (itemView.getHeight() + gap) * maxItem;
ViewGroup.LayoutParams layoutParams = recycler_prank.getLayoutParams();
layoutParams.height = height;
recycler_prank.setLayoutParams(layoutParams);
@@ -2046,12 +2052,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
});
}
private void switchGifDrawable(boolean start){
private void switchGifDrawable(boolean start) {
// LogUtils.e("yqw=====>判断闪烁："+(mGifDrawable != null)+","+start);
if (mGifDrawable != null){
if (start){
if (mGifDrawable != null) {
if (start) {
mGifDrawable.start();
}else {
} else {
mGifDrawable.seekTo(0);
mGifDrawable.stop();
}
@@ -2153,7 +2159,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
layoutParams.topMargin = DpUtil.dp2px(190);
dragonImmediateParticipation.setLayoutParams(layoutParams);
}
if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE && mContext instanceof LiveRyAnchorActivity||mContext instanceof LiveSwAnchorActivity) {
if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE && mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) {
RelativeLayout.LayoutParams layoutParamsredPacket = (RelativeLayout.LayoutParams) redPacket.getLayoutParams();
layoutParamsredPacket.topMargin = DpUtil.dp2px(110);
redPacket.setLayoutParams(layoutParamsredPacket);
@@ -3687,8 +3693,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
ViewClicksAntiShake.clicksAntiShake(giftWall, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
new com.yunbao.common.dialog.GiftWallDialog(mContext, mLiveUid + "",mAnchorName, true).setFullWindows(false).showDialog();
//Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(mLiveUid).setVoicePress(true).setAvatar(mAvatarUrl).setUname(mAnchorName));
new com.yunbao.common.dialog.GiftWallDialog(mContext, mLiveUid, mAnchorName, true).setFullWindows(false).showDialog();
}
});
}
@@ -3700,8 +3706,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.LIVE_WKS));
}
});
// wksAndGiftWall.addView(weekView);
// wksAndGiftWall.startFlipping();
// wksAndGiftWall.addView(weekView);
// wksAndGiftWall.startFlipping();
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1);
}
@@ -5081,7 +5087,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
countDownTimerTrickery.cancel();
countDownTimerTrickery = null;
lt_trickery.setVisibility(View.GONE);
if(!CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
if (!CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
prank_group_turntable_icon.setVisibility(View.VISIBLE);
}
LiveNetManager.get(mContext).endPrankTurntable(mLiveUid, new com.yunbao.common.http.base.HttpCallback<BaseModel>() {
@@ -5118,7 +5124,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
starTimeloud(2, time);
} else {
lt_trickery.setVisibility(View.GONE);
if(!CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
if (!CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
prank_group_turntable_icon.setVisibility(View.VISIBLE);
}
timeOver();