From cd0067d77bd87e3c5c71105a5ff1c338a9c14786 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 7 Feb 2023 14:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E4=BA=BAPK=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9FPK=E9=80=81=E7=A4=BC=E4=BB=8D=E7=84=B6=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BAPK=E7=BB=93=E6=9D=9F=E7=94=BB=E9=9D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yunbao/common/http/PDLiveApi.java  |  5 +++++
 .../com/yunbao/common/http/live/LiveNetManager.java  | 12 ++++++++++++
 .../yunbao/live/activity/LiveRyAnchorActivity.java   |  2 ++
 .../live/presenter/LiveRyLinkMicPkPresenter.java     | 10 +++++++++-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
index 50fd3d6a0..dee1a5e78 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -537,4 +537,9 @@ public interface PDLiveApi {
     Observable<ResponseModel<LiveStetUpStatusModel>> getLiveStetUpStatus(
             @Query("liveuid") String liveUid
     );
+
+    @GET("/api/public/?service=live.jieshuDRPK")
+    Observable<ResponseModel<BaseModel>> jieshuDRPK(
+            @Query("roomid") String roomId,
+            @Query("uid") String uid);
 }
diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
index fee7cbbc5..a1aa6c25d 100644
--- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
+++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
@@ -1063,6 +1063,18 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
+    public void jieshuDRPK(String uID) {
+        API.get().pdLiveApi(mContext)
+                .jieshuDRPK(uID, uID)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(baseModelResponseModel -> {
+
+                }, throwable -> {
+
+                }).isDisposed();
+    }
+
     /**
      * 直播间取消网络请求
      */
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
index 06dd88fe3..a673b8630 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
@@ -163,6 +163,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
     public static int backIndex = 0;//0=未判断，1=已判断
     private FaceManager manager;
     private ImageView leave_img;
+
     private final RandomPkManager.OnRandomPkTimer onRandomPkTimer = new RandomPkManager.OnRandomPkTimer() {
         @Override
         public void onTimer(String time) {
@@ -422,6 +423,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                                                                                 public void onSuccess(Message message) {
                                                                                     isDRPK = 1;
                                                                                     btn_start_dr_pk_view.setVisibility(View.VISIBLE);
+                                                                                    mLiveRyLinkMicPkPresenter.setDRInitiator(true);
                                                                                 }
 
                                                                                 @Override
diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
index ef1b75824..26205c2d8 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
@@ -155,6 +155,12 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
 
     public static List<RCRTCInputStream> inputStreamList = new ArrayList<>();
     public static List<RCRTCInputStream> inputStreamList1 = new ArrayList<>();
+    private boolean DRInitiator = false;//是否是duorenPK发起人
+
+    public LiveRyLinkMicPkPresenter setDRInitiator(boolean DRInitiator) {
+        this.DRInitiator = DRInitiator;
+        return this;
+    }
 
     private IRCRTCOtherRoomEventsListener otherRoomEventsListener = new IRCRTCOtherRoomEventsListener() {
 
@@ -2457,7 +2463,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
      * 更新Pk分数
      */
     public void upDataPkScore(JSONArray pkScores, String uid, int time) {
-        if (time <= 0) return;
         String userID1 = (String) imageGrade1.getTag();
         String userID2 = (String) imageGrade2.getTag();
         String userID4 = (String) imageGrade4.getTag();
@@ -2669,6 +2674,9 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
             Bus.get().post(new LiveAudienceEvent()
                     .setType(LiveAudienceEvent.LiveAudienceType.PK_TIME_COUNT));
 //            endDRGif();
+            if (DRInitiator) {
+                LiveNetManager.get(mContext).jieshuDRPK("" + IMLoginManager.get(mContext).getUserInfo().getId());
+            }
         }
     }