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