From 329bd632293eaa4d0a51a4ef3ebe921dede47d08 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Sun, 2 Apr 2023 16:31:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/res/values-en/strings.xml | 28 ++++++++++++++++++- config.gradle | 4 +-- .../yunbao/live/views/LiveRoomViewHolder.java | 5 ++++ live/src/main/res/values-en/strings.xml | 23 +++++++++++++-- 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml index 52ad1db6d..81ad887c4 100644 --- a/common/src/main/res/values-en/strings.xml +++ b/common/src/main/res/values-en/strings.xml @@ -1089,5 +1089,31 @@ Limited ride And limited avatar frame Get a fan badge for giving gifts Whether to clear unread messages The application collects location data to support login and registration functions. - 女神說 + Goddess says + Say something... + %s here comes + Daily Wishes + Weekly Wishes + Month Wishes + Seasonal Wishes + Wish%s + aristocrat + sure + Reset Your: Day + Reset Wish: Week + Reset Wish: Month + Reset Wish: Month + Is reset confirmed + Resetting will empty the wish list, \nregardless of whether the wish is completed or not + Confirm Reset + Back to list + Current wish list not saved + Do you keep a current wishlist? + Not saved + + You have a %s, do you want to use it? Use it to open a diamond %s and get %s gold beans back + Not used + Use + wish + Play setting diff --git a/config.gradle b/config.gradle index 6f5c50bd0..f6792f141 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", //测试 - serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index cdb485d22..2afed9b38 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1825,6 +1825,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } private void initPkRankView(PkRankBean bean) { + if (pkRankVf.getTag() != null) { return; } @@ -1851,6 +1852,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis pkRankVf.addView(hourView); pkRankVf.startFlipping(); pkRankVf.setTag("start"); + pkRankLayout.setVisibility(View.VISIBLE); } private void initPkRank() { @@ -1858,6 +1860,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public void initPkRank(String isLadders) { + pkRankLayout.setVisibility(View.GONE); + liveRankPk2.setVisibility(View.GONE); mRedVal.setVisibility(View.GONE); mBlueVal.setVisibility(View.GONE); mPkRankTopIcon.setVisibility(View.GONE); @@ -1897,6 +1901,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis }); } pkRankLayout.setVisibility(View.VISIBLE); + liveRankPk2.setVisibility(View.VISIBLE); mPkRankText.setText(bean.getName()); ImgLoader.display(mContext, bean.getImg(), mPkRankIcon); if (StringUtil.isEmpty(bean.getPkTopImgUrl())) { diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml index 74c1229ce..cec5d3ca1 100644 --- a/live/src/main/res/values-en/strings.xml +++ b/live/src/main/res/values-en/strings.xml @@ -67,6 +67,25 @@ Please enter the anchor nickname or id you want to pk The other team is engaged in a PK The PK number is used up - 来自%s的信 - 「%s」有更多話對你說 + Letter from %s + 「%s」have more to say to you + View details + Letter from[%s] + Editors Contact + Contact switch + Choose a gift + Not filled + Please fill in your contact details before enabling + No gift selected + Letter Content + The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair. + Contact details + Editors Goddess says + Please enter the words the goddess wants to say, limited to 16 words. + Select Style + The Goddess Says Switch + Delete Mail + Do you confirm the deletion of this email? + Delete + Think again \ No newline at end of file From 971fceebcd2cb5cdb188cd0cf18b18aba5ceb89d Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Sun, 2 Apr 2023 16:37:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=8F=E6=9C=BApk?= =?UTF-8?q?=E8=BD=AE=E6=92=AD=E8=83=8C=E6=99=AF=E5=B1=95=E7=A4=BA=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/live/views/LiveRoomViewHolder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 2afed9b38..5d604e95e 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1214,7 +1214,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1); new LoadDian9TuUtil().loadDian9TuAssets2(mContext, wishListLayout2, "rectangle_new.png", 1); - new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveRankPk2, "rectangle_new.png", 1); + } /** @@ -1902,6 +1902,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } pkRankLayout.setVisibility(View.VISIBLE); liveRankPk2.setVisibility(View.VISIBLE); + new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveRankPk2, "rectangle_new.png", 1); mPkRankText.setText(bean.getName()); ImgLoader.display(mContext, bean.getImg(), mPkRankIcon); if (StringUtil.isEmpty(bean.getPkTopImgUrl())) { From ed46eb30a87c2bac4d3c2d13648fe05385c98214 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Sun, 2 Apr 2023 17:22:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Share/src/main/res/layout/view_share_preview.xml | 2 +- Share/src/main/res/values-en/strings.xml | 8 ++++++++ Share/src/main/res/values/strings.xml | 3 +++ common/src/main/res/layout/custom_drawer_popup.xml | 2 +- live/src/main/res/layout/dialog_live_user_mailbox.xml | 2 +- live/src/main/res/values-en/strings.xml | 1 + live/src/main/res/values/strings.xml | 1 + 7 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 Share/src/main/res/values-en/strings.xml diff --git a/Share/src/main/res/layout/view_share_preview.xml b/Share/src/main/res/layout/view_share_preview.xml index f7c1e97f2..36705df33 100644 --- a/Share/src/main/res/layout/view_share_preview.xml +++ b/Share/src/main/res/layout/view_share_preview.xml @@ -42,7 +42,7 @@ android:layout_marginEnd="16dp" android:layout_weight="0.01" android:background="@drawable/bg_btn" - android:text="复制" + android:text="@string/dialog_share_copy" android:textColor="@color/white" android:textSize="16sp" /> diff --git a/Share/src/main/res/values-en/strings.xml b/Share/src/main/res/values-en/strings.xml new file mode 100644 index 000000000..603d8a677 --- /dev/null +++ b/Share/src/main/res/values-en/strings.xml @@ -0,0 +1,8 @@ + + + Share + Come and watch %s live on PDLIVE and meet more interesting people! + Invite Friends + Come to PDLIVE to discover more and better live streams. + Copy + \ No newline at end of file diff --git a/Share/src/main/res/values/strings.xml b/Share/src/main/res/values/strings.xml index 7a9acba8a..1a0b8debf 100644 --- a/Share/src/main/res/values/strings.xml +++ b/Share/src/main/res/values/strings.xml @@ -12,4 +12,7 @@ Instagram 邀請好友 + 獎勵記錄 + 快來 PDLIVE觀看直播，認識更多有趣的朋友吧！ + 複製 \ No newline at end of file diff --git a/common/src/main/res/layout/custom_drawer_popup.xml b/common/src/main/res/layout/custom_drawer_popup.xml index 5e987738f..5219897a9 100644 --- a/common/src/main/res/layout/custom_drawer_popup.xml +++ b/common/src/main/res/layout/custom_drawer_popup.xml @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" - android:text="分享" + android:text="@string/live_share" android:textColor="#FF9A9A9A" android:textSize="10sp" /> diff --git a/live/src/main/res/layout/dialog_live_user_mailbox.xml b/live/src/main/res/layout/dialog_live_user_mailbox.xml index 219556f99..bfa07f8f8 100644 --- a/live/src/main/res/layout/dialog_live_user_mailbox.xml +++ b/live/src/main/res/layout/dialog_live_user_mailbox.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_marginStart="85dp" android:layout_marginTop="45dp" - android:text="信件欄" + android:text="@string/dialog_live_mailbox_title" android:textColor="#FFFFFF" android:textSize="14sp" android:textStyle="bold" diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml index cec5d3ca1..acd2578d8 100644 --- a/live/src/main/res/values-en/strings.xml +++ b/live/src/main/res/values-en/strings.xml @@ -88,4 +88,5 @@ Do you confirm the deletion of this email? Delete Think again + Letter \ No newline at end of file diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index 9bde8b6fe..4771c26a3 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -86,5 +86,6 @@ 是否確認刪除此郵件 刪除 再想想 + 信件欄 From e5a07613aae8432cdb16db695502d59935ae2a07 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Sun, 2 Apr 2023 17:22:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=8F=E6=9C=BApk?= =?UTF-8?q?=E8=BD=AE=E6=92=AD=E8=83=8C=E6=99=AF=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 4 ++-- .../main/java/com/yunbao/live/views/LiveRoomViewHolder.java | 4 ++-- live/src/main/res/layout/view_live_room.xml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config.gradle b/config.gradle index f6792f141..6f5c50bd0 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", //测试 -// serverHost : "https://ceshi.yaoulive.com", + serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 5d604e95e..dfd1ef0a6 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1861,7 +1861,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void initPkRank(String isLadders) { pkRankLayout.setVisibility(View.GONE); - liveRankPk2.setVisibility(View.GONE); + new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveRankPk2, "rectangle_new.png", 1); mRedVal.setVisibility(View.GONE); mBlueVal.setVisibility(View.GONE); mPkRankTopIcon.setVisibility(View.GONE); @@ -1901,8 +1901,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis }); } pkRankLayout.setVisibility(View.VISIBLE); + liveRankPk2.setVisibility(View.VISIBLE); - new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveRankPk2, "rectangle_new.png", 1); mPkRankText.setText(bean.getName()); ImgLoader.display(mContext, bean.getImg(), mPkRankIcon); if (StringUtil.isEmpty(bean.getPkTopImgUrl())) { diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 468f7baf9..a1e332025 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -535,7 +535,7 @@ Date: Sun, 2 Apr 2023 17:29:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yunbao/live/views/PortraitLiveManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 6136964b3..c89f0513e 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -1058,7 +1058,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe LiveChatBean liveChatBean = bean.getLiveChatBean(); LiveUserGiftBean liveUserGiftBean = bean.getUserBean(); int level = liveUserGiftBean.getLevel(); - if (level >= 10) { + if (level >= 30) { //高等级飘屏 liveUserGiftBean.setUserNiceName(liveChatBean.getUserNiceName()); enterRoomModel.add(liveUserGiftBean);