红包中奖列表

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -788,4 +788,13 @@ public interface PDLiveApi {
     Observable<ResponseModel<List<RedPacketGiftModel>>> getRedPacketSuperPrizeReceive(
             @Query("super_jackpot_id") String superJackpotId
     );
+
+    /**
+     * 获取普通红包的领取记录
+     */
+    @GET("/api/public/?service=Live.endRedPacket")
+    Observable<ResponseModel<Object>> endRedPacket(
+            @Query("liveuid") String liveUid,
+            @Query("red_packet_id") String redPacketId
+    );
 }

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -1692,6 +1692,28 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
+    public void endRedPacket(String liveUid,String redPacketId, HttpCallback<String> callback) {
+        API.get().pdLiveApi(mContext)
+                .endRedPacket(liveUid, redPacketId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<Object>>() {
+                    @Override
+                    public void accept(ResponseModel<Object> objectResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess("");
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
     /**
      * 直播间取消网络请求
      */

live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java

@@ -1644,7 +1644,11 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
             case LIVE_END:
                 endLive();
                 break;
-
+            case RED_PACKET:
+                if (manager != null) {
+                    mLiveRoomViewHolder.redPacketManage(event.getRedPacketModel());
+                }
+                break;
         }
     }
 

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -1404,24 +1404,59 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
         }
     };
+    //主播倒计时调用接口
+    private Handler anchorTimeHandler = new Handler();
+    private int mCountdown;
+    private Runnable anchorTimeRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (mCountdown > 0) {
+                mCountdown = mCountdown - 1;
+                anchorTimeHandler.postDelayed(anchorTimeRunnable, 1000);
+                Log.e("主播倒计时", String.format(mContext.getString(R.string.red_packet_countdown), TimeUtils.getTime(mCountdown)));
+            } else   {
+                redPacket.setVisibility(View.GONE);
+                anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
+                LiveNetManager.get(mContext).
+                        endRedPacket(mLiveUid, mRedPacketModel.getRedPacketId(), new com.yunbao.common.http.base.HttpCallback<String>() {
+                            @Override
+                            public void onSuccess(String data) {
+
+                            }
+
+                            @Override
+                            public void onError(String error) {
+                                ToastUtil.show(error);
+                            }
+                        });
+            }
+        }
+    };
 
     /**
      * 红包相关处理
      */
     public void redPacketManage(RedPacketModel redPacketModel) {
+        anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
+        timeHandler.removeCallbacks(timeRunnable);
         mRedPacketModel = redPacketModel;
         if (redPacketModel.getIsShow() == 1) {
             redPacket.setVisibility(View.VISIBLE);
             if (redPacketModel.getCountdown() > 180) {
                 redPacketQueue.setVisibility(View.GONE);
                 redPacketCountdown.setVisibility(View.VISIBLE);
-                redTimeCountdown = redPacketModel.getCountdown() - 180;
+                mCountdown = redPacketModel.getCountdown();
+                redTimeCountdown = mCountdown - 180;
                 redPacketCountdown.setText(String.format(mContext.getString(R.string.red_packet_countdown), TimeUtils.getTime(redTimeCountdown)));
-                timeHandler.postDelayed(timeRunnable, 1000);
+                timeHandler.post(timeRunnable);
             } else {
                 redPacketQueue.setVisibility(View.VISIBLE);
                 redPacketCountdown.setVisibility(View.GONE);
             }
+            if (IMLoginManager.get(mContext).getUserInfo().anchorUserType() && mContext instanceof LiveRyAnchorActivity) {
+                anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
+                anchorTimeHandler.post(anchorTimeRunnable);
+            }
         } else {
             hindeRedPacket();
         }
@@ -1429,34 +1464,40 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.red_packet), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                LiveNetManager.get(mContext)
+
-                        .redPacketInfo(mLiveUid, redPacketModel.getRedPacketId(), new com.yunbao.common.http.base.HttpCallback<RedPacketInfoModel>() {
+                if (!(mContext instanceof LiveRyAnchorActivity)) {
-                            @Override
+                    LiveNetManager.get(mContext)
-                            public void onSuccess(RedPacketInfoModel data) {
+                            .redPacketInfo(mLiveUid, redPacketModel.getRedPacketId(), new com.yunbao.common.http.base.HttpCallback<RedPacketInfoModel>() {
-                                if (TextUtils.equals(data.getReceiveStatus(), "0")) {
+                                @Override
-                                    new XPopup.Builder(mContext)
+                                public void onSuccess(RedPacketInfoModel data) {
-                                            .asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false))
+                                    if (TextUtils.equals(data.getReceiveStatus(), "0")) {
-                                            .show();
+                                        new XPopup.Builder(mContext)
-                                } else if (TextUtils.equals(data.getReceiveStatus(), "1")) {
+                                                .asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false))
+                                                .show();
+                                    } else if (TextUtils.equals(data.getReceiveStatus(), "1")) {
+                                        new XPopup.Builder(mContext)
+                                                .asCustom(new ResultRendPacketPopup(mContext, true, null, false))
+                                                .show();
+                                    } else {
+                                        new XPopup.Builder(mContext)
+                                                .asCustom(new ResultRendPacketPopup(mContext, false, data.setRedPacketId(redPacketModel.getRedPacketId()), false))
+                                                .show();
+                                    }
+                                    if (TextUtils.equals(data.getConditions(), "1")) {
+                                        follow();
+                                    }
+                                }
+
+                                @Override
+                                public void onError(String error) {
+                                    ToastUtil.show(error);
                                     new XPopup.Builder(mContext)
                                             .asCustom(new ResultRendPacketPopup(mContext, true, null, false))
                                             .show();
-                                } else {
-                                    new XPopup.Builder(mContext)
-                                            .asCustom(new ResultRendPacketPopup(mContext, false, data.setRedPacketId(redPacketModel.getRedPacketId()), false))
-                                            .show();
                                 }
+                            });
+                }
 
-                            }
-
-                            @Override
-                            public void onError(String error) {
-                                ToastUtil.show(error);
-                                new XPopup.Builder(mContext)
-                                        .asCustom(new ResultRendPacketPopup(mContext, true, null, false))
-                                        .show();
-                            }
-                        });
 
             }
         });
@@ -1568,6 +1609,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      */
     public void resetView() {
         timeHandler.removeCallbacks(timeRunnable);
+        anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
         resetViewGone();
         visibility = false;
         pkUidTmp = "";
@@ -3681,6 +3723,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     public void clearData() {
         timeHandler.removeCallbacks(timeRunnable);
+        anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
         LiveHttpUtil.cancel(LiveHttpConsts.GET_USER_LIST);
         LiveHttpUtil.cancel(LiveHttpConsts.TIME_CHARGE);
         CommonHttpUtil.cancel(CommonHttpConsts.SET_ATTENTION);

live/src/main/java/com/yunbao/live/views/RedPacketLuckUserViewHolder.java

@@ -25,6 +25,6 @@ public class RedPacketLuckUserViewHolder extends RecyclerView.ViewHolder {
     public void showData(RedPacketGiftModel redPacketGiftModel) {
         ImgLoader.displayAvatar(itemView.getContext(), redPacketGiftModel.getGifticon(), giftImage);
         giftName.setText(redPacketGiftModel.getUserNicename());
-        giftNumber.setText(redPacketGiftModel.getGiftNum());
+        giftNumber.setText(redPacketGiftModel.getNeedcoin());
     }
 }

live/src/main/res/layout/view_live_room.xml

@@ -716,7 +716,8 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/live_rank_pk"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="15dp" />
+        android:layout_marginTop="15dp"
+        android:visibility="gone" />
 
     <FrameLayout
         android:id="@+id/btn_prize_pool_level"
@@ -746,7 +747,7 @@
             android:translationX="-48dp" />
 
     </FrameLayout>
-<!--接收-->
+    <!--接收-->
     <FrameLayout
         android:id="@+id/ft_hot_add"
         android:layout_width="81dp"

live/src/main/res/layout/view_red_packet_luck_user.xml

@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/gift_number"
-            android:layout_width="30dp"
+            android:layout_width="40dp"
             android:gravity="end"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"