diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index e9c76ec92..6b1d967c8 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -314,7 +314,10 @@ public class LiveAudienceActivity extends LiveActivity { manager.onRemove(false); } mViewGroup.addView(manager.getRootView()); - + mLiveUid = mLiveBean.getUid(); + mStream = mLiveBean.getStream(); + mAncherName = mLiveBean.getUserNiceName(); + mAncherIcon = mLiveBean.getAvatar(); manager.onAdd(mLiveBean, mLiveType, mLiveTypeVal, mLiveSDK); //加载完页面后再后台静默下载礼物svga downloadAllGift(); @@ -361,10 +364,7 @@ public class LiveAudienceActivity extends LiveActivity { } }); } - mLiveUid = mLiveBean.getUid(); - mStream = mLiveBean.getStream(); - mAncherName = mLiveBean.getUserNiceName(); - mAncherIcon = mLiveBean.getAvatar(); + } }; diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 4f81fb2dd..6641899aa 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -2997,7 +2997,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis * 获取是否有热度卡加成 */ public static void getIsHot(String isUseHotCard) { - + ImgLoader.display2(Contexts, "https://downs.yaoulive.com/img_hot_gif.gif", img_hot_gif); if ("1".equals(isUseHotCard)) { ft_hot_add.setVisibility(View.VISIBLE); } else { diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index b689dd47d..97a9b76e5 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -241,7 +241,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe .setmLiveType(mLiveType) .setmLiveTypeVal(mLiveTypeVal))); if (mLivePlayViewHolder == null) { - mLivePlayViewHolder = new LivePlayRyViewHolder(mContext, playContainer, mLiveBean.getLandscape()); + mLivePlayViewHolder = new LivePlayRyViewHolder(mContext, playContainer,1); mLiveRoomViewHolder = new LiveRoomViewHolder(false, 1, mContext, mContainer, mSecondPage.findViewById(R.id.gift_gif), mSecondPage.findViewById(R.id.gift_svga), mContainerWrap, mContext.getWindowManager()); mLiveAudienceViewHolder = new LiveAudienceViewHolder(mContext, mContainer); mLiveLinkMicPresenter = new LiveLinkMicPresenter(mContext, mLivePlayViewHolder, false, mLiveSDK, mLiveAudienceViewHolder.getContentView()); @@ -254,7 +254,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder.addToParent(); mLiveAudienceViewHolder.subscribeActivityLifeCycle(); } else { - mLivePlayViewHolder.setLiveBeanLandscape(mLiveBean.getLandscape()); + mLivePlayViewHolder.setLiveBeanLandscape(1); mLiveLinkMicPresenter.setLiveSdk(mLiveSDK); mLiveLinkMicAnchorPresenter.setLiveSdk(mLiveSDK); } @@ -320,7 +320,13 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe public void onSuccess(EnterRoomNewModel data) { mLivePlayViewHolder.setLiveBeanLandscape(data.getLiveInfo().getLandscape()); //是否热度卡加成 - mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard()); + liveHandler.postDelayed(new Runnable() { + @Override + public void run() { + mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard()); + } + }, 700); + isEnterRoom = true; //延时1秒发送 liveHandler.postDelayed(sendFIm, 700); diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml index f8ca03e26..75a10c0b5 100644 --- a/live/src/main/res/layout/view_live_audience.xml +++ b/live/src/main/res/layout/view_live_audience.xml @@ -414,7 +414,7 @@ android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:layout_gravity="center_vertical" - android:layout_marginRight="5dp" + android:layout_marginRight="47dp" android:layout_marginBottom="40dp" app:autoPlay="true" /> diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 8cfdda608..23c0ca1da 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -2250,6 +2250,6 @@ + android:visibility="visible"/> \ No newline at end of file