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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2023-07-04 16:37:34 +08:00
commit b3fb6e62ae
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
View File

@ -29,6 +29,7 @@ import com.yunbao.common.views.weight.ClipPathCircleImage;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.adapter.RedPacketGiftAdapter;
import com.yunbao.live.views.LiveRoomViewHolder;
public class ReceiveRendPacketPopup extends CenterPopupView {
private CircleProgress circleProgress;
@ -174,17 +175,29 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
}
});
} else {
LiveRoomViewHolder.follow();
LiveNetManager.get(getContext())
.getRedPacket(mLiveUid, stream, redPacketId, new HttpCallback<RedPacketInfoModel>() {
@Override
public void onSuccess(RedPacketInfoModel data) {
dismiss();
new XPopup.Builder(getContext())
.asCustom(new ResultRendPacketPopup(getContext(),
false,
data.setRedPacketId(redPacketId),
isSuperJackpot))
.show();
if (data.getGiftModels().size() > 0) {
new XPopup.Builder(getContext())
.asCustom(new ResultRendPacketPopup(getContext(),
false,
data.setRedPacketId(redPacketId),
isSuperJackpot))
.show();
} else {
new XPopup.Builder(getContext())
.asCustom(new ResultRendPacketPopup(getContext(),
true,
null,
isSuperJackpot))
.show();
}
}
@Override

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

@ -1483,9 +1483,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.asCustom(new ResultRendPacketPopup(mContext, false, data.setRedPacketId(redPacketModel.getRedPacketId()), false))
.show();
}
if (TextUtils.equals(data.getConditions(), "1")) {
follow();
}
}
@Override

7
live/src/main/res/layout/view_red_packet.xml
View File

@ -16,14 +16,15 @@
<TextView
android:id="@+id/red_packet_countdown"
android:layout_width="58dp"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:gravity="center_vertical"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/red_packet_countdown"
android:visibility="gone"
android:textColor="@color/white"
android:textSize="9sp" />
android:textSize="9sp"
android:visibility="gone" />
<LinearLayout
android:id="@+id/red_packet_queue"