From fea46aab1f2c66362daf22c898a77e2668d7c536 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 9 Aug 2023 17:05:51 +0800 Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/dialog_live_gift_popup.xml | 1 + common/src/main/res/values-en-rUS/string.xml | 12 ++++++------ common/src/main/res/values-zh-rHK/strings.xml | 8 ++++---- common/src/main/res/values-zh-rTW/strings.xml | 8 ++++---- common/src/main/res/values-zh/strings.xml | 8 ++++---- common/src/main/res/values/strings.xml | 10 +++++----- .../yunbao/live/activity/LiveAudienceActivity.java | 2 +- .../java/com/yunbao/live/dialog/LiveGiftPopup.java | 1 + 8 files changed, 26 insertions(+), 24 deletions(-) diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml index a489f4994..01dd778ed 100644 --- a/common/src/main/res/layout/dialog_live_gift_popup.xml +++ b/common/src/main/res/layout/dialog_live_gift_popup.xml @@ -356,6 +356,7 @@ android:id="@+id/gift_title" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginEnd="10dp" android:layout_marginStart="8dp" /> number Red successfully Select System Avatar - This function needs to be used to use it after lv.5, please work hard to upgrade ~ + This function needs to be used to use it after lv.5, please work hard to upgrade ~ No matter where you are, I am waiting for you in the live broadcast room ~ Watch LiveNotify %s experience upgrade,%s receive rewards You have reached the highest level! There\'s nothing in the package yet - Custom quantity + Enter count Gift wall Has been lit %s Illustrated book @@ -1282,10 +1282,10 @@ Limited ride And limited avatar frame A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement; Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated. The current user has a total of 4 achievements, namely being rich and capricious, sharing rain and dew, and giving gifts Gift machines, lighting masters. - Rich and capricious: Accumulated gifts worth 50K, 2M，10M, 100M, 300M, light up the corresponding achievements separately; - Rain and dew evenly: the cumulative Style quantity of gifts given to anchors reaches 10, 20, 50, 100，200, can achieve success; - gift machine: The cumulative number of gifts given reaches 200, 1000, 10K，100K，1M,light up the corresponding achievements separately; - lighting master: The number of unlocked Gift Walls has reached 10, 30, 50 At 100 and 200, light up the corresponding achievements separately. + Rich and willful: the cumulative number of gift value diamonds sent reaches 10M to light up this achievement; + Equal love: The cumulative number of people who have given gifts to the anchor reaches 50 to light up this achievement; + Gift machine: when the accumulated number of gifts reaches 1000, this achievement will be activated; + Lighting Master: Unlock [Gift Wall] reaches 100 to light up this achievement. rule The current event has not sent any gifts Rule introduction diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index c4f091157..3742dc4ea 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1278,10 +1278,10 @@ 富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就； 腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。 當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。 - 有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就 - 雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就； - 送禮機器：纍計贈送禮物個數達到200、1000、10K、00K、1M時，分別點亮對應的成就； - 點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就 + 有錢任性：纍計送出禮物價值鉆石數量達到10M點亮该成就； + 雨露均沾：纍計送禮給主播人數達到50點亮该成就； + 送禮機器：纍計贈送禮物個數達到1000點亮该成就； + 點燈大師：解鎖【禮物墻】的數量達到100點亮该成就 規則 当前活动暂未送出任何礼物哦 規則介紹 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index abbd53187..df1963a96 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1277,10 +1277,10 @@ 富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就； 腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。 當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。 - 有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就 - 雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就； - 送禮機器：纍計贈送禮物個數達到200、1000、10K、00K、1M時，分別點亮對應的成就； - 點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就 + 有錢任性：纍計送出禮物價值鉆石數量達到10M點亮该成就； + 雨露均沾：纍計送禮給主播人數達到50點亮该成就； + 送禮機器：纍計贈送禮物個數達到1000點亮该成就； + 點燈大師：解鎖【禮物墻】的數量達到100點亮该成就 規則 当前活动暂未送出任何礼物哦 規則介紹 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 74039fbf7..673c59614 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1277,10 +1277,10 @@ 富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就； 腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。 當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。 - 有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就 - 雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就； - 送禮機器：纍計贈送禮物個數達到200、1000、10K、100K、1M時，分別點亮對應的成就； - 點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就 + 有錢任性：纍計送出禮物價值鉆石數量達到10M點亮该成就； + 雨露均沾：纍計送禮給主播人數達到50點亮该成就； + 送禮機器：纍計贈送禮物個數達到1000點亮该成就； + 點燈大師：解鎖【禮物墻】的數量達到100點亮该成就 規則 當前活動暫未送出任何禮物哦 規則介紹 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index f9bb1bbc7..ebf612352 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1258,7 +1258,7 @@ Limited ride And limited avatar frame %s experience upgrade,%s receive rewards There\'s nothing in the package yet You have reached the highest level! - Custom quantity + Enter count Gift wall Has been lit %s Not lit up @@ -1281,10 +1281,10 @@ Limited ride And limited avatar frame A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement; Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated. The current user has a total of 4 achievements, namely being rich and capricious, sharing rain and dew, and giving gifts Gift machines, lighting masters. - Rich and capricious: Accumulated gifts worth 50K, 2M，10M, 100M, 300M, light up the corresponding achievements separately; - Rain and dew evenly: the cumulative Style quantity of gifts given to anchors reaches 10, 20, 50, 100，200, can achieve success; - gift machine: The cumulative number of gifts given reaches 200, 1000, 10K，100K，1M,light up the corresponding achievements separately; - lighting master: The number of unlocked Gift Walls has reached 10, 30, 50 At 100 and 200, light up the corresponding achievements separately. + Rich and willful: the cumulative number of gift value diamonds sent reaches 10M to light up this achievement; + Equal love: The cumulative number of people who have given gifts to the anchor reaches 50 to light up this achievement; + Gift machine: when the accumulated number of gifts reaches 1000, this achievement will be activated; + Lighting Master: Unlock [Gift Wall] reaches 100 to light up this achievement. rule Illustrated book Honor achievement diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 3f9a323a4..56bedbc22 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -1564,7 +1564,7 @@ public class LiveAudienceActivity extends LiveActivity { JSONObject item = (JSONObject) o; List giftlist = JSONArray.parseArray(item.getJSONArray("giftlist").toJSONString(), LiveGiftBean.class); for (LiveGiftBean bean : giftlist) { - if (!bean.getSwf().isEmpty()) { + if (bean!=null&&!bean.getSwf().isEmpty()) { giftBeanList.add(bean); } } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java index f071d7058..43a59f7cf 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -366,6 +366,7 @@ public class LiveGiftPopup extends AbsDialogFragment { @Override public void onFinish() { + getCoin(); // if (mLoading != null) { // mLoading.setVisibility(View.INVISIBLE); // }