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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2022-12-12 18:30:48 +08:00
commit af91783b9f
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,8 @@ public class SocketRyClient {
} }
} else if (action3 == 5) { } else if (action3 == 5) {
// endDRGif(); EventBus.getDefault().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.PK_TIME_COUNT));
LiveRoomViewHolder.d_pk_view.setVisibility(View.GONE); LiveRoomViewHolder.d_pk_view.setVisibility(View.GONE);
if (LiveRyAnchorActivity.mLiveAnchorViewHolder != null) { if (LiveRyAnchorActivity.mLiveAnchorViewHolder != null) {
dr_pk_view.setVisibility(View.GONE); dr_pk_view.setVisibility(View.GONE);

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

@ -331,6 +331,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
//全服通知 //全服通知
private ImageView customFullServiceNotify; private ImageView customFullServiceNotify;
public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) { public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) {
super(context, parentView); super(context, parentView);
Contexts = context; Contexts = context;
@ -434,7 +435,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
/** /**
* pk时间倒计时 * pk时间倒计时
*/ */
public static void changePkTime() { public void changePkTime() {
Log.i("tvt", mPkTimeCount + ""); Log.i("tvt", mPkTimeCount + "");
mPkTimeCount--; mPkTimeCount--;
if (mPkTimeCount > 0) {// if (mPkTimeCount > 0) {//
@ -449,11 +450,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (mHandler != null) { if (mHandler != null) {
mHandler.removeCallbacksAndMessages(null); mHandler.removeCallbacksAndMessages(null);
} }
// endDRGif(); endDRGif();
} }
} }
public void endDRGif() { public void endDRGif() {
if (dr_pk_end_gif.getVisibility() == View.GONE) {
dr_pk_end_gif.setVisibility(View.VISIBLE); dr_pk_end_gif.setVisibility(View.VISIBLE);
RequestOptions options = new RequestOptions().skipMemoryCache(true);//配置 RequestOptions options = new RequestOptions().skipMemoryCache(true);//配置
Glide.with(Contexts).asGif() Glide.with(Contexts).asGif()
@ -477,6 +479,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
}) })
.into(dr_pk_end_gif); .into(dr_pk_end_gif);
}
} }
@ -491,7 +495,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
d_pk_view.setVisibility(View.VISIBLE); d_pk_view.setVisibility(View.VISIBLE);
if (time != 0) { if (time != 0) {
mPkTimeCount = time; mPkTimeCount = time;
changePkTime(); mHandler.sendEmptyMessageAtTime(WHAT_PK_TIME, getNextSecondTime());
} }
@ -644,7 +648,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
img.setImageResource(R.mipmap.icon_no4); img.setImageResource(R.mipmap.icon_no4);
} else if (j == 5) { } else if (j == 5) {
img.setImageResource(R.mipmap.icon_no5); img.setImageResource(R.mipmap.icon_no5);
}else { } else {
img.setImageResource(R.mipmap.icon_no1); img.setImageResource(R.mipmap.icon_no1);
} }
@ -3805,6 +3809,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
case CUSTOM_FULL_SERVICE_NOTIFY: case CUSTOM_FULL_SERVICE_NOTIFY:
customFullServiceNotify(event.getCustomFullServiceNotifyEvent()); customFullServiceNotify(event.getCustomFullServiceNotifyEvent());
break; break;
case PK_TIME_COUNT:
endDRGif();
break;
} }
} }
@ -3829,7 +3836,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
customFullServiceNotify.startAnimation(inAlphaAnimation); customFullServiceNotify.startAnimation(inAlphaAnimation);
customFullServiceNotify.setVisibility(View.VISIBLE); customFullServiceNotify.setVisibility(View.VISIBLE);
ImgLoader.display(mContext,customFullServiceNotifyEvent.getImg(),customFullServiceNotify); ImgLoader.display(mContext, customFullServiceNotifyEvent.getImg(), customFullServiceNotify);
customFullHandler.postDelayed(customFullRunnable, handlerDuration * 1000); customFullHandler.postDelayed(customFullRunnable, handlerDuration * 1000);
} else {//文字通知 } else {//文字通知