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/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/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index cdb485d22..dfd1ef0a6 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);
+
}
/**
@@ -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())) {
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);
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/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 @@
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
+ 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 @@
是否確認刪除此郵件
刪除
再想想
+ 信件欄