From 2351618e5adfa0ebebb8b43d631a91b88a3bf853 Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Wed, 17 Jul 2024 13:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=92=E7=BB=9D=E9=9A=8F=E6=9C=BAPK=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=8B=B1=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/dialog/RandomPkDialogFragment.java  |  4 ++--
 .../live/presenter/LiveRyLinkMicPkPresenter.java    | 12 +++++++++---
 .../live/presenter/LiveSwLinkMicPkPresenter.java    | 13 ++++++++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java
index 5112dd593..53f09285d 100644
--- a/live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java
@@ -230,8 +230,8 @@ public class RandomPkDialogFragment extends AbsDialogFragment implements View.On
                             String title="您因拒絕隨機PK，被限制關閉中";
                             String content="隨機PK可打開時間：";
                             if(!WordUtil.isNewZh()){
-                                title="You are restricted for refusing random PK";
-                                content="Random PK can open time:";
+                                title="Can't start a PK for now due to the earlier rejection of other pk";
+                                content="Available again at：";
                             }
                             DialogUitl.showSimpleDialog(mContext,title , content + data.getMsg(), false, new DialogUitl.SimpleCallback() {
                                 @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 7a70b0f8c..039232dcc 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
@@ -1552,9 +1552,15 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
 
                     void showClose(Dialog dialog, View title, View context, View confirmBtn, View cancelBtn) {
                         task.cancel();
-                        ((TextView) title).setText("您因拒絕隨機PK，被限制關閉中");
-                        ((TextView) confirmBtn).setText("确定");
-                        ((TextView) context).setText("隨機PK可打開時間：" + new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).format(new Date(System.currentTimeMillis() + 7200000)));//7200000ms=120m=2h
+                        String title1="您因拒絕隨機PK，被限制關閉中";
+                        String content="隨機PK可打開時間：";
+                        if(!WordUtil.isNewZh()){
+                            title1="Can't start a PK for now due to the earlier rejection of other pk";
+                            content="Available again at：";
+                        }
+                        ((TextView) title).setText(title1);
+                        ((TextView) confirmBtn).setText(WordUtil.isNewZh()?"确定":"Sure");
+                        ((TextView) context).setText(content + 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);
diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
index ee7cf0d6e..7960a31ef 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
@@ -1145,9 +1145,16 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
 
             void showClose(Dialog dialog, View title, View context, View confirmBtn, View cancelBtn) {
                 task.cancel();
-                ((TextView) title).setText("您因拒絕隨機PK，被限制關閉中");
-                ((TextView) confirmBtn).setText("确定");
-                ((TextView) context).setText("隨機PK可打開時間：" + new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).format(new Date(System.currentTimeMillis() + 7200000)));//7200000ms=120m=2h
+
+                String title1="您因拒絕隨機PK，被限制關閉中";
+                String content="隨機PK可打開時間：";
+                if(!WordUtil.isNewZh()){
+                    title1="Can't start a PK for now due to the earlier rejection of other pk";
+                    content="Available again at：";
+                }
+                ((TextView) title).setText(title1);
+                ((TextView) confirmBtn).setText(WordUtil.isNewZh()?"確定":"Determine");
+                ((TextView) context).setText(content + 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);