新增【全服公告优化】

common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java

@@ -37,6 +37,8 @@ public class AllServerNotifyFFGGGDJANEvent extends BaseModel {
     private List<ButtonStyleDTO> 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;
     }

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",
 
             //百度语音识别
 

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);

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">
-            <ImageView
-                android:id="@+id/full_service_notice_new_bg"
+            tools:visibility="visible">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginStart="13dp"
-                android:layout_marginEnd="7dp"
-                android:scaleType="fitXY"
-                android:src="@mipmap/background_full_service_notice_new" />
+                android:layout_marginEnd="7dp">
+
+
+                <ImageView
+                    android:id="@+id/full_service_notice_new_bg"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/full_service_notice_new_tmp_bg"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/full_service_notice_new_icon"
+                    android:layout_width="52dp"
+                    android:layout_height="52dp"
+                    android:layout_marginStart="6dp"
+                    android:scaleType="fitCenter"
+                    android:src="@mipmap/full_service_notice_new_tmp_icon"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:visibility="visible" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -1249,7 +1275,7 @@
                     android:marqueeRepeatLimit="marquee_forever"
                     android:scrollHorizontally="true"
                     android:singleLine="true"
-                    android:text="字文文字文字文字文字fdsfsdfdsfdsfsdfdsfsdf文字文字"
+                    android:text="测试"
                     android:textColor="#fff"
                     android:textSize="13sp" />
 
@@ -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" />
                 </FrameLayout>