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

Merge branch 'dev_hour_rank'

Browse Source
This commit is contained in:
zlzw 2022-08-29 17:14:52 +08:00
commit fe19865d6e
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -135,7 +135,6 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
private LiveChatRoomDialogFragment mLiveChatRoomDialogFragment;//私信聊天窗口 private LiveChatRoomDialogFragment mLiveChatRoomDialogFragment;//私信聊天窗口
protected LiveGuardInfo mLiveGuardInfo; protected LiveGuardInfo mLiveGuardInfo;
private HashSet<DialogFragment> mDialogFragmentSet; private HashSet<DialogFragment> mDialogFragmentSet;
private LiveEnterRoomBean userBean;//用户信息
// public static boolean isRy = true; // public static boolean isRy = true;
@Override @Override
@ -263,9 +262,6 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
mLiveRoomViewHolder.onEnterRoom(bean); 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.LIVE_ANCHER_NAME, mAncherName);
bundle.putString(Constants.STREAM, mStream); bundle.putString(Constants.STREAM, mStream);
bundle.putString(Constants.LIVE_ANCHER_ICON,mAncherIcon); 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.setArguments(bundle);
fragment.show(getSupportFragmentManager(), "LiveGuardBuyDialogFragment"); fragment.show(getSupportFragmentManager(), "LiveGuardBuyDialogFragment");
} }

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

@ -1829,7 +1829,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
setGuardIcon(tmp); setGuardIcon(tmp);
} }
((LiveActivity)mContext).setEnterRoomData(bean);
} }
/** /**