diff --git a/common/src/main/java/com/yunbao/common/bean/UserBean.java b/common/src/main/java/com/yunbao/common/bean/UserBean.java index c314124d7..7a8cc728f 100644 --- a/common/src/main/java/com/yunbao/common/bean/UserBean.java +++ b/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; diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml index 0103c7040..1ba7f1561 100644 --- a/common/src/main/res/values-en-rUS/strings.xml +++ b/common/src/main/res/values-en-rUS/strings.xml @@ -268,7 +268,7 @@ Live cover Change cover Live broadcast title - Please write a title for the live broadcast room + Enter the title of the live broadcast~ Select Channel Select live channel 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. diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index fd4a6a151..7d8800ebf 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -214,7 +214,7 @@ Live cover Change cover Live broadcast title - Please write a title for the live broadcast room + Enter the title of the live broadcast~ Select Channel Select live channel 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. diff --git a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java index 57a120a59..a5eff968b 100644 --- a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java @@ -160,7 +160,10 @@ public class UserMoreInfoAdapter extends RefreshAdapter { 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(); diff --git a/live/src/main/res/layout/item_anchor_say.xml b/live/src/main/res/layout/item_anchor_say.xml index 6d219cb25..231658c02 100644 --- a/live/src/main/res/layout/item_anchor_say.xml +++ b/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" diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 43be18b8e..796dcf039 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/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"/> + tools:text="昵称11111111111111111111111111111" /> 聯繫方式 編輯女神說 请輸入女神想說的話,限40個字哦。 - 选择样式 + 選擇樣式 女神說開關 刪除郵件 是否確認刪除此郵件 @@ -177,4 +177,5 @@ 喜歡主播就關注ta吧~ <整蠱 請輸入簡短標題 + 默認樣式 diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index aaea9c0ae..1f2bbb1fe 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -180,4 +180,6 @@ If you like this anchor, please subscribe to him. <trick Please enter a brief title. + Default style + \ No newline at end of file