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

修复从个人名片跳转到他直播间不会关闭个人名片的问题

Browse Source
This commit is contained in:
zlzw 2022-11-28 14:55:47 +08:00
parent 83039d7b29
commit fc59a6f182
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
View File

@ -155,7 +155,6 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} }
@Override @Override
protected void setWindowAttributes(Window window) { protected void setWindowAttributes(Window window) {
window.setWindowAnimations(R.style.bottomToTopAnim); window.setWindowAnimations(R.style.bottomToTopAnim);
@ -305,7 +304,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
private void showData(String data) { private void showData(String data) {
Log.i(TAG, "showData: " + data); Log.i(TAG, "showData: " + data);
JSONObject obj = JSON.parseObject(data); JSONObject obj = JSON.parseObject(data);
isAnchor = obj.getInteger("is_anchor")==1; isAnchor = obj.getInteger("is_anchor") == 1;
mUserBean = JSON.toJavaObject(obj, UserBean.class); mUserBean = JSON.toJavaObject(obj, UserBean.class);
mToName = obj.getString("user_nicename"); mToName = obj.getString("user_nicename");
@ -315,7 +314,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} else { } else {
btn_live.setVisibility(View.GONE); btn_live.setVisibility(View.GONE);
} }
switch (mType){ switch (mType) {
case TYPE_ANC_AUD: case TYPE_ANC_AUD:
case SETTING_ACTION_ADM: case SETTING_ACTION_ADM:
case SETTING_ACTION_SUP: case SETTING_ACTION_SUP:
@ -323,7 +322,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
case SETTING_ACTION_ANC_ADM: case SETTING_ACTION_ANC_ADM:
mSetting.setVisibility(View.VISIBLE); mSetting.setVisibility(View.VISIBLE);
} }
switch (mAction){ switch (mAction) {
case TYPE_ANC_AUD: case TYPE_ANC_AUD:
case SETTING_ACTION_ADM: case SETTING_ACTION_ADM:
case SETTING_ACTION_SUP: case SETTING_ACTION_SUP:
@ -346,9 +345,9 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} }
mName.setText(obj.getString("user_nicename")); mName.setText(obj.getString("user_nicename"));
if (mUserBean.getGoodnum() != null && !mUserBean.getGoodnum().equals("")) { if (mUserBean.getGoodnum() != null && !mUserBean.getGoodnum().equals("")) {
if(!isAnchor) { if (!isAnchor) {
good_nub_ico.setImageResource(R.mipmap.good_nub); good_nub_ico.setImageResource(R.mipmap.good_nub);
}else{ } else {
good_nub_ico.setImageResource(R.mipmap.usercard_good_nub); good_nub_ico.setImageResource(R.mipmap.usercard_good_nub);
} }
good_nub_ico.setVisibility(View.VISIBLE); good_nub_ico.setVisibility(View.VISIBLE);
@ -368,10 +367,10 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
userLv.setText("Lv." + mUserBean.getLevel()); userLv.setText("Lv." + mUserBean.getLevel());
mLvDesc.setText(R.string.live_user_card_level); mLvDesc.setText(R.string.live_user_card_level);
} }
if(isAnchor){ if (isAnchor) {
ImgLoader.display2(mContext,obj.getJSONObject("level_thumb").getString("thumb"),mLiveIcon); ImgLoader.display2(mContext, obj.getJSONObject("level_thumb").getString("thumb"), mLiveIcon);
mLvVal.setText(obj.getInteger("level_anchor")+""); mLvVal.setText(obj.getInteger("level_anchor") + "");
}else { } else {
new LiveTextRender().getLevelImage(mContext, levelBean.getLevel(), new ImgLoader.DrawableCallback() { new LiveTextRender().getLevelImage(mContext, levelBean.getLevel(), new ImgLoader.DrawableCallback() {
@Override @Override
public void onLoadSuccess(Drawable drawable) { public void onLoadSuccess(Drawable drawable) {
@ -572,6 +571,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
DialogUitl.showSimpleDialog(mContext, "是否確認前往對方直播間？", new DialogUitl.SimpleCallback() { DialogUitl.showSimpleDialog(mContext, "是否確認前往對方直播間？", new DialogUitl.SimpleCallback() {
@Override @Override
public void onConfirmClick(Dialog dialog, String content) { public void onConfirmClick(Dialog dialog, String content) {
LiveUserDialogFragment.this.dismiss();
RongChatRoomClient.getInstance().quitChatRoom("g" + mLiveUid, new IRongCoreCallback.OperationCallback() { RongChatRoomClient.getInstance().quitChatRoom("g" + mLiveUid, new IRongCoreCallback.OperationCallback() {
@Override @Override
public void onSuccess() { public void onSuccess() {
@ -620,7 +620,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
if (liveBean == null) { if (liveBean == null) {
return; return;
} }
if(MicStatusManager.getInstance().isMic(liveUid)){ if (MicStatusManager.getInstance().isMic(liveUid)) {
MicStatusManager.getInstance().showDownMicDialog(mContext); MicStatusManager.getInstance().showDownMicDialog(mContext);
return; return;
} }
@ -649,7 +649,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} else if (i == R.id.avatar) { } else if (i == R.id.avatar) {
forwardHomePage(); forwardHomePage();
} else if (i == R.id.btn_guard) { } else if (i == R.id.btn_guard) {
((LiveActivity) mContext).openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity,mToUid); ((LiveActivity) mContext).openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity, mToUid);
} else if (i == R.id.btn_live) { } else if (i == R.id.btn_live) {
gotoLive(mToUid); gotoLive(mToUid);
} else if (i == R.id.noble_icon_layout) { } else if (i == R.id.noble_icon_layout) {