diff --git a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java index 5f13526b3..68abd3a29 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java @@ -316,8 +316,6 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList return; } LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk); - - RouteUtil.forwardUserHome(mContext, String.valueOf(event.getModel().getId()), 0); if (mContext instanceof LiveAnchorActivity) { ((LiveAnchorActivity) mContext).superBackPressed(); } else if (mContext instanceof LiveAudienceActivity) { @@ -332,8 +330,6 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList mCheckLivePresenter.checkLive(liveBean); } else { - RouteUtil.forwardUserHome(mContext, String.valueOf(event.getModel().getId()), 0); - RouteUtil.forwardUserHome(mContext, String.valueOf(event.getModel().getId()), 0); if (mContext instanceof LiveAnchorActivity) { ((LiveAnchorActivity) mContext).superBackPressed(); diff --git a/main/src/main/java/com/yunbao/main/views/FloatBannerView.java b/main/src/main/java/com/yunbao/main/views/FloatBannerView.java index b0e63d1b0..85e1132b3 100644 --- a/main/src/main/java/com/yunbao/main/views/FloatBannerView.java +++ b/main/src/main/java/com/yunbao/main/views/FloatBannerView.java @@ -33,7 +33,7 @@ public class FloatBannerView extends FrameLayout { private ClipPathCircleImage clipImage1, clipImage2, clipImage3; private List list = new ArrayList<>(); //默认定时器时间 - private int delayMillis = 1000; + private int delayMillis = 1500; //Handler定时加载下一张的数据 private Handler bannerHandler = new Handler(); private int index = 0; @@ -96,16 +96,16 @@ public class FloatBannerView extends FrameLayout { ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage3); ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage2); ImgLoader.displayAvatar(getContext(), list.get(index).getAvatar(), clipImage1); - TranslateAnimation animationTranslate = new TranslateAnimation(0, -32f, 0, 0.2f); + TranslateAnimation animationTranslate = new TranslateAnimation(0, -20f, 0, 0.2f); TranslateAnimation animationTranslate3 = new TranslateAnimation(0, -20f, 0, 0.2f); AnimationSet animationSet1 = new AnimationSet(true); animationSet1.setFillAfter(true); - animationSet1.setDuration(200); + animationSet1.setDuration(230); animationSet1.addAnimation(animationTranslate); AlphaAnimation animationAlpha = new AlphaAnimation(1, 0); AnimationSet animationSet2 = new AnimationSet(true); animationSet2.setFillAfter(true); - animationSet2.setDuration(200); + animationSet2.setDuration(210); animationSet2.addAnimation(animationAlpha); animationSet2.addAnimation(animationTranslate3);