From a475e5dc2fbde61a7110fd49786c019203b864f6 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Fri, 15 Sep 2023 16:15:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/res/values-en-rUS/string.xml | 47 ++++++++++--------- common/src/main/res/values-zh-rHK/strings.xml | 2 + common/src/main/res/values-zh-rTW/strings.xml | 2 + common/src/main/res/values-zh/strings.xml | 1 + common/src/main/res/values/strings.xml | 47 ++++++++++--------- .../presenter/LiveRyLinkMicPkPresenter.java | 6 +++ .../live/views/LivePlayRyViewHolder.java | 4 +- .../live/views/LivePushRyViewHolder.java | 1 + live/src/main/res/values-en/strings.xml | 2 +- 9 files changed, 64 insertions(+), 48 deletions(-) diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index fc726adaf..dddb57c8a 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -56,14 +56,14 @@ No QQ installed Replication link Replication success - Editing materials - Head portrait - Nickname + Edit + Photo + Name ModifyName Modify remarks Please enter comments~ Signature - autograph + Bio Binding phone TASK1 TASK2 @@ -242,8 +242,8 @@ Service and privacy terms Other login methods More exciting experience after registering! - Please enter your mobile number - Please input a password + Phone Number + Password Login immediately Logon Immediate registration @@ -254,9 +254,9 @@ privilege grant failed Authorization cancelled Live broadcast - Login + Log in shopmall - Recomm + Recommend CSD anchor Live broadcast @@ -289,7 +289,7 @@ Trickster MultiplayerPK Voice Link - Start + billboard LeaveTemporarily ResumeLive Flash lamp @@ -491,11 +491,11 @@ register Please enter your mobile number Please enter the verification code - Please fill in the password - Please confirm the password - Fill in the invitation code (optional) + Password + Password Again + Invite Code(Optional) Register and log in - Get verification code + Get Code Regain Passwords are inconsistent In registration @@ -659,7 +659,7 @@ Preservation Register No one is currently in the voice link - Welcome to PDLIVE + Welcome to PDLive Newcomer Bonus EXP Complete newcomer tasks for more rewards @@ -888,7 +888,7 @@ Limited ride And limited avatar frame Online Service Hot Ticket Register and log in - Sign up for PD LIVE + Sign in PDlive Tell the world！ Tell the world! %s recommends anchor %s to everyone! Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！ @@ -1018,7 +1018,7 @@ Limited ride And limited avatar frame There is no choice, the anchor is not turned on FHD live. There is no choice, the anchor is not turned on HD live. Sorry, this feature is on hold. - phone + Phone Number Broadcast Click To View Anchor Task @@ -1047,10 +1047,10 @@ Limited ride And limited avatar frame Go to the sign-in center Confirm pick up Unable to login? Click here to contact customer service - By logging in, you agree to the Terms of - Service - and - Privacy + By continuing, you are agree to our Terms of + use + & + Privacy Policy Terms and policies For details, please read the following message to install the application: Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection. @@ -1126,7 +1126,7 @@ Limited ride And limited avatar frame unfollow Where is the host doing badly~\nBrother, are you sure you want to unfollow? follow - Heat Add + Heating LOW DEFAULT HIGH @@ -1150,7 +1150,7 @@ Limited ride And limited avatar frame Do you want to delete the account After clicking delete, it will take effect immediately and cannot be restored. Are you sure you want to continue? Confirm deletion - Fill And gift + Fill for Gift Fill in the \'*\' option to complete True love powder\nPhoto Frame(7 days) 128 Golden Beans @@ -1211,7 +1211,7 @@ Limited ride And limited avatar frame None Return to account Popularity Red packet - Red packets + Earn Cash Popular red packets amount Diamonds @@ -1318,5 +1318,6 @@ Limited ride And limited avatar frame Whether to use trial coupons Use diamonds Join a fans club + Sorry, your network failed to pull the other party. diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index f3721d6bd..5f0e8673c 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1314,4 +1314,6 @@ 是否使用試用劵 使用鑽石 加入粉絲團 + + 抱歉，您的網絡不佳拉取對方畫面失敗 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index d3839869a..1bf4efe05 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1313,4 +1313,6 @@ 主播： 是否使用試用劵 使用鑽石 + + 抱歉，您的網絡不佳拉取對方畫面失敗 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 7808238ad..32ba03fde 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1314,5 +1314,6 @@ 主播： 加入粉絲團 + 抱歉，您的網絡不佳拉取對方畫面失敗 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index a610a1f49..3b2d1df10 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -56,14 +56,14 @@ No QQ installed Replication link Replication success - Editing materials - Head portrait - Nickname + Edit + Photo + Name ModifyName Modify remarks Please enter comments~ Signature - autograph + Bio Binding phone TASK1 TASK2 @@ -242,8 +242,8 @@ Service and privacy terms Other login methods More exciting experience after registering! - Please enter your mobile number - Please input a password + Phone Number + Password Login immediately Logon Immediate registration @@ -254,9 +254,9 @@ privilege grant failed Authorization cancelled Live broadcast - Login + Log in shopmall - Recomm + Recommend CSD anchor Live broadcast @@ -289,7 +289,7 @@ Trickster MultiplayerPK Voice Link - Start + billboard LeaveTemporarily ResumeLive Flash lamp @@ -491,11 +491,11 @@ register Please enter your mobile number Please enter the verification code - Please fill in the password - Please confirm the password - Fill in the invitation code (optional) + Password + Password Again + Invite Code(Optional) Register and log in - Get verification code + Get Code Regain Passwords are inconsistent In registration @@ -659,7 +659,7 @@ Preservation Register No one is currently in the voice link - Welcome to PDLIVE + Welcome to PDLive Newcomer Bonus EXP Complete newcomer tasks for more rewards @@ -888,7 +888,7 @@ Limited ride And limited avatar frame Online Service Hot Ticket Register and log in - Sign up for PD LIVE + Sign in PDlive Tell the world！ Tell the world! %s recommends anchor %s to everyone! Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！ @@ -1018,7 +1018,7 @@ Limited ride And limited avatar frame There is no choice, the anchor is not turned on FHD live. There is no choice, the anchor is not turned on HD live. Sorry, this feature is on hold. - phone + Phone Number Broadcast Click To View Anchor Task @@ -1047,10 +1047,10 @@ Limited ride And limited avatar frame Go to the sign-in center Confirm pick up Unable to login? Click here to contact customer service - By logging in, you agree to the Terms of - Service - and - Privacy + By continuing, you are agree to our Terms of + use + & + Privacy Policy Terms and policies For details, please read the following message to install the application: Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection. @@ -1126,7 +1126,7 @@ Limited ride And limited avatar frame unfollow Where is the host doing badly~\nBrother, are you sure you want to unfollow? follow - Heat Add + Heating LOW DEFAULT HIGH @@ -1168,7 +1168,7 @@ Limited ride And limited avatar frame VOTE %s
box disappears after %s seconds Please complete the form. - Fill And gift + Fill for Gift Fill in the \'*\' option to complete True love powder\nPhoto Frame(7 days) 128 Golden Beans @@ -1212,7 +1212,7 @@ Limited ride And limited avatar frame None Return to account Popularity Red packet - Red packets + Earn Cash Popular red packets amount Diamonds @@ -1320,4 +1320,5 @@ Limited ride And limited avatar frame Anchor: Join a fans club + Sorry, your network failed to pull the other party. 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 8fa494aef..071ac25ba 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java @@ -642,6 +642,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.i("ry", "订阅资源失败： " + rtcErrorCode.getReason()); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); } @@ -768,6 +769,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.i("ry", "订阅资源失败： " + rtcErrorCode.getReason()); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); } @@ -924,6 +926,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.i("ry", "订阅资源失败： " + rtcErrorCode); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); } @@ -1000,6 +1003,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.e("ry", "订阅资源失败： " + rtcErrorCode); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); } @@ -1773,6 +1777,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.i("ry", "订阅资源失败： " + rtcErrorCode.getReason()); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); //2. 合流画布设置 @@ -1963,6 +1968,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.i("ry", "订阅资源失败： " + rtcErrorCode.getReason()); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); diff --git a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java index d450c23af..dd25ac6dd 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java @@ -1007,7 +1007,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { @Override public void onFailed(RTCErrorCode errorCode) { Log.e("ry", userinputStreamList.size() + LiveActivity.mLiveUid + "订阅失败" + errorCode.toString()); - + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } @Override @@ -1045,6 +1045,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.e("ry", "远端失败" + list.size()); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); } @@ -1197,6 +1198,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.e("ry", "订阅资源失败： " + rtcErrorCode.getReason()); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); } diff --git a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java index daa33924a..d8eb63a61 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java @@ -176,6 +176,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX @Override public void onFailed(RTCErrorCode rtcErrorCode) { Log.e("ry", "远端失败" + list.size()); + ToastUtil.show(mContext.getString(R.string.live_pk_link_error)); } }); } diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml index f7a06979e..00b2440af 100644 --- a/live/src/main/res/values-en/strings.xml +++ b/live/src/main/res/values-en/strings.xml @@ -45,7 +45,7 @@ Release cancel send No recording has been recognized in over 10 seconds Identity privilege - Nobleman\'s seat + VIP seats %s applies for connected wheat. Check whether The wheat has been kicked off An invitation has been sent and is waiting for the user to accept From 7b5cd9b79720ed49f2c254e3781067153ba5986c Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Sat, 16 Sep 2023 10:53:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/res/values-en-rUS/string.xml | 6 +++--- common/src/main/res/values-zh-rHK/strings.xml | 1 + common/src/main/res/values-zh-rTW/strings.xml | 1 + common/src/main/res/values-zh/strings.xml | 2 +- common/src/main/res/values/strings.xml | 8 +++++--- live/src/main/res/layout/dialog_new_live_user.xml | 2 +- live/src/main/res/layout/view_noble_seat.xml | 5 ++--- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index dddb57c8a..d2c6e9562 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -829,8 +829,8 @@ You can only speak after completing the previous task - Heat addition - Hot & Time + HEATING + Heat & Time The popularity can increase the exposure to the anchor\'s room. The higher the live broadcast room, the more popular on the homepage, which will bring more users in the house and help the anchor to quickly increase the room heat in a period of time. Immediately after the delivery Effective. How to get the heat card? @@ -1319,5 +1319,5 @@ Limited ride And limited avatar frame Use diamonds Join a fans club Sorry, your network failed to pull the other party. - + say something diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 5f0e8673c..6667a300c 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1316,4 +1316,5 @@ 加入粉絲團 抱歉，您的網絡不佳拉取對方畫面失敗 + 這家夥很懶，什麽都沒留下 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 1bf4efe05..b38df1870 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1315,4 +1315,5 @@ 使用鑽石 抱歉，您的網絡不佳拉取對方畫面失敗 + 這家夥很懶，什麽都沒留下 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 32ba03fde..e1c3c7772 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1315,5 +1315,5 @@ 加入粉絲團 抱歉，您的網絡不佳拉取對方畫面失敗 - + 這家夥很懶，什麽都沒留下 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 3b2d1df10..db6cee635 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -829,8 +829,8 @@ You can only speak after completing the previous task - Heat addition - Hot & Time + HEATING + Heat & Time The popularity can increase the exposure to the anchor\'s room. The higher the live broadcast room, the more popular on the homepage, which will bring more users in the house and help the anchor to quickly increase the room heat in a period of time. Immediately after the delivery Effective. How to get the heat card? @@ -956,7 +956,7 @@ Limited ride And limited avatar frame Chat Congratulations %s have won %s in the Lucky Angel! The next lucky angel will be you! Congratulations on %s winning %s in Luck 100 %%! Go pass on the good luck! - Guardian %s + guard %s receive To finish Already collected @@ -1321,4 +1321,6 @@ Limited ride And limited avatar frame Join a fans club Sorry, your network failed to pull the other party. + + say something diff --git a/live/src/main/res/layout/dialog_new_live_user.xml b/live/src/main/res/layout/dialog_new_live_user.xml index 62162d177..0a674ad44 100644 --- a/live/src/main/res/layout/dialog_new_live_user.xml +++ b/live/src/main/res/layout/dialog_new_live_user.xml @@ -327,7 +327,7 @@ android:id="@+id/sign" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="這家夥很懶，什麽都沒留下" + android:text="@string/live_user_dialog_tips" android:textColor="#B1B1B1" android:textSize="14sp" /> diff --git a/live/src/main/res/layout/view_noble_seat.xml b/live/src/main/res/layout/view_noble_seat.xml index 0bafa7619..738e26e86 100644 --- a/live/src/main/res/layout/view_noble_seat.xml +++ b/live/src/main/res/layout/view_noble_seat.xml @@ -8,7 +8,7 @@ @@ -28,14 +28,13 @@ From 6e8842d30d09e3eb764118f500fe0acfd429ec10 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Sat, 16 Sep 2023 14:23:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20config=E5=8A=A0=E5=85=A5=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shayu/phonelive/activity/LauncherActivity.java | 3 +++ .../src/main/java/com/yunbao/common/http/CommonHttpUtil.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java index 5251deee9..0415e00e9 100644 --- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java +++ b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java @@ -229,8 +229,11 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL } else { checkUidAndToken(); } + }else{ + ToastUtil.show(getString(R.string.net_error)); } } + }); } diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java index 7431a5d51..66ac11f22 100644 --- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java +++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java @@ -13,6 +13,7 @@ import com.lzy.okgo.callback.StringCallback; import com.lzy.okgo.model.Response; import com.lzy.okgo.request.PostRequest; import com.yunbao.common.CommonAppConfig; +import com.yunbao.common.CommonAppContext; import com.yunbao.common.R; import com.yunbao.common.activity.ErrorActivity; import com.yunbao.common.bean.ConfigBean; @@ -260,6 +261,8 @@ public class CommonHttpUtil { AppManager.getInstance().AppExit(); } }).build().show(); + } else { + ToastUtil.show(CommonAppContext.getTopActivity().getString(R.string.net_error) + "code:" + code + " msg:" + msg); } } From 3595b896724aa986bdbe100e4e93aa7421b727df Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Sat, 16 Sep 2023 14:24:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4=E8=8B=B1=E6=96=87P?= =?UTF-8?q?K=E6=83=A9=E7=BD=9A=E5=80=92=E8=AE=A1=E6=97=B6=E8=BF=87?= =?UTF-8?q?=E9=95=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- live/src/main/res/layout/view_link_mic_pk.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/live/src/main/res/layout/view_link_mic_pk.xml b/live/src/main/res/layout/view_link_mic_pk.xml index bf94be235..1708a0dc5 100644 --- a/live/src/main/res/layout/view_link_mic_pk.xml +++ b/live/src/main/res/layout/view_link_mic_pk.xml @@ -1,6 +1,7 @@ @@ -159,17 +160,19 @@ + android:visibility="invisible" + tools:visibility="visible" />