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 7f00c09c2..9aceb6287 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -3435,18 +3435,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) { - GiftWallDialog giftWallDialog = new GiftWallDialog(); - Bundle bundle = new Bundle(); - bundle.putString(Constants.LIVE_UID, mLiveUid); - bundle.putString(Constants.LIVE_STREAM, mStream); - bundle.putString("mAnchorName", mAnchorName); - bundle.putString("mAvatarUrl", mAvatarUrl); - bundle.putString("toUid", toUid); - bundle.putInt("isAttention", isAttention); - bundle.putBoolean("isLive", isAnchor); - bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity)); - giftWallDialog.setArguments(bundle); - giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); + // GiftWallDialog giftWallDialog = new GiftWallDialog(); + new com.yunbao.common.dialog.GiftWallDialog(mContext, toUid, mAnchorName, toUid, isAnchor).setFullWindows(false).showDialog(); +// Bundle bundle = new Bundle(); +// bundle.putString(Constants.LIVE_UID, mLiveUid); +// bundle.putString(Constants.LIVE_STREAM, mStream); +// bundle.putString("mAnchorName", mAnchorName); +// bundle.putString("mAvatarUrl", mAvatarUrl); +// bundle.putString("toUid", toUid); +// bundle.putInt("isAttention", isAttention); +// bundle.putBoolean("isLive", isAnchor); +// bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity)); +// giftWallDialog.setArguments(bundle); +// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); } diff --git a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java index 10dd06cbd..9e7bdefba 100644 --- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java @@ -77,8 +77,6 @@ import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.GradientDrawable; import com.yunbao.common.views.UserHomeImgsViewHolder; import com.yunbao.live.activity.LiveRyAnchorActivity; -import com.yunbao.live.dialog.GiftWallDialog; -import com.yunbao.live.views.ShowBigPhoto; import com.yunbao.video.activity.VideoPlayActivity; import com.yunbao.video.utils.VideoStorge; @@ -788,17 +786,18 @@ public class UserHomeActivity extends AbsActivity { itemLayout03.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - GiftWallDialog giftWallDialog = new GiftWallDialog(); - Bundle bundle = new Bundle(); - bundle.putString(Constants.LIVE_UID, uid); - bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name()); - bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar()); - bundle.putString("toUid", uid); - bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention()); - bundle.putBoolean("isLive", isAnchor); - bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity)); - giftWallDialog.setArguments(bundle); - giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); + new com.yunbao.common.dialog.GiftWallDialog(mContext, uid,userInfo.getUserHomeTopInfo().getUser_name(), null,isAnchor).setFullWindows(true).showDialog(); +// GiftWallDialog giftWallDialog = new GiftWallDialog(); +// Bundle bundle = new Bundle(); +// bundle.putString(Constants.LIVE_UID, uid); +// bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name()); +// bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar()); +// bundle.putString("toUid", uid); +// bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention()); +// bundle.putBoolean("isLive", isAnchor); +// bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity)); +// giftWallDialog.setArguments(bundle); +// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); } }); itemLayout04.setOnClickListener(new View.OnClickListener() {