6.5.4礼物冠名

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"

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>

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>

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() {

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>
 

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"