Merge branch 'dev_hour_rank'
This commit is contained in:
commit
fe19865d6e
@ -135,7 +135,6 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
|
||||
private LiveChatRoomDialogFragment mLiveChatRoomDialogFragment;//私信聊天窗口
|
||||
protected LiveGuardInfo mLiveGuardInfo;
|
||||
private HashSet<DialogFragment> mDialogFragmentSet;
|
||||
private LiveEnterRoomBean userBean;//用户信息
|
||||
// public static boolean isRy = true;
|
||||
|
||||
@Override
|
||||
@ -263,9 +262,6 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
|
||||
mLiveRoomViewHolder.onEnterRoom(bean);
|
||||
}
|
||||
}
|
||||
public void setEnterRoomData(LiveEnterRoomBean bean){
|
||||
userBean=bean;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
@ -1334,7 +1330,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
|
||||
bundle.putString(Constants.LIVE_ANCHER_NAME, mAncherName);
|
||||
bundle.putString(Constants.STREAM, mStream);
|
||||
bundle.putString(Constants.LIVE_ANCHER_ICON,mAncherIcon);
|
||||
bundle.putString(Constants.USER_ICON,userBean.getUserBean().getAvatar());
|
||||
bundle.putString(Constants.USER_ICON,CommonAppConfig.getInstance().getUserBean().getAvatar());
|
||||
fragment.setArguments(bundle);
|
||||
fragment.show(getSupportFragmentManager(), "LiveGuardBuyDialogFragment");
|
||||
}
|
||||
|
@ -1829,7 +1829,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
}
|
||||
setGuardIcon(tmp);
|
||||
}
|
||||
((LiveActivity)mContext).setEnterRoomData(bean);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user