diff --git a/common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java b/common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java index 447dfa5ab..0b2de7dc5 100644 --- a/common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java +++ b/common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java @@ -37,6 +37,8 @@ public class AllServerNotifyFFGGGDJANEvent extends BaseModel { private List buttonStyle; @SerializedName("h5_type") private String h5Type; + @SerializedName("left_image") + private String leftImage; public String getH5Type() { return h5Type; @@ -47,6 +49,14 @@ public class AllServerNotifyFFGGGDJANEvent extends BaseModel { return this; } + public String getLeftImage() { + return leftImage; + } + + public void setLeftImage(String leftImage) { + this.leftImage = leftImage; + } + public String getMethod() { return method; } diff --git a/config.gradle b/config.gradle index fd33bfeaf..14d48a2a1 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", //百度语音识别 diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java index 7491d1629..00175716c 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java @@ -64,6 +64,7 @@ import com.yunbao.common.utils.HtmlTagHandler; import com.yunbao.common.utils.L; import com.yunbao.common.utils.LiveRoomCheckLivePresenter; import com.yunbao.common.utils.MicStatusManager; +import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -276,6 +277,7 @@ public class LiveGiftAnimPresenter { mFrameImageView = (FrameImageView) v.findViewById(R.id.all_frame_img); full_service_notice_new = v.findViewById(R.id.full_service_notice_new); full_service_notice_new_bg = v.findViewById(R.id.full_service_notice_new_bg); + full_service_notice_new_icon = v.findViewById(R.id.full_service_notice_new_icon); full_service_notice_new_text = v.findViewById(R.id.full_service_notice_new_text); iv_look_full_service_notice_new = v.findViewById(R.id.iv_look_full_service_notice_new); iv_look_full_service_notice_new3 = v.findViewById(R.id.iv_look_full_service_notice_new3); @@ -1147,6 +1149,7 @@ public class LiveGiftAnimPresenter { View full_service_notice_new; ImageView full_service_notice_new_bg; + ImageView full_service_notice_new_icon; TextView full_service_notice_new_text; TextView iv_look_full_service_notice_new; AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent; @@ -1181,6 +1184,12 @@ public class LiveGiftAnimPresenter { full_service_notice_new.setAlpha(1f); full_service_notice_new.setVisibility(View.VISIBLE); ImgLoader.display(mContext, event.getBackgroundImage(), full_service_notice_new_bg); + if(!StringUtil.isEmpty(event.getLeftImage())){ + full_service_notice_new_icon.setVisibility(View.VISIBLE); + ImgLoader.display(mContext,event.getLeftImage(),full_service_notice_new_icon); + }else{ + full_service_notice_new_icon.setVisibility(View.GONE); + } SpannableStringBuilder builder = new SpannableStringBuilder(); String msgN = WordUtil.isNewZh() ? event.getMsgCn() : event.getMsgEn(); builder.append(msgN); diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 94c376c3e..16ce4dcbe 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -1212,17 +1212,43 @@ android:layout_width="match_parent" android:layout_height="51dp" android:translationX="500dp" + android:visibility="invisible" tools:translationX="0dp" - tools:visibility="visible" - android:visibility="invisible"> - + + + android:layout_marginEnd="7dp"> + + + + + + + + @@ -1270,6 +1296,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clickable="true" + tools:text="btn" + tools:textColor="@color/white" android:gravity="center" android:textSize="12sp" /> diff --git a/live/src/main/res/mipmap-xxxhdpi/full_service_notice_new_tmp_bg.png b/live/src/main/res/mipmap-xxxhdpi/full_service_notice_new_tmp_bg.png new file mode 100644 index 000000000..ec713198e Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/full_service_notice_new_tmp_bg.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/full_service_notice_new_tmp_icon.png b/live/src/main/res/mipmap-xxxhdpi/full_service_notice_new_tmp_icon.png new file mode 100644 index 000000000..20b6aa792 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/full_service_notice_new_tmp_icon.png differ