修复从个人名片跳转到他直播间不会关闭个人名片的问题
This commit is contained in:
parent
83039d7b29
commit
fc59a6f182
@ -155,7 +155,6 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
protected void setWindowAttributes(Window window) {
|
||||
window.setWindowAnimations(R.style.bottomToTopAnim);
|
||||
@ -305,7 +304,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
private void showData(String data) {
|
||||
Log.i(TAG, "showData: " + data);
|
||||
JSONObject obj = JSON.parseObject(data);
|
||||
isAnchor = obj.getInteger("is_anchor")==1;
|
||||
isAnchor = obj.getInteger("is_anchor") == 1;
|
||||
mUserBean = JSON.toJavaObject(obj, UserBean.class);
|
||||
|
||||
mToName = obj.getString("user_nicename");
|
||||
@ -315,7 +314,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
} else {
|
||||
btn_live.setVisibility(View.GONE);
|
||||
}
|
||||
switch (mType){
|
||||
switch (mType) {
|
||||
case TYPE_ANC_AUD:
|
||||
case SETTING_ACTION_ADM:
|
||||
case SETTING_ACTION_SUP:
|
||||
@ -323,7 +322,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
case SETTING_ACTION_ANC_ADM:
|
||||
mSetting.setVisibility(View.VISIBLE);
|
||||
}
|
||||
switch (mAction){
|
||||
switch (mAction) {
|
||||
case TYPE_ANC_AUD:
|
||||
case SETTING_ACTION_ADM:
|
||||
case SETTING_ACTION_SUP:
|
||||
@ -346,9 +345,9 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
}
|
||||
mName.setText(obj.getString("user_nicename"));
|
||||
if (mUserBean.getGoodnum() != null && !mUserBean.getGoodnum().equals("")) {
|
||||
if(!isAnchor) {
|
||||
if (!isAnchor) {
|
||||
good_nub_ico.setImageResource(R.mipmap.good_nub);
|
||||
}else{
|
||||
} else {
|
||||
good_nub_ico.setImageResource(R.mipmap.usercard_good_nub);
|
||||
}
|
||||
good_nub_ico.setVisibility(View.VISIBLE);
|
||||
@ -368,10 +367,10 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
userLv.setText("Lv." + mUserBean.getLevel());
|
||||
mLvDesc.setText(R.string.live_user_card_level);
|
||||
}
|
||||
if(isAnchor){
|
||||
ImgLoader.display2(mContext,obj.getJSONObject("level_thumb").getString("thumb"),mLiveIcon);
|
||||
mLvVal.setText(obj.getInteger("level_anchor")+"");
|
||||
}else {
|
||||
if (isAnchor) {
|
||||
ImgLoader.display2(mContext, obj.getJSONObject("level_thumb").getString("thumb"), mLiveIcon);
|
||||
mLvVal.setText(obj.getInteger("level_anchor") + "");
|
||||
} else {
|
||||
new LiveTextRender().getLevelImage(mContext, levelBean.getLevel(), new ImgLoader.DrawableCallback() {
|
||||
@Override
|
||||
public void onLoadSuccess(Drawable drawable) {
|
||||
@ -572,6 +571,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
DialogUitl.showSimpleDialog(mContext, "是否確認前往對方直播間?", new DialogUitl.SimpleCallback() {
|
||||
@Override
|
||||
public void onConfirmClick(Dialog dialog, String content) {
|
||||
LiveUserDialogFragment.this.dismiss();
|
||||
RongChatRoomClient.getInstance().quitChatRoom("g" + mLiveUid, new IRongCoreCallback.OperationCallback() {
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
@ -620,7 +620,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
if (liveBean == null) {
|
||||
return;
|
||||
}
|
||||
if(MicStatusManager.getInstance().isMic(liveUid)){
|
||||
if (MicStatusManager.getInstance().isMic(liveUid)) {
|
||||
MicStatusManager.getInstance().showDownMicDialog(mContext);
|
||||
return;
|
||||
}
|
||||
@ -649,7 +649,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
|
||||
} else if (i == R.id.avatar) {
|
||||
forwardHomePage();
|
||||
} 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) {
|
||||
gotoLive(mToUid);
|
||||
} else if (i == R.id.noble_icon_layout) {
|
||||
|
Loading…
Reference in New Issue
Block a user