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 66284053c..a489f4994 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup.xml
@@ -53,6 +53,7 @@
android:gravity="center_vertical">
<ImageView
+ android:id="@+id/gift_itle"
android:layout_width="54dp"
android:layout_height="13dp"
android:layout_marginStart="13dp"
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png b/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png
new file mode 100644
index 000000000..83ea01880
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png differ
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 26b8c1dff..15df89771 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -176,7 +176,7 @@
<string name="guard_guard">Guard</string>
<string name="guard_week_con">Contribution this week</string>
<string name="guard_no_data">anchor are waiting at your guard!</string>
- <string name="guard_tip_0">Let\'s open up a guard for our favorite anchor</string>
+ <string name="guard_tip_0">Turn on the guard for your favorite anchor!</string>
<string name="guard_tip_1">You are the current anchor\'s monthly guard \ n the guard date expires</string>
<string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
<string name="guard_gift_tip">Special gift for annual guard</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 7c77c20d7..8f022b06e 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -176,7 +176,7 @@
<string name="guard_guard">Guard</string>
<string name="guard_week_con">Contribution this week</string>
<string name="guard_no_data">anchor are waiting at your guard!</string>
- <string name="guard_tip_0">Let\'s open up a guard for our favorite anchor</string>
+ <string name="guard_tip_0">Turn on the guard for your favorite anchor!</string>
<string name="guard_tip_1">You are the current anchor\'s monthly guard \ n the guard date expires</string>
<string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
<string name="guard_gift_tip">Special gift for annual guard</string>
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 d3c6bcdf3..f071d7058 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -89,12 +89,13 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
/**
* 直播间新送礼弹窗
*/
public class LiveGiftPopup extends AbsDialogFragment {
- private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar;
+ private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar, giftItle;
private JSONArray liveGiftList;
private TextView diamondText, goldText, liveWrap, vipGoldDesc, vipGoldTitle, giftNumber;
private RecyclerView giftTitle;
@@ -163,6 +164,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
vipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc);
vipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle);
giftNumber = mRootView.findViewById(R.id.gift_number);
+ giftItle = mRootView.findViewById(R.id.gift_itle);
liveGiftSend = mRootView.findViewById(R.id.live_gift_send);
giftNumberLayout = mRootView.findViewById(R.id.gift_number_layout);
mLianText = mRootView.findViewById(R.id.lian_text);
@@ -317,6 +319,11 @@ public class LiveGiftPopup extends AbsDialogFragment {
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
}
});
+ if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+ ImgLoader.display(mContext, R.mipmap.icon_live_gift_gift_itle, giftItle);
+ } else {
+ ImgLoader.display(mContext, R.mipmap.icon_live_gift_gift_itle_en, giftItle);
+ }
}
private void initDate() {
diff --git a/live/src/main/res/layout/dialog_new_guard_list.xml b/live/src/main/res/layout/dialog_new_guard_list.xml
index 981a39668..75ca884bc 100644
--- a/live/src/main/res/layout/dialog_new_guard_list.xml
+++ b/live/src/main/res/layout/dialog_new_guard_list.xml
@@ -133,7 +133,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#A281FD"
- android:textSize="14sp" />
+ android:textSize="11sp" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/guard_tip2"
@@ -151,7 +151,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#A281FD"
- android:textSize="14sp"
+ android:textSize="11sp"
android:visibility="gone" />
</LinearLayout>
diff --git a/live/src/main/res/layout/dialog_new_live_user.xml b/live/src/main/res/layout/dialog_new_live_user.xml
index 505984def..62162d177 100644
--- a/live/src/main/res/layout/dialog_new_live_user.xml
+++ b/live/src/main/res/layout/dialog_new_live_user.xml
@@ -71,7 +71,7 @@
android:layout_marginStart="1dp"
android:text="@string/user_card_guard"
android:textColor="#FFFFFF"
- android:textSize="12sp" />
+ android:textSize="10sp" />
<ImageView
android:id="@+id/imageView4"