自测修复，全服添加主播端

live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java

@@ -51,6 +51,7 @@ import com.yunbao.common.bean.MicUserBean;
 import com.yunbao.common.bean.SendMoneyLongModel;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.dialog.NotCancelableDialog;
+import com.yunbao.common.event.AllServerNotifyFFGGGDJANEvent;
 import com.yunbao.common.event.GiftWallIlluminateEvent;
 import com.yunbao.common.event.LiveSudGamePopupShowOrHideEvent;
 import com.yunbao.common.event.LoginInvalidEvent;
@@ -1923,4 +1924,10 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
 
 
     }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onAllServerNotifyFFGGGDJANEvent(AllServerNotifyFFGGGDJANEvent event) {
+        if (mLiveRoomViewHolder != null) {
+            mLiveRoomViewHolder.showAllServerNotifyFFGGGD(event,false);
+        }
+    }
 }

live/src/main/java/com/yunbao/live/bean/LiveReceiveGiftBean.java

@@ -68,6 +68,16 @@ public class LiveReceiveGiftBean extends BaseModel {
     private String msg_en;
     private String guard_type;
     private AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent;
+    private boolean showB;
+
+    public boolean isShowB() {
+        return showB;
+    }
+
+    public LiveReceiveGiftBean setShowB(boolean showB) {
+        this.showB = showB;
+        return this;
+    }
 
     public AllServerNotifyFFGGGDJANEvent getNotifyFFGGGDJANEvent() {
         return notifyFFGGGDJANEvent;

live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java

@@ -39,6 +39,7 @@ import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.opensource.svgaplayer.utils.SVGARect;
+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.HtmlConfig;
@@ -905,7 +906,7 @@ public class LiveGiftAnimPresenter {
         } else if (action == 90) {
             showBuyGuardGiftAnimNew(notifyGuardEvent);
         } else if (action == 91) {
-            showAllServerNotifyFFGGGD(bean.getNotifyFFGGGDJANEvent());
+            showAllServerNotifyFFGGGD(bean.getNotifyFFGGGDJANEvent(), bean.isShowB());
         }
     }
 
@@ -1099,7 +1100,7 @@ public class LiveGiftAnimPresenter {
     View iv_look_full_service_notice_new3;
     ImageView iv_look_full_service_notice_new2;
 
-    public void showAllServerNotifyFFGGGD(AllServerNotifyFFGGGDJANEvent event) {
+    public void showAllServerNotifyFFGGGD(AllServerNotifyFFGGGDJANEvent event, boolean showB) {
         if (TextUtils.isEmpty(event.getBackgroundImage())) return;
 
 
@@ -1109,6 +1110,7 @@ public class LiveGiftAnimPresenter {
                 LiveReceiveGiftBean bean = new LiveReceiveGiftBean();
                 bean.setSendtype(91);
                 bean.setNotifyFFGGGDJANEvent(event);
+                bean.setShowB(showB);
                 mGifAll.offer(bean);
             }
         } else {
@@ -1135,6 +1137,16 @@ public class LiveGiftAnimPresenter {
                 int unameSize = textMsg.length();
                 builder.setSpan(new ForegroundColorSpan(Color.parseColor(dto.getColour())), unameIndexOf, unameIndexOf + unameSize, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
+            if (!showB){
+                iv_look_full_service_notice_new3.setVisibility(View.GONE);
+            }else {
+                if (TextUtils.equals(event.getJumpType(),"0")){
+                    iv_look_full_service_notice_new3.setVisibility(View.GONE);
+                }else {
+                    iv_look_full_service_notice_new3.setVisibility(View.VISIBLE);
+                }
+            }
+
             if (!TextUtils.isEmpty(event.getButtonImage())) {
 
                 ImgLoader.display(mContext, event.getButtonImage(), iv_look_full_service_notice_new2);
@@ -1152,9 +1164,6 @@ public class LiveGiftAnimPresenter {
                     iv_look_full_service_notice_new.setText(buttonString);
                 }
                 iv_look_full_service_notice_new.setText(stringBuilder);
-            } else {
-                iv_look_full_service_notice_new3.setVisibility(View.GONE);
-                iv_look_full_service_notice_new3.setVisibility(View.VISIBLE);
             }
             full_service_notice_new_text.postDelayed(new Runnable() {
                 @Override
@@ -1263,6 +1272,7 @@ public class LiveGiftAnimPresenter {
         ViewClicksAntiShake.clicksAntiShake(iv_look_full_service_notice_new, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
+                MobclickAgent.onEvent(mContext, "new_full_server", "全服的埋点");
                 String jumpType = notifyFFGGGDJANEvent.getJumpType();
                 if (TextUtils.equals(jumpType, "1")) {
                     changeLiveRoom();
@@ -1270,9 +1280,7 @@ public class LiveGiftAnimPresenter {
                     IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
                     if (!TextUtils.isEmpty(notifyFFGGGDJANEvent.getLink())) {
                         StringBuffer htmlUrl = new StringBuffer();
-                        htmlUrl.append(CommonAppConfig.HOST)
+                        htmlUrl.append(notifyFFGGGDJANEvent.getLink())
-                                .append("/")
-                                .append(notifyFFGGGDJANEvent.getLink())
                                 .append(notifyFFGGGDJANEvent.getLink().contains("?") ? "&uid=" : "?uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -3972,12 +3972,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     }
 
-    public void showAllServerNotifyFFGGGD(AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent) {
+    public void showAllServerNotifyFFGGGD(AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent,boolean showB) {
         if (mLiveGiftAnimPresenter == null) {
             mLiveGiftAnimPresenter = new LiveGiftAnimPresenter(mContext, mContentView, mGifImageView, mSVGAImageView, mLiveGiftPrizePoolContainer, windowManager);
         }
         mLiveGiftAnimPresenter.setLiveUidStream(mLiveUid, mStream);
-        mLiveGiftAnimPresenter.showAllServerNotifyFFGGGD(notifyFFGGGDJANEvent);
+        mLiveGiftAnimPresenter.showAllServerNotifyFFGGGD(notifyFFGGGDJANEvent,showB);
     }
 
     //全服通知 购买坐骑

live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java

@@ -1312,7 +1312,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 
     public void showAllServerNotifyFFGGGD(AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent) {
         if (mLiveRoomViewHolder != null) {
-            mLiveRoomViewHolder.showAllServerNotifyFFGGGD(notifyFFGGGDJANEvent);
+            mLiveRoomViewHolder.showAllServerNotifyFFGGGD(notifyFFGGGDJANEvent,true);
         }
     }
 

main/src/main/res/layout/view_main_home.xml

@@ -25,6 +25,7 @@
 
             <HorizontalScrollView
                 android:id="@+id/view_horizontal"
+                android:layout_toStartOf="@id/ijiasdw"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="horizontal"
@@ -32,7 +33,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
 
                     <net.lucode.hackware.magicindicator.MagicIndicator
                         android:id="@+id/indicator"
@@ -43,12 +45,13 @@
                         android:id="@+id/tvPlay"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="25dp"
+                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="120dp"
+                        android:layout_marginEnd="20dp"
                         android:gravity="center"
                         android:paddingTop="1dp"
                         android:text="@string/main_type_theater"
                         android:textColor="#B1B1B1"
+                        android:layout_marginBottom="3dp"
                         android:textSize="16dp"
                         android:textStyle="bold" />
 
@@ -56,6 +59,7 @@
             </HorizontalScrollView>
 
             <LinearLayout
+                android:id="@+id/ijiasdw"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"