yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
This commit is contained in:
zlzw
2022-11-29 14:44:34 +08:00
parent 030fdb6ad0 cf4948a3e2
commit 9934d53390
6 changed files with 110 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@@ -149,6 +149,7 @@ public class LiveAudienceActivity extends LiveActivity {
private Handler liveHandler = new Handler();
private ImageView voicePress;
private View titleLine;
private boolean liveIndex = true;
@Override
public <T extends View> T findViewById(@IdRes int id) {
@@ -306,7 +307,7 @@ public class LiveAudienceActivity extends LiveActivity {
@Override
public void run() {
AnchorRecommendItemModel data = itemModelList.get(mCurrentPage);
if (mCurrentPage == 0) {
if (mCurrentPage == 0&&liveIndex) {
View rootView = manager.getRootView();
if (rootView.getParent() != null && rootView.getParent() instanceof ViewGroup) {
((ViewGroup) (rootView.getParent())).removeView(rootView);
@@ -318,11 +319,12 @@ public class LiveAudienceActivity extends LiveActivity {
//加载完页面后再后台静默下载礼物svga
downloadAllGift();
over();
} else {
new LiveRoomCheckLivePresenter(mContext, data.getUid(), data.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
liveIndex =false;
try {
mLiveSDK = Integer.parseInt(liveSdk);
mLiveTypeVal = Integer.parseInt(liveTypeVal);
@@ -759,7 +761,7 @@ public class LiveAudienceActivity extends LiveActivity {
if (liveBean == null) {
return;
}
if (MicStatusManager.getInstance().isMic(liveUid)) {
if(MicStatusManager.getInstance().isMic(liveUid)){
MicStatusManager.getInstance().showDownMicDialog(mContext);
return;
}

13
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@@ -2993,6 +2993,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
});
}
/**
* 获取是否有热度卡加成
*/
public static void getIsHot(String isUseHotCard) {
if ("1".equals(isUseHotCard)) {
ft_hot_add.setVisibility(View.VISIBLE);
} else {
ft_hot_add.setVisibility(View.GONE);
}
}
public void resetUserListWidth(int width) {
ViewGroup.LayoutParams params = mUserRecyclerView.getLayoutParams();
params.width = width;

17
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@@ -59,6 +59,7 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.utils.formatBigNum;
import com.yunbao.common.views.weight.LiveFloatView;
import com.yunbao.common.views.weight.LiveLoadingViewHolder;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveAudienceActivity;
@@ -257,7 +258,13 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveLinkMicPresenter.setLiveSdk(mLiveSDK);
mLiveLinkMicAnchorPresenter.setLiveSdk(mLiveSDK);
}
//去除主播离开画面
if (LivePlayKsyViewHolder.leave != null) {
LivePlayKsyViewHolder.leave.setVisibility(View.GONE);
}
if (LivePlayRyViewHolder.leave != null) {
LivePlayRyViewHolder.leave.setVisibility(View.GONE);
}
//直播间背景
ImgLoader.displayBlurLive(mContext, mLiveBean.getAvatar(), liveBack, 400, 600);
//ImageLoadUtils.loadUrlToBlur(mContext,mLiveBean.getAvatar(),400,600,liveBack);
@@ -312,6 +319,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override
public void onSuccess(EnterRoomNewModel data) {
mLivePlayViewHolder.setLiveBeanLandscape(data.getLiveInfo().getLandscape());
//是否热度卡加成
mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard());
isEnterRoom = true;
//延时1秒发送
liveHandler.postDelayed(sendFIm, 700);
@@ -342,7 +351,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
bannerModel.setStart(false);
bannerModel.setLink(model.getLink());
bannerModel.setImageUrl(model.getImg());
bannerBeans.add(bannerModel);
if (TextUtils.equals(model.getIsHidden(),"0")){
bannerBeans.add(bannerModel);
}
}
}
@@ -511,6 +523,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.showPrizePoolLevel(String.valueOf(giftPrizePoolLevel));
}
}
}
@Override

21
live/src/main/res/layout/layout_portrait_live_item.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@mipmap/live_bg" />
<ImageView
android:id="@+id/iv_loading"
android:layout_width="150dp"
android:layout_height="188dp"
android:layout_centerInParent="true"
android:background="@drawable/loading_animation" />
</RelativeLayout>