diff --git a/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java b/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java index 653e05343..32fccb6c4 100644 --- a/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java +++ b/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java @@ -87,7 +87,6 @@ public class RandomPkManager { @Override public void run() { - status = PK_STATUS_REQUEST; sec++; if (sec % 60 == 0) { min++; @@ -114,9 +113,10 @@ public class RandomPkManager { * 对方拒绝,开始下一轮匹配 */ private void nextPk() { - if (status != PK_STATUS_REQUEST && status != PK_STATUS_REFUSE) { + if (status != PK_STATUS_DEFAULT && status != PK_STATUS_REFUSE) { return; } + status = PK_STATUS_REQUEST; LiveNetManager.get(CommonAppContext.getTopActivity()) .randomPK(new HttpCallback() { @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 1f208a067..d117eedf5 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java @@ -1261,10 +1261,9 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { ((TextView) context).setText("隨機PK可打開時間:" + new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).format(new Date(System.currentTimeMillis() + 7200000)));//7200000ms=120m=2h ((TextView) context).setTextSize(12); ((TextView) context).setTextColor(Color.parseColor("#999999")); - + refusePk(u); cancelBtn.setVisibility(View.GONE); confirmBtn.setOnClickListener(v -> { - refusePk(u); dialog.dismiss(); }); }