yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.5.4礼物冠名

Browse Source
This commit is contained in:
18401019693 2023-08-09 17:05:51 +08:00
parent e032e0807b
commit fea46aab1f
8 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/res/layout/dialog_live_gift_popup.xml
View File

@ -356,6 +356,7 @@
android:id="@+id/gift_title" android:id="@+id/gift_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="10dp"
android:layout_marginStart="8dp" /> android:layout_marginStart="8dp" />
<ImageView <ImageView

12
common/src/main/res/values-en-rUS/string.xml
View File

@ -1250,14 +1250,14 @@ Limited ride And limited avatar frame</string>
<string name="lucky_red_envelope_amount">number</string> <string name="lucky_red_envelope_amount">number</string>
<string name="red_envelope_released_successfully">Red successfully</string> <string name="red_envelope_released_successfully">Red successfully</string>
<string name="me_edit_avatar_system">Select System Avatar</string> <string name="me_edit_avatar_system">Select System Avatar</string>
<string name="me_edit_avatar_system_tip">This function needs to be used to use it after lv.5, please work hard to upgrade ~</string> <string name="me_edit_avatar_system_tip">This function needs to be used to use it after lv.5, please work hard to upgrade ~</string>
<string name="main_anchor_live_notify_info">No matter where you are, I am waiting for you in the live broadcast room ~</string> <string name="main_anchor_live_notify_info">No matter where you are, I am waiting for you in the live broadcast room ~</string>
<string name="main_anchor_live_notify_live">Watch</string> <string name="main_anchor_live_notify_live">Watch</string>
<string name="live_notify_settings">LiveNotify</string> <string name="live_notify_settings">LiveNotify</string>
<string name="leveling_points">%s experience upgrade,%s receive rewards</string> <string name="leveling_points">%s experience upgrade,%s receive rewards</string>
<string name="reach_the_top">You have reached the highest level!</string> <string name="reach_the_top">You have reached the highest level!</string>
<string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string> <string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string>
<string name="custom_quantity">Custom quantity</string> <string name="custom_quantity">Enter count</string>
<string name="gift_wall">Gift wall</string> <string name="gift_wall">Gift wall</string>
<string name="has_been_lit">Has been lit %s</string> <string name="has_been_lit">Has been lit %s</string>
<string name="codex">Illustrated book</string> <string name="codex">Illustrated book</string>
@ -1282,10 +1282,10 @@ Limited ride And limited avatar frame</string>
<string name="gift_wall_entrance8_4">A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement;</string> <string name="gift_wall_entrance8_4">A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement;</string>
<string name="gift_wall_entrance8_5">Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated.</string> <string name="gift_wall_entrance8_5">Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated.</string>
<string name="gift_wall_entrance8_6">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.</string> <string name="gift_wall_entrance8_6">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.</string>
<string name="gift_wall_entrance8_7">Rich and capricious: Accumulated gifts worth 50K, 2M，10M, 100M, 300M, light up the corresponding achievements separately;</string> <string name="gift_wall_entrance8_7">Rich and willful: the cumulative number of gift value diamonds sent reaches 10M to light up this achievement;</string>
<string name="gift_wall_entrance8_8">Rain and dew evenly: the cumulative Style quantity of gifts given to anchors reaches 10, 20, 50, 100，200, can achieve success;</string> <string name="gift_wall_entrance8_8">Equal love: The cumulative number of people who have given gifts to the anchor reaches 50 to light up this achievement;</string>
<string name="gift_wall_entrance8_9">gift machine: The cumulative number of gifts given reaches 200, 1000, 10K，100K，1M,light up the corresponding achievements separately;</string> <string name="gift_wall_entrance8_9">Gift machine: when the accumulated number of gifts reaches 1000, this achievement will be activated;</string>
<string name="gift_wall_entrance8_10">lighting master: The number of unlocked Gift Walls has reached 10, 30, 50 At 100 and 200, light up the corresponding achievements separately.</string> <string name="gift_wall_entrance8_10">Lighting Master: Unlock [Gift Wall] reaches 100 to light up this achievement.</string>
<string name="regular_bubble">rule</string> <string name="regular_bubble">rule</string>
<string name="unlit_icon_hint2">The current event has not sent any gifts</string> <string name="unlit_icon_hint2">The current event has not sent any gifts</string>
<string name="rule_introduction">Rule introduction</string> <string name="rule_introduction">Rule introduction</string>

8
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -1278,10 +1278,10 @@
<string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string> <string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>
<string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string> <string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string>
<string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string> <string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string>
<string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就</string> <string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到10M點亮该成就；</string>
<string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就；</string> <string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到50點亮该成就；</string>
<string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到200、1000、10K、00K、1M時，分別點亮對應的成就；</string> <string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到1000點亮该成就；</string>
<string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就</string> <string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到100點亮该成就</string>
<string name="regular_bubble">規則</string> <string name="regular_bubble">規則</string>
<string name="unlit_icon_hint2">当前活动暂未送出任何礼物哦</string> <string name="unlit_icon_hint2">当前活动暂未送出任何礼物哦</string>
<string name="rule_introduction">規則介紹</string> <string name="rule_introduction">規則介紹</string>

8
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -1277,10 +1277,10 @@
<string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string> <string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>
<string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string> <string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string>
<string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string> <string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string>
<string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就</string> <string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到10M點亮该成就；</string>
<string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就；</string> <string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到50點亮该成就；</string>
<string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到200、1000、10K、00K、1M時，分別點亮對應的成就；</string> <string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到1000點亮该成就；</string>
<string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就</string> <string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到100點亮该成就</string>
<string name="regular_bubble">規則</string> <string name="regular_bubble">規則</string>
<string name="unlit_icon_hint2">当前活动暂未送出任何礼物哦</string> <string name="unlit_icon_hint2">当前活动暂未送出任何礼物哦</string>
<string name="rule_introduction">規則介紹</string> <string name="rule_introduction">規則介紹</string>

8
common/src/main/res/values-zh/strings.xml
View File

@ -1277,10 +1277,10 @@
<string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string> <string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>
<string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string> <string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string>
<string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string> <string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string>
<string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就</string> <string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到10M點亮该成就；</string>
<string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就；</string> <string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到50點亮该成就；</string>
<string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到200、1000、10K、100K、1M時，分別點亮對應的成就；</string> <string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到1000點亮该成就；</string>
<string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就</string> <string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到100點亮该成就</string>
<string name="regular_bubble">規則</string> <string name="regular_bubble">規則</string>
<string name="unlit_icon_hint2">當前活動暫未送出任何禮物哦</string> <string name="unlit_icon_hint2">當前活動暫未送出任何禮物哦</string>
<string name="rule_introduction">規則介紹</string> <string name="rule_introduction">規則介紹</string>

10
common/src/main/res/values/strings.xml
View File

@ -1258,7 +1258,7 @@ Limited ride And limited avatar frame</string>
<string name="leveling_points">%s experience upgrade,%s receive rewards</string> <string name="leveling_points">%s experience upgrade,%s receive rewards</string>
<string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string> <string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string>
<string name="reach_the_top">You have reached the highest level!</string> <string name="reach_the_top">You have reached the highest level!</string>
<string name="custom_quantity">Custom quantity</string> <string name="custom_quantity">Enter count</string>
<string name="gift_wall">Gift wall</string> <string name="gift_wall">Gift wall</string>
<string name="has_been_lit">Has been lit %s</string> <string name="has_been_lit">Has been lit %s</string>
<string name="unlit_icon">Not lit up</string> <string name="unlit_icon">Not lit up</string>
@ -1281,10 +1281,10 @@ Limited ride And limited avatar frame</string>
<string name="gift_wall_entrance8_4">A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement;</string> <string name="gift_wall_entrance8_4">A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement;</string>
<string name="gift_wall_entrance8_5">Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated.</string> <string name="gift_wall_entrance8_5">Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated.</string>
<string name="gift_wall_entrance8_6">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.</string> <string name="gift_wall_entrance8_6">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.</string>
<string name="gift_wall_entrance8_7">Rich and capricious: Accumulated gifts worth 50K, 2M，10M, 100M, 300M, light up the corresponding achievements separately;</string> <string name="gift_wall_entrance8_7">Rich and willful: the cumulative number of gift value diamonds sent reaches 10M to light up this achievement;</string>
<string name="gift_wall_entrance8_8">Rain and dew evenly: the cumulative Style quantity of gifts given to anchors reaches 10, 20, 50, 100，200, can achieve success;</string> <string name="gift_wall_entrance8_8">Equal love: The cumulative number of people who have given gifts to the anchor reaches 50 to light up this achievement;</string>
<string name="gift_wall_entrance8_9">gift machine: The cumulative number of gifts given reaches 200, 1000, 10K，100K，1M,light up the corresponding achievements separately;</string> <string name="gift_wall_entrance8_9">Gift machine: when the accumulated number of gifts reaches 1000, this achievement will be activated;</string>
<string name="gift_wall_entrance8_10">lighting master: The number of unlocked Gift Walls has reached 10, 30, 50 At 100 and 200, light up the corresponding achievements separately.</string> <string name="gift_wall_entrance8_10">Lighting Master: Unlock [Gift Wall] reaches 100 to light up this achievement.</string>
<string name="regular_bubble">rule</string> <string name="regular_bubble">rule</string>
<string name="codex">Illustrated book</string> <string name="codex">Illustrated book</string>
<string name="honorary_achievement">Honor achievement</string> <string name="honorary_achievement">Honor achievement</string>

2
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -1564,7 +1564,7 @@ public class LiveAudienceActivity extends LiveActivity {
JSONObject item = (JSONObject) o; JSONObject item = (JSONObject) o;
List<LiveGiftBean> giftlist = JSONArray.parseArray(item.getJSONArray("giftlist").toJSONString(), LiveGiftBean.class); List<LiveGiftBean> giftlist = JSONArray.parseArray(item.getJSONArray("giftlist").toJSONString(), LiveGiftBean.class);
for (LiveGiftBean bean : giftlist) { for (LiveGiftBean bean : giftlist) {
if (!bean.getSwf().isEmpty()) { if (bean!=null&&!bean.getSwf().isEmpty()) {
giftBeanList.add(bean); giftBeanList.add(bean);
} }
} }

1
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@ -366,6 +366,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
@Override @Override
public void onFinish() { public void onFinish() {
getCoin();
// if (mLoading != null) { // if (mLoading != null) {
// mLoading.setVisibility(View.INVISIBLE); // mLoading.setVisibility(View.INVISIBLE);
// } // }