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

心愿单位置移动

Browse Source
This commit is contained in:
18401019693 2023-04-14 10:40:14 +08:00
parent c23ed7defb
commit 0ed37aee11
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@ -302,6 +302,7 @@ public class SocketRyClient {
);
}
} else if (action3 == 5) {
// endDRGif();
LiveRoomViewHolder.d_pk_view.setVisibility(View.GONE);

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

@ -356,6 +356,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private Banner topBanner1, topBanner2;//心愿单&联系方式
public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow;
private String mAnchorName;//主播名字
private boolean isHinde = false;
@Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdata(String str) {
@ -1509,6 +1510,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
topBanner1.setVisibility(View.GONE);
topBanner2.setVisibility(View.GONE);
removeDetailView();
}
public void clearChat() {
@ -4240,7 +4242,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
EventBus.getDefault().post(new AnchorInfoEvent(true, "", "", ""));
closePkTwo();
showAnchorSayAndCallAnchor();
break;
case CUSTOM_FULL_SERVICE_NOTIFY:
customFullServiceNotify(event.getCustomFullServiceNotifyEvent());
@ -4544,7 +4545,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
String s1 = StringUtil.getDurationText(mPkTimeCount * 1000);
textTime.setText(String.format(mContext.getString(R.string.pk_time), s1));
countdownHandler.postAtTime(countdownRunnable, getNextSecondTime());
hideAnchorSayAndCallAnchor();
} else {
mPkTimeCount = 0;
timeTitle.setVisibility(View.GONE);
@ -4562,6 +4562,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
mPkTimeCount = 0;
showAnchorSayAndCallAnchor();
if (mHandler != null) {
mHandler.removeMessages(WHAT_PK_TIME);
}
}
/**
@ -4741,12 +4744,14 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
public void hideAnchorSayAndCallAnchor() {
isHinde = true;
mAnchorSay.setVisibility(View.GONE);
topBanner2.setVisibility(View.VISIBLE);
topBanner1.setVisibility(View.GONE);
}
public void showAnchorSayAndCallAnchor() {
isHinde = false;
if (mAnchorSay.getVisibility() == View.GONE &&
sayModel != null && sayModel.getLivePreview() != null &&
sayModel.getLivePreview().getIsShow() == 1
@ -4778,7 +4783,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mTopBannerList = new ArrayList<>();
}
// if(sayModel!=null&&sayModel.getLivePreview().getIsShow()==1&&sa)
topBanner1.setVisibility(View.VISIBLE);
if (!isHinde){
topBanner1.setVisibility(View.VISIBLE);
}
BannerBean bannerBean = new BannerBean();
bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon())
.setWishlistName(wishListProgress.getWishlistName())
@ -4963,7 +4971,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void onSuccess(LiveAnchorCallMeModel data) {
System.out.println(">>>>> 获取联系方式：" + data);
if (data.getIsShow() == 1) {
topBanner1.setVisibility(View.VISIBLE);
if (!isHinde){
topBanner1.setVisibility(View.VISIBLE);
}
BannerBean call = new BannerBean();
call.setData(data);
call.setType(TopBannerCustomViewHolder.TYPE_CALL_ANCHOR);

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

@ -259,8 +259,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
};
@Override
public synchronized void onAdd(LiveBean data, int liveType, int liveTypeVal, int liveSdk) {
isEnterRoom = false;
@ -652,6 +650,11 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
}
}
liveHandler.postDelayed(loadRunnableGone, 15_000);
if (TextUtils.equals(data.getEnterRoomInfo().getIsconnection(), "1")) {
//通知心愿单位置换地方
EventBus.getDefault().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_PK_ING));
}
}
@ -1932,6 +1935,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.upDataPkScore(pkScores, time);
setPkStatus(true);
}
//通知心愿单位置换地方
EventBus.getDefault().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_PK_ING));
}
public void endDRGif() {
@ -1954,7 +1960,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
public void showXydComplete(XydCompleteModel model, LiveReceiveGiftBean liveReceiveGiftBean) {
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.showXydComplete(model, false,liveReceiveGiftBean);
mLiveRoomViewHolder.showXydComplete(model, false, liveReceiveGiftBean);
}
}
}

2
live/src/main/res/layout/view_live_room.xml
View File

@ -704,6 +704,7 @@
android:layout_alignParentRight="true"
android:layout_marginTop="20dp"
android:layout_marginRight="5dp"
android:visibility="gone"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
@ -2195,6 +2196,7 @@
android:layout_marginTop="20dp"
android:layout_marginRight="5dp"
app:delay_time="5000"
android:visibility="gone"
app:indicator_height="8dp"
app:indicator_width="8dp" />