Merge branch 'master' into 声网升级

# Conflicts:
#	config.gradle
#	live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java

live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java

@@ -30,6 +30,8 @@ import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.enums.PopupPosition;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.stx.xhb.androidx.XBanner;
+import com.stx.xhb.androidx.transformers.ScalePageTransformer;
+import com.yunbao.common.custom.LiveGuardScalePageTransformer;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.adapter.LiveBuyGuardPrivilegeAdapter;
@@ -159,6 +161,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                 }
                 buyGuardBanner.setBannerData(R.layout.banner_item_buy_guard, buyGuardBannerModels);
                 buyGuardBanner.setIsClipChildrenMode(true);
+                buyGuardBanner.setCustomPageTransformer(new LiveGuardScalePageTransformer());
                 guardPrivilegeStrings = data.getGuardData().get(0).getGuardPrivilege();
                 buyGuardBanner.postDelayed(new Runnable() {
                     @Override

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

@@ -337,7 +337,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
             loading.setVisibility(View.GONE);
             enterRoomLeaveHandler.post(enterRoomLeaveRunnable);
             OpenAdManager.getInstance().show(OpenAdManager.TYPE_LIVE, LiveGuardInfo.isGuard(mLiveGuardInfo));
-
         }
     };
     final Runnable loadTimeoutRunnableGone = new Runnable() {
@@ -350,6 +349,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
         }
     };
 
+
     @Override
     public synchronized void onAdd(LiveBean data, int liveType, int liveTypeVal, int liveSdk, boolean isSw) {
         Log.e("直播间接口调用排查", "onAdd  onAdd   onAdd   onAdd");