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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18142669586 2023-04-03 15:10:13 +08:00
commit 5697a19f91
11 changed files with 74 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Share/src/main/res/layout/view_share_preview.xml
View File

@ -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" />
</LinearLayout>

8
Share/src/main/res/values-en/strings.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="dialog_share_title">Share</string>
<string name="dialog_share_info">Come and watch %s live on PDLIVE and meet more interesting people!</string>
<string name="dialog_invite_title">Invite Friends</string>
<string name="dialog_invite_info">Come to PDLIVE to discover more and better live streams.</string>
<string name="dialog_share_copy">Copy</string>
</resources>

3
Share/src/main/res/values/strings.xml
View File

@ -12,4 +12,7 @@
<string name="dialog_share_app_instagram" translatable="false">Instagram</string>
<string name="dialog_invite_title">邀請好友</string>
<string name="dialog_invite_reward_title" translatable="false">獎勵記錄</string>
<string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
<string name="dialog_share_copy">複製</string>
</resources>

2
common/src/main/res/layout/custom_drawer_popup.xml
View File

@ -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" />
</LinearLayout>

28
common/src/main/res/values-en/strings.xml
View File

@ -1089,5 +1089,31 @@ Limited ride And limited avatar frame</string>
<string name="live_medal_des4">Get a fan badge for giving gifts</string>
<string name="clear_unread_messages">Whether to clear unread messages</string>
<string name="support_login">The application collects location data to support login and registration functions.</string>
<string name="layout_live_anchor_say_ready_title">女神說</string>
<string name="layout_live_anchor_say_ready_title">Goddess says</string>
<string name="say_something3">Say something...</string>
<string name="come_hint">%s here comes</string>
<string name="day_wish">Daily Wishes</string>
<string name="zhou_xin">Weekly Wishes</string>
<string name="lunar_wish">Month Wishes</string>
<string name="seasonal_wish">Seasonal Wishes</string>
<string name="wish_number">Wish%s</string>
<string name="aristocrat">aristocrat</string>
<string name="aristocrat_determine">sure</string>
<string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</string>
<string name="replacement_wish_lunar">Reset Wish: Month</string>
<string name="replacement_wish_seasonal">Reset Wish: Month</string>
<string name="replacement_reset_confirmed">Is reset confirmed</string>
<string name="replacement_reset_confirmed_hint">Resetting will empty the wish list, \nregardless of whether the wish is completed or not</string>
<string name="replacement_reset_confirmed_sure">Confirm Reset</string>
<string name="replacement_reset_confirmed_cancel">Back to list</string>
<string name="replacement_reset_confirmed_cancel2">Current wish list not saved</string>
<string name="replacement_reset_confirmed_cancel3">Do you keep a current wishlist?</string>
<string name="replacement_reset_confirmed_cancel4">Not saved</string>
<string name="live_use_discount_content">You have a %s, do you want to use it? Use it to open a diamond %s and get %s gold beans back</string>
<string name="live_use_discount_no">Not used</string>
<string name="live_use_discount_yes">Use</string>
<string name="live_use_wish">wish</string>
<string name="live_play_setting">Play setting</string>
</resources>

8
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -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);
}
/**
@ -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);
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveRankPk2, "rectangle_new.png", 1);
mRedVal.setVisibility(View.GONE);
mBlueVal.setVisibility(View.GONE);
mPkRankTopIcon.setVisibility(View.GONE);
@ -1897,6 +1901,8 @@ 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())) {

2
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -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);

2
live/src/main/res/layout/dialog_live_user_mailbox.xml
View File

@ -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"

3
live/src/main/res/layout/view_live_room.xml
View File

@ -535,7 +535,7 @@
<FrameLayout
android:id="@+id/live_rank_pk"
android:layout_width="70dp"
android:layout_width="85dp"
android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_alignParentEnd="true"
@ -552,6 +552,7 @@
<ViewFlipper
android:id="@+id/rank_pk_vf"
android:layout_marginStart="5dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:flipInterval="5000"

24
live/src/main/res/values-en/strings.xml
View File

@ -67,6 +67,26 @@
<string name="random_pk_search_hint" >Please enter the anchor nickname or id you want to pk</string>
<string name="free_pk_user_pking" >The other team is engaged in a PK</string>
<string name="free_pk_num_null" >The PK number is used up</string>
<string name="live_user_mailbox_top_text">来自%s的信</string>
<string name="live_user_mailbox_tip_text">「%s」有更多話對你說</string>
<string name="live_user_mailbox_top_text">Letter from %s</string>
<string name="live_user_mailbox_tip_text">「%s」have more to say to you</string>
<string name="live_user_mailbox_more_text">View details</string>
<string name="live_user_mailbox_web_title">Letter from[%s]</string>
<string name="live_anchor_edit_call_me_title">Editors Contact</string>
<string name="live_anchor_edit_call_me_switch">Contact switch</string>
<string name="live_anchor_edit_call_me_select_gift">Choose a gift</string>
<string name="live_anchor_edit_call_me_not_filled">Not filled</string>
<string name="live_anchor_edit_call_me_not_filled_toash">Please fill in your contact details before enabling</string>
<string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
<string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
<string name="live_anchor_edit_call_me_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.</string>
<string name="live_ready_anchor_call_me">Contact details</string>
<string name="live_anchor_say_title">Editors Goddess says</string>
<string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
<string name="live_anchor_say_select_style">Select Style</string>
<string name="live_anchor_say_switch">The Goddess Says Switch</string>
<string name="live_user_letter_dialog_title">Delete Mail</string>
<string name="live_user_letter_dialog_content">Do you confirm the deletion of this email?</string>
<string name="live_user_letter_dialog_yes">Delete</string>
<string name="live_user_letter_dialog_no">Think again</string>
<string name="dialog_live_mailbox_title">Letter</string>
</resources>

1
live/src/main/res/values/strings.xml
View File

@ -86,5 +86,6 @@
<string name="live_user_letter_dialog_content">是否確認刪除此郵件</string>
<string name="live_user_letter_dialog_yes">刪除</string>
<string name="live_user_letter_dialog_no">再想想</string>
<string name="dialog_live_mailbox_title">信件欄</string>
</resources>