贵族图标替换

common/src/main/java/com/yunbao/common/bean/UserBean.java

@@ -58,6 +58,16 @@ public class UserBean implements Parcelable {
     private String is_bind;
     private String mobile;
     private String front_task;
+
+    public String getNoble_img() {
+        return noble_img;
+    }
+
+    public void setNoble_img(String noble_img) {
+        this.noble_img = noble_img;
+    }
+
+    private String noble_img;
     private String is_admin;
     @SerializedName("user_love_num")
     private int praise;

common/src/main/res/values-en-rUS/strings.xml

@@ -268,7 +268,7 @@
     <string name="live_cover">Live cover</string>
     <string name="live_cover_2">Change cover</string>
     <string name="live_title">Live broadcast title</string>
-    <string name="live_title_hint">Please write a title for the live broadcast room</string>
+    <string name="live_title_hint">Enter the title of the live broadcast~</string>
     <string name="live_class">Select Channel</string>
     <string name="live_class_choose">Select live channel</string>
     <string name="live_class_tip">During the live broadcast, if the operator finds that the selected channel does not match the live content, he / she will adjust your live channel.</string>

common/src/main/res/values/strings.xml

@@ -214,7 +214,7 @@
     <string name="live_cover">Live cover</string>
     <string name="live_cover_2">Change cover</string>
     <string name="live_title">Live broadcast title</string>
-    <string name="live_title_hint">Please write a title for the live broadcast room</string>
+    <string name="live_title_hint">Enter the title of the live broadcast~</string>
     <string name="live_class">Select Channel</string>
     <string name="live_class_choose">Select live channel</string>
     <string name="live_class_tip">During the live broadcast, if the operator finds that the selected channel does not match the live content, he / she will adjust your live channel.</string>

live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java

@@ -160,7 +160,10 @@ public class UserMoreInfoAdapter extends RefreshAdapter<UserBean> {
             tvName.setTextSize(12);
             tvName.setTextColor(mContext.getResources().getColor(R.color.white));
             if (type.equals("1")) {
-                if (!bean.getDress().getMedal().equals("")) {
+                String NobleImg=  bean.getNoble_img();
+                if (!TextUtils.isEmpty(NobleImg)){
+                    ImgLoader.display(mContext, NobleImg, mIcon);
+                } else if (!bean.getDress().getMedal().equals("")) {
                     ImgLoader.display(mContext, bean.getDress().getMedal(), mIcon);
                 } else {
                     int guardType = ((LiveUserGiftBean) bean).getGuardType();

live/src/main/res/layout/item_anchor_say.xml

@@ -39,7 +39,7 @@
         app:layout_constraintTop_toBottomOf="@+id/view2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="默認樣式"
+        android:text="@string/default_style"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="3dp"
         android:textColor="@color/white"

live/src/main/res/layout/view_live_room.xml

@@ -985,7 +985,8 @@
         android:text="@string/random_pk_info_btn_ing"
         android:textColor="#FFFFFF"
         android:textSize="10sp"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="gone"/>
 
     <LinearLayout
         android:id="@+id/goto_room_view"

live/src/main/res/layout/view_live_room_video_chat.xml

@@ -76,12 +76,13 @@
         android:ellipsize="end"
         android:maxWidth="50dp"
         android:maxLines="1"
+        android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="@+id/video_chat_bg1"
         app:layout_constraintEnd_toEndOf="@+id/video_chat_bg1"
         app:layout_constraintStart_toStartOf="@+id/video_chat_bg1"
-        tools:text="昵称111111111" />
+        tools:text="昵称11111111111111111111111111111" />
 
     <TextView
         android:id="@+id/sorNumberTv"
@@ -177,6 +178,7 @@
         android:ellipsize="end"
         android:maxWidth="50dp"
         android:maxLines="1"
+        android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="@+id/video_chat_bg2"
@@ -278,6 +280,7 @@
         android:maxLines="1"
         android:textColor="@color/white"
         android:textSize="10sp"
+        android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="@+id/video_chat_bg3"
         app:layout_constraintEnd_toEndOf="@+id/video_chat_bg3"
         app:layout_constraintStart_toStartOf="@+id/video_chat_bg3"

live/src/main/res/values-zh/strings.xml

@@ -81,7 +81,7 @@
     <string name="live_ready_anchor_call_me">聯繫方式</string>
     <string name="live_anchor_say_title">編輯女神說</string>
     <string name="live_anchor_say_edit_hint">请輸入女神想說的話，限40個字哦。</string>
-    <string name="live_anchor_say_select_style">选择样式</string>
+    <string name="live_anchor_say_select_style">選擇樣式</string>
     <string name="live_anchor_say_switch">女神說開關</string>
     <string name="live_user_letter_dialog_title">刪除郵件</string>
     <string name="live_user_letter_dialog_content">是否確認刪除此郵件</string>
@@ -177,4 +177,5 @@
     <string name="live_room_push_like_an">喜歡主播就關注ta吧~</string>
     <string name="trick_up">&lt;整蠱</string>
     <string name="enter_a_brief_title">請輸入簡短標題</string>
+    <string name="default_style">默認樣式</string>
 </resources>

live/src/main/res/values/strings.xml

@@ -180,4 +180,6 @@
     <string name="live_room_push_like_an">If you like this anchor, please subscribe to him.</string>
     <string name="trick_up">&lt;trick</string>
     <string name="enter_a_brief_title">Please enter a brief title.</string>
+    <string name="default_style">Default style</string>
+
 </resources>