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

6.5.4礼物冠名

Browse Source
This commit is contained in:
18401019693
2023-08-02 16:55:36 +08:00
parent 5afa3bd30b
commit b78fef6adc
29 changed files with 708 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
live/src/main/java/com/yunbao/live/adapter/CodexAdapter.java Normal file
View File

@@ -0,0 +1,47 @@
package com.yunbao.live.adapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.R;
import com.yunbao.common.bean.GiftGuideModel;
import com.yunbao.live.views.CodexViewHolder;
import java.util.ArrayList;
import java.util.List;
public class CodexAdapter extends RecyclerView.Adapter {
private List<GiftGuideModel> giftGuideModels = new ArrayList<>();
private boolean history;
private String mStream, mLiveUid;
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_codex, parent, false);
return new CodexViewHolder(herdView);
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
CodexViewHolder codexViewHolder = (CodexViewHolder) holder;
codexViewHolder.showData(giftGuideModels.get(position), history,mStream,mLiveUid);
}
@Override
public int getItemCount() {
return giftGuideModels.size();
}
public void addAllData(List<GiftGuideModel> mGiftWall, boolean history, String mStream, String mLiveUid) {
this.history = history;
this.mStream = mStream;
this.mLiveUid = mLiveUid;
giftGuideModels.clear();
giftGuideModels.addAll(mGiftWall);
notifyDataSetChanged();
}
}

43
live/src/main/java/com/yunbao/live/adapter/CodexItemAdapter.java Normal file
View File

@@ -0,0 +1,43 @@
package com.yunbao.live.adapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.R;
import com.yunbao.common.bean.GiftWallModel;
import com.yunbao.live.views.CodexItemViewHolder;
import java.util.ArrayList;
import java.util.List;
public class CodexItemAdapter extends RecyclerView.Adapter {
private List<GiftWallModel> giftData = new ArrayList<>();
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_codex_item, parent, false);
return new CodexItemViewHolder(herdView);
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
CodexItemViewHolder codexItemViewHolder = (CodexItemViewHolder) holder;
codexItemViewHolder.showData(giftData.get(position));
}
@Override
public int getItemCount() {
return giftData.size();
}
public void addAllData(List<GiftWallModel> mGiftWall) {
giftData.clear();
giftData.addAll(mGiftWall);
notifyDataSetChanged();
}
}

2
live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java
View File

@@ -35,7 +35,7 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.custom.GiftMarkView;
import com.yunbao.live.dialog.SendRendPacketPopup;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import java.io.File;
import java.util.List;

114
live/src/main/java/com/yunbao/live/dialog/CodexDialog.java Normal file
View File

@@ -0,0 +1,114 @@
package com.yunbao.live.dialog;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.lxj.xpopup.core.BottomPopupView;
import com.yunbao.common.bean.GiftGuideModel;
import com.yunbao.common.event.CodexEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.adapter.CodexAdapter;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
public class CodexDialog extends BottomPopupView {
private String mStream, mLiveUid;
private RecyclerView liveCodex;
private CodexAdapter codexAdapter;
private boolean history;
public CodexDialog(@NonNull Context context, String mStream, String mLiveUid, boolean history) {
super(context);
this.mLiveUid = mLiveUid;
this.mStream = mStream;
this.history = history;
}
// 返回自定义弹窗的布局
@Override
protected int getImplLayoutId() {
return R.layout.dialog_live_codex;
}
// 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
@Override
protected void onCreate() {
super.onCreate();
Bus.getOn(this);
initView();
initDate();
}
private void initDate() {
if (history) {
LiveNetManager.get(getContext()).
getGiftGuideHistory(mLiveUid, new HttpCallback<List<GiftGuideModel>>() {
@Override
public void onSuccess(List<GiftGuideModel> data) {
codexAdapter.addAllData(data,history,mStream,mLiveUid);
}
@Override
public void onError(String error) {
ToastUtil.show(error);
}
});
} else {
LiveNetManager.get(getContext()).
getGiftGuide(mLiveUid, new HttpCallback<List<GiftGuideModel>>() {
@Override
public void onSuccess(List<GiftGuideModel> data) {
codexAdapter.addAllData(data,history,mStream,mLiveUid);
}
@Override
public void onError(String error) {
ToastUtil.show(error);
}
});
}
}
private void initView() {
liveCodex = findViewById(R.id.live_codex);
codexAdapter = new CodexAdapter();
liveCodex.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
liveCodex.setAdapter(codexAdapter);
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.close_btn), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
dialog.dismiss();
}
});
}
@Override
protected void onDismiss() {
Bus.getOff(this);
super.onDismiss();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onCodexEvent(CodexEvent event) {
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onLiveGiftDialogEvent(LiveGiftDialogEvent event) {
dismiss();
}
}

13
live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java
View File

@@ -18,7 +18,6 @@ import com.yunbao.common.Constants;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.event.GiftWallItemEvent;
import com.yunbao.common.fragment.AllServiceChampionFragment;
import com.yunbao.live.views.GiftAlreadyWallFragment;
import com.yunbao.common.fragment.GiftWithoutWallFragment;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.CommonHttpUtil;
@@ -29,7 +28,8 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import com.yunbao.live.views.GiftAlreadyWallFragment;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -130,6 +130,15 @@ public class GiftWallDialog extends AbsDialogFragment {
.show();
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.codex_layout), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
new XPopup.Builder(getContext())
.enableDrag(false)
.asCustom(new CodexDialog(getContext(), mStream, mLiveUid,false))
.show();
}
});
}
private void initDate() {

2
live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
View File

@@ -19,7 +19,7 @@ import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
public class GiftWallItemPopup extends CenterPopupView {
private CardView layout;

2
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@@ -80,7 +80,7 @@ import com.yunbao.live.bean.GiftTopBean;
import com.yunbao.live.bean.LiveGuardInfo;
import com.yunbao.live.custom.GiftViewPager;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.utils.ToolsButton;

2
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@@ -74,7 +74,7 @@ import com.yunbao.live.bean.GiftTopBean;
import com.yunbao.live.bean.LiveGuardInfo;
import com.yunbao.live.event.GiftTitleEvent;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import com.yunbao.live.event.LiveGiftItemEvent;
import com.yunbao.live.event.LiveParcelItemRefreshEvent;
import com.yunbao.live.http.LiveHttpUtil;

4
live/src/main/java/com/yunbao/live/event/LiveGiftDialogEvent.java
View File

@@ -1,4 +0,0 @@
package com.yunbao.live.event;
public class LiveGiftDialogEvent {
}

55
live/src/main/java/com/yunbao/live/views/CodexItemViewHolder.java Normal file
View File

@@ -0,0 +1,55 @@
package com.yunbao.live.views;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.R;
import com.yunbao.common.bean.GiftWallModel;
import com.yunbao.common.event.LiveGiftDialogEvent;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.event.LiveAudienceEvent;
public class CodexItemViewHolder extends RecyclerView.ViewHolder {
private ImageView giftImg;
private TextView giftName, giftWall;
public CodexItemViewHolder(@NonNull View itemView) {
super(itemView);
giftImg = itemView.findViewById(R.id.gift_img);
giftName = itemView.findViewById(R.id.gift_name);
giftWall = itemView.findViewById(R.id.gift_wall);
}
public void showData(GiftWallModel giftWallModel) {
ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg);
giftName.setText(giftWallModel.getGiftname());
giftName.setTextColor(Color.parseColor(giftWallModel.getFontColor()));
giftWall.setSelected(TextUtils.equals(String.valueOf(giftWallModel.getIlluminateStatus()), "1"));
if (TextUtils.equals(String.valueOf(giftWallModel.getIlluminateStatus()), "1")) {
giftWall.setText(itemView.getContext().getString(R.string.received_wall2));
giftWall.setTextColor(Color.parseColor("#FFFFFF"));
ViewClicksAntiShake.clicksAntiShake(giftWall, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
Bus.get().post(new LiveGiftDialogEvent());
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.GIFT_POPUP)
.setmWishGiftId(giftWallModel.getId())
.setmLiveUid("")
.setmStream(""));
}
});
} else {
giftWall.setText(itemView.getContext().getString(R.string.received_wall));
giftWall.setTextColor(Color.parseColor("#49669F"));
}
}
}

68
live/src/main/java/com/yunbao/live/views/CodexViewHolder.java Normal file
View File

@@ -0,0 +1,68 @@
package com.yunbao.live.views;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.lxj.xpopup.XPopup;
import com.yunbao.common.R;
import com.yunbao.common.bean.GiftGuideModel;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.adapter.CodexItemAdapter;
import com.yunbao.live.dialog.CodexDialog;
public class CodexViewHolder extends RecyclerView.ViewHolder {
private ImageView codexLayout, titleIcon;
private TextView titleName, weekNumber, weekNumber2;
private RecyclerView giftList;
private CodexItemAdapter codexItemAdapter;
public CodexViewHolder(@NonNull View itemView) {
super(itemView);
codexLayout = itemView.findViewById(R.id.codex_layout);
titleIcon = itemView.findViewById(R.id.title_icon);
titleName = itemView.findViewById(R.id.title_name);
weekNumber = itemView.findViewById(R.id.week_number);
weekNumber2 = itemView.findViewById(R.id.week_number2);
giftList = itemView.findViewById(R.id.gift_list);
codexItemAdapter = new CodexItemAdapter();
giftList.setLayoutManager(new LinearLayoutManager(itemView.getContext(), LinearLayoutManager.HORIZONTAL, false));
giftList.setAdapter(codexItemAdapter);
}
public void showData(GiftGuideModel giftGuideModel, boolean history, String mStream, String mLiveUid) {
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(giftGuideModel.getIlluminateCount())
.append("/")
.append(giftGuideModel.getIlluminateTotal());
ImgLoader.display(itemView.getContext(), giftGuideModel.getGuideBackgroundPicturePath(), codexLayout);
ImgLoader.display(itemView.getContext(), giftGuideModel.getGuideNameImgPath(), titleIcon);
titleName.setText(stringBuffer.toString());
titleName.setTextColor(Color.parseColor(giftGuideModel.getNumber()));
weekNumber.setText(giftGuideModel.getWeekNumber());
weekNumber.setVisibility(TextUtils.isEmpty(giftGuideModel.getWeekNumber()) ? View.GONE : View.VISIBLE);
if (history) {
weekNumber2.setVisibility(View.GONE);
} else {
weekNumber2.setVisibility(TextUtils.isEmpty(giftGuideModel.getWeekNumber()) ? View.GONE : View.VISIBLE);
}
codexItemAdapter.addAllData(giftGuideModel.getGiftData());
ViewClicksAntiShake.clicksAntiShake(weekNumber2, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
new XPopup.Builder(itemView.getContext())
.enableDrag(false)
.asCustom(new CodexDialog(itemView.getContext(), mStream, mLiveUid,true))
.show();
}
});
}
}

2
live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
View File

@@ -28,7 +28,7 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.dialog.SendRendPacketPopup;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import java.io.File;

2
live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
View File

@@ -19,7 +19,7 @@ import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
/**
* 已点亮礼物墙

2
live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java
View File

@@ -26,7 +26,7 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.dialog.SendRendPacketPopup;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import java.io.File;

4
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@@ -8,7 +8,6 @@ import android.app.Dialog;
import android.content.Intent;
import android.content.res.Configuration;
import android.graphics.drawable.AnimationDrawable;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Handler;
import android.text.TextUtils;
@@ -81,11 +80,10 @@ import com.yunbao.live.bean.LivePKUserListBean;
import com.yunbao.live.bean.LiveReceiveGiftBean;
import com.yunbao.live.bean.OpenParametersModel;
import com.yunbao.live.dialog.BlowkissDialog;
import com.yunbao.live.dialog.GiftWallDialog;
import com.yunbao.live.dialog.NewUserDialog;
import com.yunbao.live.event.LinkMicTxAccEvent;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import com.yunbao.live.event.LiveRoomChangeEvent;
import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil;

1
live/src/main/res/layout/dialog_live_gift_wall.xml
View File

@@ -48,6 +48,7 @@
android:background="@mipmap/background_giftwall_tab">
<TextView
android:id="@+id/codex_layout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"

BIN
live/src/main/res/mipmap-xxxhdpi/icon_regular_black.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 472 B