() {
+
+ @Override
+ public void callback(Integer isAttention) {
+ mFollowing = isAttention == 1;
+ if (mFollowText != null) {
+ mFollowText.setText(mFollowing ? R.string.following : R.string.follow);
+ }
+ if (mFollowImage != null) {
+ mFollowImage.setImageDrawable(mFollowing ? mFollowDrawable : mUnFollowDrawable);
+ }
+ if (isAttention == 1 && mLiveUid.equals(mToUid)) {//关注了主播
+ ((LiveActivity) mContext).sendSystemMessage(
+ CommonAppConfig.getInstance().getUserBean().getUserNiceName() + WordUtil.getString(R.string.live_follow_anchor));
+ }
+ }
+ };
+
+ /**
+ * 跳转到个人主页
+ */
+ private void forwardHomePage() {
+ dismiss();
+ Constants.mStream = mStream;
+ RouteUtil.forwardUserHome(mContext, mToUid, true, mLiveUid, 0);
+// String url = HtmlConfig.PERSONAL + "?touid=" + mToUid + "&&isHomePage=1" + "&&fromType=0";
+// Constants.myUrl = url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
+ }
+
+ /**
+ * 举报
+ */
+ private void report() {
+ LiveReportActivity.forward(mContext, mToUid);
+ }
+
+ /**
+ * 设置
+ *
+ * 某个大神说，角色是权限的集合。。
+ *
+ * 理论上，角色的权限应该有服务端以数组或集合的形式返回，这样可以在后台动态配置某种角色的权限，而不是这样口头约定写死。。。
+ * 然而，是服务端这样做的，我也很无奈。。。也许他们不知道如何做成动态配置的吧。。
+ *
+ * 我一直想通过不断重构把代码写的像艺术品，然而，最近发现，这完全是多此一举，自讨苦吃。。是我太天真了。。
+ * 下面是我发现的一篇文章，说的非常好，也点醒了我。。如果你们发现当前代码写的太烂，不堪入目的话，请阅读下面的文章。
+ *
+ * https://www.jianshu.com/p/71521541cd25?utm_campaign=haruki&utm_content=note&utm_medium=reader_share&utm_source=weixin_timeline&from=timeline
+ */
+ private void setting() {
+ List list = new ArrayList<>();
+ switch (mAction) {
+ case SETTING_ACTION_ADM://设置 房间管理员点普通观众
+ list.add(R.string.live_setting_kick);
+// list.add(R.string.live_setting_gap);
+ list.add(R.string.live_setting_gap_2);
+ break;
+ case SETTING_ACTION_SUP://设置 超管点主播
+ list.add(R.string.live_setting_close_live);
+ list.add(R.string.live_setting_close_live_2);
+ list.add(R.string.live_setting_forbid_account);
+ break;
+ case SETTING_ACTION_ANC_AUD://设置 主播点普通观众
+ list.add(R.string.live_setting_kick);
+// list.add(R.string.live_setting_gap);
+ list.add(R.string.live_setting_gap_2);
+ list.add(R.string.live_setting_admin);
+ list.add(R.string.live_setting_admin_list);
+ break;
+ case SETTING_ACTION_ANC_ADM://设置 主播点房间管理员
+ list.add(R.string.live_setting_kick);
+// list.add(R.string.live_setting_gap);
+ list.add(R.string.live_setting_gap_2);
+ list.add(R.string.live_setting_admin_cancel);
+ list.add(R.string.live_setting_admin_list);
+ break;
+ }
+
+ DialogUitl.showStringArrayDialog(mContext, list.toArray(new Integer[list.size()]), mArrayDialogCallback);
+ }
+
+ private DialogUitl.StringArrayDialogCallback mArrayDialogCallback = new DialogUitl.StringArrayDialogCallback() {
+ @Override
+ public void onItemClick(String text, int tag) {
+ if (tag == R.string.live_setting_kick) {
+ kick();
+
+ } else if (tag == R.string.live_setting_gap) {//永久禁言->改成三天禁言
+ setShutUp();
+
+ } else if (tag == R.string.live_setting_gap_2) {//本场禁言
+ setShutUp2();
+
+ } else if (tag == R.string.live_setting_admin || tag == R.string.live_setting_admin_cancel) {
+ setAdmin();
+
+ } else if (tag == R.string.live_setting_admin_list) {
+ adminList();
+
+ } else if (tag == R.string.live_setting_close_live) {
+ closeLive();
+
+ } else if (tag == R.string.live_setting_forbid_account) {
+ forbidAccount();
+
+ } else if (tag == R.string.live_setting_close_live_2) {//禁用直播
+ closeLive2();
+ }
+ }
+ };
+
+ /**
+ * 查看管理员列表
+ */
+ private void adminList() {
+ dismiss();
+ ((LiveActivity) mContext).openAdminListWindow();
+ }
+
+ /**
+ * 踢人
+ */
+ private void kick() {
+ LiveHttpUtil.kicking(mLiveUid, mToUid, new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ if (code == 0) {
+ ((LiveActivity) mContext).kickUser(mToUid, mToName);
+ } else {
+ ToastUtil.show(msg);
+ }
+ }
+ });
+ }
+
+ /**
+ * 永久禁言->改成三天禁言
+ */
+ private void setShutUp() {
+ LiveHttpUtil.setShutUp(mLiveUid, "0", 0, mToUid, new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ if (code == 0) {
+ ((LiveActivity) mContext).setShutUp(mToUid, mToName, 0);
+ } else {
+ ToastUtil.show(msg);
+ }
+ }
+ });
+ }
+
+ /**
+ * 本场禁言
+ */
+ private void setShutUp2() {
+ LiveHttpUtil.setShutUp(mLiveUid, mStream, 1, mToUid, new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ if (code == 0) {
+ ((LiveActivity) mContext).setShutUp(mToUid, mToName, 1);
+ } else {
+ ToastUtil.show(msg);
+ }
+ }
+ });
+ }
+
+
+ /**
+ * 设置或取消管理员
+ */
+ private void setAdmin() {
+ LiveHttpUtil.setAdmin(mLiveUid, mToUid, new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ if (code == 0 && info.length > 0) {
+ int res = JSON.parseObject(info[0]).getIntValue("isadmin");
+ if (res == 1) {//被设为管理员
+ mAction = SETTING_ACTION_ANC_ADM;
+ } else {//被取消管理员
+ mAction = SETTING_ACTION_ANC_AUD;
+ }
+ ((LiveActivity) mContext).sendSetAdminMessage(res, mToUid, mToName);
+ }
+ }
+ });
+ }
+
+
+ /**
+ * 超管关闭直播间
+ */
+ private void closeLive() {
+ dismiss();
+ LiveHttpUtil.superCloseRoom(mLiveUid, 0, mSuperCloseRoomCallback);
+ }
+
+ /**
+ * 超管关闭直播间并禁止主播直播
+ */
+ private void closeLive2() {
+ dismiss();
+ LiveHttpUtil.superCloseRoom(mLiveUid, 1, mSuperCloseRoomCallback);
+ }
+
+ /**
+ * 超管关闭直播间并禁用主播账户
+ */
+ private void forbidAccount() {
+ dismiss();
+ LiveHttpUtil.superCloseRoom(mLiveUid, 2, mSuperCloseRoomCallback);
+ }
+
+ private HttpCallback mSuperCloseRoomCallback = new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ if (code == 0) {
+ ToastUtil.show(JSON.parseObject(info[0]).getString("msg"));
+ ((LiveActivity) mContext).superCloseRoom();
+ } else {
+ ToastUtil.show(msg);
+ }
+ }
+ };
+
+ @Override
+ public void onDestroy() {
+ LiveHttpUtil.cancel(LiveHttpConsts.GET_LIVE_USER);
+ if (mAvatar != null) {
+ ImgLoader.clear(mContext, mAvatar);
+ mAvatar.setImageDrawable(null);
+ }
+ mAvatar = null;
+ super.onDestroy();
+ }
+}
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
index fc82e3358..98a0992bd 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
@@ -1,9 +1,12 @@
package com.yunbao.live.dialog;
import android.app.Dialog;
+import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+
import androidx.core.content.ContextCompat;
+
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
@@ -26,6 +29,7 @@ import com.tencent.imsdk.v2.V2TIMCallback;
import com.tencent.imsdk.v2.V2TIMManager;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
+import com.yunbao.common.bean.FansMedalBean;
import com.yunbao.common.bean.LevelBean;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.dialog.AbsDialogFragment;
@@ -35,13 +39,17 @@ import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.utils.CommonIconUtil;
import com.yunbao.common.utils.DialogUitl;
+import com.yunbao.common.utils.NobleUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
+import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveReportActivity;
+import com.yunbao.live.activity.LiveRyAnchorActivity;
+import com.yunbao.live.bean.GuardUserBean;
import com.yunbao.live.bean.ImpressBean;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.live.custom.MyTextView;
@@ -57,6 +65,7 @@ import org.greenrobot.eventbus.EventBus;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import io.rong.imlib.IRongCoreCallback;
@@ -70,6 +79,7 @@ import pl.droidsonroids.gif.GifImageView;
*/
public class LiveUserDialogFragment extends AbsDialogFragment implements View.OnClickListener {
+ private String TAG = "用户弹窗";
private static final int TYPE_AUD_AUD = 1;//观众点别的观众
private static final int TYPE_ANC_AUD = 2;//主播点观众
@@ -84,46 +94,45 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
private static final int SETTING_ACTION_ANC_AUD = 501;//设置 主播点普通观众
private static final int SETTING_ACTION_ANC_ADM = 502;//设置 主播点房间管理员
private ViewGroup mBottomContainer;
- private ImageView mAvatar;
- private ImageView mLevelAnchor;
- private ImageView mLevel;
- private TextView mLevelText;
- private TextView mLevelAnchorText;
- private ImageView mSex;
+ private String mLiveUid;
+ private String mToUid;
+ private String mStream;
+ private int mType;
+ private int guardNumber;
+ private TextView mFollowText;
private TextView mName;
private TextView mID;
- private TextView mCity;
- private LinearLayout mImpressGroup;
- private TextView mFollow;
- private TextView mSign;
- private TextView mFans;
- private TextView mConsume;//消费
- private TextView mVotes;//收入
- private TextView mConsumeTip;
- private TextView mVotesTip;
- private String mLiveUid;
- private String mStream;
- private String mAvatarUrl;
- private String mToUid;
- private TextView mFollowText;
+ private TextView userLv;
+ private TextView mLvDesc;
+ private TextView mFansVal;
+ private TextView mPraise;
+ private TextView mSignDesc;
+ private TextView mNobleVal;
+ private TextView mReport;
+ private TextView mGuard;
+ private TextView mUnion;
+ private TextView mHonorVal;
private ImageView mFollowImage;
- private int mType;
- private int mAction;
- private String mToName;//对方的名字
+ private ImageView mSex;
+ private ImageView good_nub_ico;
+ private ImageView mLiveIcon;
+ private ImageView mLiveIcon2;
+ private ImageView mNoble;
+ private ImageView mNobleIcon;
+ private ImageView mAvatar;
+ private ImageView shawl;
+ private ImageView honorIcon;
private UserBean mUserBean;
+ private LinearLayout mGuardLayout;
+ private LinearLayout mUnionLayout;
private boolean mFollowing;
- private Drawable mFollowDrawable;
- private Drawable mUnFollowDrawable;
- SVGAImageView gift_svga;
- LinearLayout ry_view;
- ImageView medalIco1, shawl;
- ImageView ry_ico1, ry_ico2, ry_ico3, ry_ico4, good_nub_ico;
- View no_gz;
GifImageView btn_live;
+ SVGAImageView gift_svga;
+
@Override
protected int getLayoutId() {
- return R.layout.dialog_live_user;
+ return R.layout.dialog_new_live_user;
}
@Override
@@ -138,80 +147,6 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
private LiveRoomCheckLivePresenter mCheckLivePresenter;
- private void gotoLive(String live_id) {
- DialogUitl.showSimpleDialog(mContext, "是否確認前往對方直播間？", new DialogUitl.SimpleCallback() {
- @Override
- public void onConfirmClick(Dialog dialog, String content) {
- RongChatRoomClient.getInstance().quitChatRoom("g" + mLiveUid, new IRongCoreCallback.OperationCallback() {
- @Override
- public void onSuccess() {
- Log.i("tx", "退出成功");
- //连接socket
- LiveHttpUtil.qBackRoom(mLiveUid, mStream, new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
-
- }
- });
- }
-
- @Override
- public void onError(IRongCoreEnum.CoreErrorCode coreErrorCode) {
-
- }
- });
- V2TIMManager.getInstance().quitGroup("g" + mLiveUid, new V2TIMCallback() {
- @Override
- public void onSuccess() {
-
- Log.i("tx", "退出成功" + mLiveUid);
- //连接socket
- LiveHttpUtil.qBackRoom(mLiveUid, mStream, new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
-
- }
- });
- }
-
- @Override
- public void onError(int code, String desc) {
- Log.i("tx", "退出失败");
- }
- });
- LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
- if (code == 0 && info.length > 0) {
- LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
-
- if (mCheckLivePresenter == null) {
- mCheckLivePresenter = new LiveRoomCheckLivePresenter(mContext, new LiveRoomCheckLivePresenter.ActionListener() {
- @Override
- public void onLiveRoomChanged(LiveBean liveBean, int liveType, int liveTypeVal, int liveSdk) {
- if (liveBean == null) {
- return;
- }
- LiveRoomViewHolder.mHandler.removeCallbacksAndMessages(null);
-// if (mFromLiveRoom) {
-// ((UserHomeActivity) mContext).onBackPressed();
- dismiss();
- EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, liveTypeVal));
-// } else {
-// LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
-// }
- }
- });
- }
- mCheckLivePresenter.checkLive(liveBean);
- }
- }
- });
-
-
- }
- });
- }
@Override
protected void setWindowAttributes(Window window) {
@@ -236,64 +171,22 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
return;
}
mStream = bundle.getString(Constants.STREAM);
- //头像边框
- gift_svga = (SVGAImageView) mRootView.findViewById(R.id.gift_svga);
-
- btn_live = mRootView.findViewById(R.id.btn_live);
- btn_live.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- gotoLive(mToUid);
- }
- });
-
- mBottomContainer = mRootView.findViewById(R.id.bottom_container);
- ry_view = (LinearLayout) mRootView.findViewById(R.id.ry_view);
- no_gz = (View) mRootView.findViewById(R.id.no_gz);
- ry_ico1 = (ImageView) mRootView.findViewById(R.id.ry_ico1);
- good_nub_ico = (ImageView) mRootView.findViewById(R.id.good_nub_ico);
- ry_ico2 = (ImageView) mRootView.findViewById(R.id.ry_ico2);
- ry_ico3 = (ImageView) mRootView.findViewById(R.id.ry_ico3);
- ry_ico4 = (ImageView) mRootView.findViewById(R.id.ry_ico4);
- mAvatar = (ImageView) mRootView.findViewById(R.id.avatar);
- mLevelAnchor = (ImageView) mRootView.findViewById(R.id.anchor_level);
- mLevel = (ImageView) mRootView.findViewById(R.id.level);
- shawl = (ImageView) mRootView.findViewById(R.id.shawl);
- mLevelText = mRootView.findViewById(R.id.level_text);
- mLevelAnchorText = mRootView.findViewById(R.id.level_anchor_text);
- mSex = (ImageView) mRootView.findViewById(R.id.sex);
- mName = (TextView) mRootView.findViewById(R.id.name);
- mID = (TextView) mRootView.findViewById(R.id.id_val);
- mCity = (TextView) mRootView.findViewById(R.id.city);
- mSign = mRootView.findViewById(R.id.sign);
- mImpressGroup = (LinearLayout) mRootView.findViewById(R.id.impress_group);
- mFollow = (TextView) mRootView.findViewById(R.id.follow);
- mFans = (TextView) mRootView.findViewById(R.id.fans);
- mConsume = (TextView) mRootView.findViewById(R.id.consume);
- mVotes = (TextView) mRootView.findViewById(R.id.votes);
- mConsumeTip = (TextView) mRootView.findViewById(R.id.consume_tip);
- mVotesTip = (TextView) mRootView.findViewById(R.id.votes_tip);
- medalIco1 = (ImageView) mRootView.findViewById(R.id.medal_ico1);
- mAvatar.setOnClickListener(this);
- // mRootView.findViewById(R.id.btn_close).setOnClickListener(this);
getType();
+ initView();
+ initListener();
+ initGuardList();
LayoutInflater inflater = LayoutInflater.from(mContext);
View bottomView = null;
if (mType == TYPE_AUD_ANC) {
- if (mImpressGroup.getVisibility() != View.VISIBLE) {
- mImpressGroup.setVisibility(View.VISIBLE);
- }
bottomView = inflater.inflate(R.layout.dialog_live_user_bottom_1, mBottomContainer, false);
} else if (mType == TYPE_AUD_AUD) {
bottomView = inflater.inflate(R.layout.dialog_live_user_bottom_1, mBottomContainer, false);
} else if (mType == TYPE_ANC_AUD) {
- bottomView = inflater.inflate(R.layout.dialog_live_user_bottom_2, mBottomContainer, false);
+ bottomView = inflater.inflate(R.layout.dialog_live_user_bottom_1, mBottomContainer, false);
} else if (mType == TYPE_AUD_SELF) {
bottomView = inflater.inflate(R.layout.dialog_live_user_bottom_3, mBottomContainer, false);
}
if (bottomView != null) {
- mFollowDrawable = ContextCompat.getDrawable(mContext, R.mipmap.icon_user_home_follow_1);
- mUnFollowDrawable = ContextCompat.getDrawable(mContext, R.mipmap.icon_user_home_follow_0);
mBottomContainer.addView(bottomView);
mFollowText = bottomView.findViewById(R.id.follow_text);
mFollowImage = (ImageView) findViewById(R.id.follow_img);
@@ -313,6 +206,58 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
loadData();
}
+ private void initView() {
+ gift_svga = (SVGAImageView) mRootView.findViewById(R.id.gift_svga);
+ btn_live = mRootView.findViewById(R.id.btn_live);
+ mBottomContainer = mRootView.findViewById(R.id.bottom_container);
+ mSex = (ImageView) mRootView.findViewById(R.id.sex);
+ mName = (TextView) mRootView.findViewById(R.id.name);
+ mID = (TextView) mRootView.findViewById(R.id.id_val);
+ good_nub_ico = (ImageView) mRootView.findViewById(R.id.good_nub_ico);
+ userLv = mRootView.findViewById(R.id.lv_val);
+ mLvDesc = mRootView.findViewById(R.id.lv_desc);
+ mLiveIcon = mRootView.findViewById(R.id.user_card_lv_icon);
+ mLiveIcon2 = mRootView.findViewById(R.id.live_icon);
+ mNoble = mRootView.findViewById(R.id.user_card_noble);
+ mFansVal = mRootView.findViewById(R.id.fans_val);
+ mPraise = mRootView.findViewById(R.id.praise_val);
+ mSignDesc = mRootView.findViewById(R.id.sign);
+ mAvatar = mRootView.findViewById(R.id.avatar);
+ mNobleVal = mRootView.findViewById(R.id.noble_val);
+ shawl = (ImageView) mRootView.findViewById(R.id.shawl);
+ mReport = mRootView.findViewById(R.id.btn_report);
+ mGuardLayout = mRootView.findViewById(R.id.btn_guard);
+ mGuard = mRootView.findViewById(R.id.guard_val);
+ mNobleIcon = mRootView.findViewById(R.id.noble_icon);
+ honorIcon = mRootView.findViewById(R.id.honor_icon);
+ mUnionLayout = mRootView.findViewById(R.id.btn_union);
+ mUnion = mRootView.findViewById(R.id.union_val);
+ mHonorVal = mRootView.findViewById(R.id.honor_val);
+ }
+
+ private void initListener() {
+ btn_live.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ // gotoLive(mToUid);
+ }
+ });
+ mAvatar.setOnClickListener(this);
+ mReport.setOnClickListener(this);
+ mGuardLayout.setOnClickListener(this);
+ }
+
+ private void loadData() {
+ LiveHttpUtil.getLiveUser(mToUid, mLiveUid, new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ if (code == 0 && info.length > 0) {
+ showData(info[0]);
+ }
+ }
+ });
+ }
+
private void getType() {
String uid = CommonAppConfig.getInstance().getUid();
if (mToUid.equals(mLiveUid)) {
@@ -334,18 +279,9 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
}
}
- private void loadData() {
- LiveHttpUtil.getLiveUser(mToUid, mLiveUid, new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
- if (code == 0 && info.length > 0) {
- showData(info[0]);
- }
- }
- });
- }
-
private void showData(String data) {
+ Log.i(TAG, "showData: " + data);
+ boolean isAnchor = mLiveUid.equals(mToUid);
JSONObject obj = JSON.parseObject(data);
mUserBean = JSON.toJavaObject(obj, UserBean.class);
if (mUserBean.getIslive().equals("1")) {
@@ -353,12 +289,113 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} else {
btn_live.setVisibility(View.GONE);
}
+ if (isAnchor) {
+ mGuardLayout.setVisibility(View.VISIBLE);
+ if (obj.containsKey("user_president_name") && !StringUtil.isEmpty(obj.getString("user_president_name"))) {
+ mUnion.setText(obj.getString("user_president_name"));
+ mUnionLayout.setVisibility(View.VISIBLE);
+ }
+ mNoble.setVisibility(View.GONE);
+ }
+ mName.setText(obj.getString("user_nicename"));
+ if (mUserBean.getGoodnum() != null && !mUserBean.getGoodnum().equals("")) {
+ good_nub_ico.setVisibility(View.VISIBLE);
+ mID.setText(mUserBean.getGoodnum());
+ } else {
+ good_nub_ico.setVisibility(View.GONE);
+ mID.setText(mUserBean.getId());
+ }
+ mSex.setImageResource(CommonIconUtil.getSexIconForUserCard(obj.getIntValue("sex")));
+ LevelBean levelBean;
+ if (mLiveUid.equals(mUserBean.getId())) {
+ levelBean = CommonAppConfig.getInstance().getAnchorLevel(mUserBean.getLevelAnchor());
+ userLv.setText("Lv." + mUserBean.getLevelAnchor());
+ mLvDesc.setText(R.string.live_user_level_anchor);
+ } else {
+ levelBean = CommonAppConfig.getInstance().getLevel(mUserBean.getLevel());
+ userLv.setText("Lv." + mUserBean.getLevel());
+ mLvDesc.setText(R.string.live_user_card_level);
+ }
+ new LiveTextRender().getLevelImage(mContext, levelBean.getLevel(), new ImgLoader.DrawableCallback() {
+ @Override
+ public void onLoadSuccess(Drawable drawable) {
+ ImgLoader.display2(mContext, drawable, mLiveIcon);
+ }
- //装扮相关
+ @Override
+ public void onLoadFailed() {
+
+ }
+ });
+ ImgLoader.display(mContext, levelBean.getBgIcon(), mLiveIcon2);
+ FansMedalBean fansMedalBean = CommonAppConfig.getInstance().getAnchorFansMedal(obj.getIntValue("medal_level"));
+ if (fansMedalBean != null && !isAnchor) {
+ ImgLoader.display(mContext, fansMedalBean.getThumb(), mNoble);
+ } else {
+ mNoble.setVisibility(View.GONE);
+ }
+ mGuard.setText(String.format(mGuard.getText().toString(), guardNumber));
+ mFansVal.setText(WordUtil.getString(R.string.fans) + ":" + mUserBean.getFans());
+ mPraise.setText(WordUtil.getString(R.string.praise) + ":" + obj.getInteger("user_love_num"));
+ mSignDesc.setText(mUserBean.getSignature());
+ mNobleVal.setText(NobleUtil.nobleIdToStringName(Integer.parseInt(mUserBean.getNoble_id())));
+ ImgLoader.displayAvatar(mContext, obj.getString("avatar"), mAvatar);
JSONObject dress = obj.getJSONObject("dress");
- if (dress.getJSONArray("avatar_frame").size() == 1) {
+ mHonorVal.setText(dress.getInteger("medal_num") + "");
+ if (obj.containsKey("level_thumb")) {
+ ImgLoader.display(mContext, obj.getJSONObject("level_thumb").getString("icon"), mLiveIcon2);
+ } else {
+ mLiveIcon2.setVisibility(View.INVISIBLE);
+ }
+ if (dress.containsKey("medal")) {
+ JSONObject item = null;
+ for (Object medal : dress.getJSONArray("medal")) {
+ JSONObject _item = (JSONObject) medal;
+ if (_item.getInteger("is_use") == 1) {
+ item = _item;
+ break;
+ }
+ }
+ if (item != null) {
+ String url = item.getString("display_src");
+ if (item.containsKey("noble_medal") && !isAnchor) {
+ mNoble.setVisibility(View.VISIBLE);
+ ImgLoader.display(mContext, item.getString("noble_medal"), mNoble);
+ }
+ if (url != null) {
+ url = url.replace("qny.shayucm.com", "downs.yaoulive.com");
+ mNobleIcon.setVisibility(View.VISIBLE);
+ ImgLoader.display(mContext, url, mNobleIcon);
+ } else {
+ mNobleIcon.setVisibility(View.INVISIBLE);
+ }
+ }
+ } else {
+ mNobleIcon.setVisibility(View.INVISIBLE);
+ }
+ if (dress.containsKey("medal_no")) {
+ JSONObject item = null;
+ if (dress.getJSONArray("medal_no").size() > 0) {
+ item = dress.getJSONArray("medal_no").getJSONObject(0);
+ String url = item.getString("display_src");
+ url = url.replace("qny.shayucm.com", "downs.yaoulive.com");
+ honorIcon.setVisibility(View.VISIBLE);
+ ImgLoader.display(mContext, url, honorIcon);
+ }
+ } else {
+ honorIcon.setVisibility(View.INVISIBLE);
+ }
+ mFollowing = obj.getIntValue("isattention") == 1;
+ updateFollow();
+ //装扮相关
+
+ if (dress.getJSONArray("wraps").size() >= 1) {
+ JSONObject display = (JSONObject) dress.getJSONArray("wraps").get(0);
+ ImgLoader.display(mContext, display.getString("display_src"), shawl);
+ }
+ if (dress.getJSONArray("avatar_frame").size() == 1) {
JSONObject ico = (JSONObject) dress.getJSONArray("avatar_frame").get(0);
if (ico.getString("effect_src") != null) {
if (ico.getString("effect_src").contains("svga")) {
@@ -386,181 +423,24 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
}
}
- medalIco1.setVisibility(View.GONE);
- no_gz.setVisibility(View.GONE);
- if (dress.getJSONArray("medal").size() >= 1) {
- JSONObject display = (JSONObject) dress.getJSONArray("medal").get(0);
- if (display.getString("display_src") != null) {
- ImgLoader.display(mContext, display.getString("display_src"), medalIco1);
- medalIco1.setVisibility(View.VISIBLE);
- no_gz.setVisibility(View.VISIBLE);
- }
- }
- if (dress.getJSONArray("wraps").size() >= 1) {
- JSONObject display = (JSONObject) dress.getJSONArray("wraps").get(0);
- ImgLoader.display(mContext, display.getString("display_src"), shawl);
- }
- JSONObject display = (JSONObject) dress.getJSONArray("medal").get(0);
+ }
- if (dress.getJSONArray("medal_no") != null) {
- Log.e("tag", dress.getJSONArray("medal_no").size() + "");
- ry_view.setVisibility(View.VISIBLE);
- JSONObject ry1 = (JSONObject) dress.getJSONArray("medal_no").get(0);
- ImgLoader.display(mContext, ry1.get("display_src").toString(), ry_ico1);
- ry_ico1.setVisibility(View.VISIBLE);
-
- if (dress.getJSONArray("medal_no").size() >= 2) {
- JSONObject ry2 = (JSONObject) dress.getJSONArray("medal_no").get(1);
- ImgLoader.display(mContext, ry2.get("display_src").toString(), ry_ico2);
- ry_ico2.setVisibility(View.VISIBLE);
- }
- if (dress.getJSONArray("medal_no").size() >= 3) {
- JSONObject ry3 = (JSONObject) dress.getJSONArray("medal_no").get(2);
- ImgLoader.display(mContext, ry3.get("display_src").toString(), ry_ico3);
- ry_ico3.setVisibility(View.VISIBLE);
- }
-
- if (dress.getJSONArray("medal_no").size() >= 4) {
- JSONObject ry4 = (JSONObject) dress.getJSONArray("medal_no").get(3);
- ImgLoader.display(mContext, ry4.get("display_src").toString(), ry_ico4);
- ry_ico4.setVisibility(View.VISIBLE);
- }
-
-
- } else {
- ry_view.setVisibility(View.GONE);
- }
-
- CommonAppConfig appConfig = CommonAppConfig.getInstance();
-
- if (mUserBean.getGoodnum() != null && !mUserBean.getGoodnum().equals("")) {
- good_nub_ico.setVisibility(View.VISIBLE);
- mID.setText("ID:" + mUserBean.getGoodnum());
- } else {
- good_nub_ico.setVisibility(View.GONE);
- mID.setText(mUserBean.getLiangNameTip());
- }
- mToName = obj.getString("user_nicename");
- mName.setText(mToName);
- mCity.setText(obj.getString("city"));
- ImgLoader.displayAvatar(mContext, obj.getString("avatar"), mAvatar);
- mAvatarUrl = obj.getString("avatar");
- int levelAnchor = obj.getIntValue("level_anchor");
- int level = obj.getIntValue("level");
- mSign.setText(obj.getString("signature"));
- LevelBean anchorLevelBean = appConfig.getAnchorLevel(obj.getIntValue("level_anchor"));
- if (anchorLevelBean != null) {
- ImgLoader.display(mContext, anchorLevelBean.getBgIcon(), mLevelAnchor);
- }
- LevelBean levelBean = appConfig.getLevel(obj.getIntValue("level"));
- if (levelBean != null) {
- ImgLoader.display(mContext, levelBean.getBgIcon(), mLevel);
- }
- mLevelAnchorText.setText(String.valueOf(levelAnchor));
- mLevelText.setText(String.valueOf(level));
- mSex.setImageResource(CommonIconUtil.getSexIcon(obj.getIntValue("sex")));
- mFollow.setText(new LiveTextRender().renderLiveUserDialogData(obj.getLongValue("follows")));
- mFans.setText(new LiveTextRender().renderLiveUserDialogData(obj.getLongValue("fans")));
- mConsume.setText(new LiveTextRender().renderLiveUserDialogData(obj.getLongValue("consumption")));
- mVotes.setText(new LiveTextRender().renderLiveUserDialogData(obj.getLongValue("votestotal")));
- mConsumeTip.setText(WordUtil.getString(R.string.live_user_send) + appConfig.getCoinName());
- mVotesTip.setText(WordUtil.getString(R.string.live_user_get) + appConfig.getVotesName());
- if (mType == TYPE_AUD_ANC) {
- showImpress(obj.getString("label"));
- }
- mFollowing = obj.getIntValue("isattention") == 1;
+ private void updateFollow() {
if (mFollowText != null) {
- mFollowText.setText(mFollowing ? WordUtil.getString(R.string.following) : WordUtil.getString(R.string.follow));
+ mFollowText.setText(mFollowing ? R.string.following : R.string.follow);
+ if (mFollowing) {
+ mFollowText.setTextColor(Color.parseColor("#B1B1B1"));
+ } else {
+ mFollowText.setTextColor(Color.parseColor("#FA6400"));
+ }
}
if (mFollowImage != null) {
- mFollowImage.setImageDrawable(mFollowing ? mFollowDrawable : mUnFollowDrawable);
- }
- mAction = obj.getIntValue("action");
- if (mAction == SETTING_ACTION_AUD) {//设置 普通观众点普通观众 或所有人点超管
- View btnReport = mRootView.findViewById(R.id.btn_report);
- btnReport.setVisibility(View.VISIBLE);
- btnReport.setOnClickListener(this);
- } else if (mAction == SETTING_ACTION_ADM//设置 房间管理员点普通观众
- || mAction == SETTING_ACTION_SUP//设置 超管点主播
- || mAction == SETTING_ACTION_ANC_AUD//设置 主播点普通观众
- || mAction == SETTING_ACTION_ANC_ADM) {//设置 主播点房间管理员
- View btnSetting = mRootView.findViewById(R.id.btn_setting);
- btnSetting.setVisibility(View.VISIBLE);
- btnSetting.setOnClickListener(this);
- }
- }
-
- private void showImpress(String impressJson) {
- List list = JSON.parseArray(impressJson, ImpressBean.class);
- if (list.size() > 2) {
- list = list.subList(0, 2);
- }
- LayoutInflater inflater = LayoutInflater.from(mContext);
- for (int i = 0, size = list.size(); i < size; i++) {
- MyTextView myTextView = (MyTextView) inflater.inflate(R.layout.view_impress_item_2, mImpressGroup, false);
- ImpressBean bean = list.get(i);
- bean.setCheck(1);
- myTextView.setBean(bean);
- mImpressGroup.addView(myTextView);
- }
- TextView textView = (TextView) inflater.inflate(R.layout.view_impress_item_add, mImpressGroup, false);
- textView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- addImpress();
+ if (mFollowing) {
+ mFollowImage.setVisibility(View.GONE);
+ } else {
+ mFollowImage.setVisibility(View.VISIBLE);
}
- });
- mImpressGroup.addView(textView);
- }
-
-
- /**
- * 添加主播印象
- */
- private void addImpress() {
- dismiss();
- ((LiveActivity) mContext).openAddImpressWindow(mLiveUid);
- }
-
- @Override
- public void onClick(View v) {
- int i = v.getId();
- if (i == R.id.btn_close) {
- dismiss();
-
- } else if (i == R.id.btn_follow) {
- setAttention();
-
- } else if (i == R.id.btn_pri_msg) {
- openChatRoomWindow();
-
- } else if (i == R.id.btn_home_page) {
- forwardHomePage();
-
- } else if (i == R.id.btn_setting) {
- setting();
-
- } else if (i == R.id.btn_report) {
- report();
-
- } else if (i == R.id.avatar) {
- forwardHomePage();
- }
- }
-
- /**
- * 打开私信聊天窗口
- */
- private void openChatRoomWindow() {
- if (mUserBean != null) {
- dismiss();
-// ToastUtil.show("私聊暫不可用");
-// if (!mToUid.equals(CommonAppConfig.getInstance().getUid())) {
-// SystemMessageActivity.forward(mContext, "-1", mToUid, mToName, mAvatarUrl);
-// }
-
- ((LiveActivity) mContext).openChatListWindow();
}
}
@@ -568,26 +448,45 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
* 关注
*/
private void setAttention() {
- CommonHttpUtil.setAttention(mToUid, mAttentionCallback);
+ if (mFollowing) {
+ DialogUitl.Builder builder = new DialogUitl.Builder(mContext)
+ .setContent(WordUtil.getString(R.string.unfollow))
+ .setConfrimString(WordUtil.getString(R.string.unfollow_confrim))
+ .setCancelString(WordUtil.getString(R.string.unfollow_cancel))
+ .setView(R.layout.dialog_live_unfollow)
+ .setClickCallback3(new DialogUitl.SimpleCallback3() {
+
+
+ @Override
+ public void onConfirmClick(Dialog dialog) {
+ dialog.dismiss();
+ }
+
+ @Override
+ public void onCancel() {
+ attention();
+ }
+ });
+ builder.build().show();
+ return;
+ }
+ attention();
}
- private CommonCallback mAttentionCallback = new CommonCallback() {
+ private void attention() {
+ CommonHttpUtil.setAttention(mToUid, new CommonCallback() {
- @Override
- public void callback(Integer isAttention) {
- mFollowing = isAttention == 1;
- if (mFollowText != null) {
- mFollowText.setText(mFollowing ? R.string.following : R.string.follow);
+ @Override
+ public void callback(Integer isAttention) {
+ mFollowing = isAttention == 1;
+ updateFollow();
+ if (isAttention == 1 && mLiveUid.equals(mToUid)) {//关注了主播
+ ((LiveActivity) mContext).sendSystemMessage(
+ CommonAppConfig.getInstance().getUserBean().getUserNiceName() + WordUtil.getString(R.string.live_follow_anchor));
+ }
}
- if (mFollowImage != null) {
- mFollowImage.setImageDrawable(mFollowing ? mFollowDrawable : mUnFollowDrawable);
- }
- if (isAttention == 1 && mLiveUid.equals(mToUid)) {//关注了主播
- ((LiveActivity) mContext).sendSystemMessage(
- CommonAppConfig.getInstance().getUserBean().getUserNiceName() + WordUtil.getString(R.string.live_follow_anchor));
- }
- }
- };
+ });
+ }
/**
* 跳转到个人主页
@@ -596,8 +495,6 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
dismiss();
Constants.mStream = mStream;
RouteUtil.forwardUserHome(mContext, mToUid, true, mLiveUid, 0);
-// String url = HtmlConfig.PERSONAL + "?touid=" + mToUid + "&&isHomePage=1" + "&&fromType=0";
-// Constants.myUrl = url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
}
/**
@@ -607,203 +504,31 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
LiveReportActivity.forward(mContext, mToUid);
}
- /**
- * 设置
- *
- * 某个大神说，角色是权限的集合。。
- *
- * 理论上，角色的权限应该有服务端以数组或集合的形式返回，这样可以在后台动态配置某种角色的权限，而不是这样口头约定写死。。。
- * 然而，是服务端这样做的，我也很无奈。。。也许他们不知道如何做成动态配置的吧。。
- *
- * 我一直想通过不断重构把代码写的像艺术品，然而，最近发现，这完全是多此一举，自讨苦吃。。是我太天真了。。
- * 下面是我发现的一篇文章，说的非常好，也点醒了我。。如果你们发现当前代码写的太烂，不堪入目的话，请阅读下面的文章。
- *
- * https://www.jianshu.com/p/71521541cd25?utm_campaign=haruki&utm_content=note&utm_medium=reader_share&utm_source=weixin_timeline&from=timeline
- */
- private void setting() {
- List list = new ArrayList<>();
- switch (mAction) {
- case SETTING_ACTION_ADM://设置 房间管理员点普通观众
- list.add(R.string.live_setting_kick);
-// list.add(R.string.live_setting_gap);
- list.add(R.string.live_setting_gap_2);
- break;
- case SETTING_ACTION_SUP://设置 超管点主播
- list.add(R.string.live_setting_close_live);
- list.add(R.string.live_setting_close_live_2);
- list.add(R.string.live_setting_forbid_account);
- break;
- case SETTING_ACTION_ANC_AUD://设置 主播点普通观众
- list.add(R.string.live_setting_kick);
-// list.add(R.string.live_setting_gap);
- list.add(R.string.live_setting_gap_2);
- list.add(R.string.live_setting_admin);
- list.add(R.string.live_setting_admin_list);
- break;
- case SETTING_ACTION_ANC_ADM://设置 主播点房间管理员
- list.add(R.string.live_setting_kick);
-// list.add(R.string.live_setting_gap);
- list.add(R.string.live_setting_gap_2);
- list.add(R.string.live_setting_admin_cancel);
- list.add(R.string.live_setting_admin_list);
- break;
- }
-
- DialogUitl.showStringArrayDialog(mContext, list.toArray(new Integer[list.size()]), mArrayDialogCallback);
- }
-
- private DialogUitl.StringArrayDialogCallback mArrayDialogCallback = new DialogUitl.StringArrayDialogCallback() {
- @Override
- public void onItemClick(String text, int tag) {
- if (tag == R.string.live_setting_kick) {
- kick();
-
- } else if (tag == R.string.live_setting_gap) {//永久禁言->改成三天禁言
- setShutUp();
-
- } else if (tag == R.string.live_setting_gap_2) {//本场禁言
- setShutUp2();
-
- } else if (tag == R.string.live_setting_admin || tag == R.string.live_setting_admin_cancel) {
- setAdmin();
-
- } else if (tag == R.string.live_setting_admin_list) {
- adminList();
-
- } else if (tag == R.string.live_setting_close_live) {
- closeLive();
-
- } else if (tag == R.string.live_setting_forbid_account) {
- forbidAccount();
-
- } else if (tag == R.string.live_setting_close_live_2) {//禁用直播
- closeLive2();
- }
- }
- };
-
- /**
- * 查看管理员列表
- */
- private void adminList() {
- dismiss();
- ((LiveActivity) mContext).openAdminListWindow();
- }
-
- /**
- * 踢人
- */
- private void kick() {
- LiveHttpUtil.kicking(mLiveUid, mToUid, new HttpCallback() {
+ private void initGuardList() {
+ LiveHttpUtil.getGuardList(mLiveUid, 1, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
- if (code == 0) {
- ((LiveActivity) mContext).kickUser(mToUid, mToName);
- } else {
- ToastUtil.show(msg);
+ List list = JSON.parseArray(Arrays.toString(info), GuardUserBean.class);
+ if (list != null) {
+ guardNumber = list.size();
}
}
});
}
- /**
- * 永久禁言->改成三天禁言
- */
- private void setShutUp() {
- LiveHttpUtil.setShutUp(mLiveUid, "0", 0, mToUid, new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
- if (code == 0) {
- ((LiveActivity) mContext).setShutUp(mToUid, mToName, 0);
- } else {
- ToastUtil.show(msg);
- }
- }
- });
- }
-
- /**
- * 本场禁言
- */
- private void setShutUp2() {
- LiveHttpUtil.setShutUp(mLiveUid, mStream, 1, mToUid, new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
- if (code == 0) {
- ((LiveActivity) mContext).setShutUp(mToUid, mToName, 1);
- } else {
- ToastUtil.show(msg);
- }
- }
- });
- }
-
-
- /**
- * 设置或取消管理员
- */
- private void setAdmin() {
- LiveHttpUtil.setAdmin(mLiveUid, mToUid, new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
- if (code == 0 && info.length > 0) {
- int res = JSON.parseObject(info[0]).getIntValue("isadmin");
- if (res == 1) {//被设为管理员
- mAction = SETTING_ACTION_ANC_ADM;
- } else {//被取消管理员
- mAction = SETTING_ACTION_ANC_AUD;
- }
- ((LiveActivity) mContext).sendSetAdminMessage(res, mToUid, mToName);
- }
- }
- });
- }
-
-
- /**
- * 超管关闭直播间
- */
- private void closeLive() {
- dismiss();
- LiveHttpUtil.superCloseRoom(mLiveUid, 0, mSuperCloseRoomCallback);
- }
-
- /**
- * 超管关闭直播间并禁止主播直播
- */
- private void closeLive2() {
- dismiss();
- LiveHttpUtil.superCloseRoom(mLiveUid, 1, mSuperCloseRoomCallback);
- }
-
- /**
- * 超管关闭直播间并禁用主播账户
- */
- private void forbidAccount() {
- dismiss();
- LiveHttpUtil.superCloseRoom(mLiveUid, 2, mSuperCloseRoomCallback);
- }
-
- private HttpCallback mSuperCloseRoomCallback = new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
- if (code == 0) {
- ToastUtil.show(JSON.parseObject(info[0]).getString("msg"));
- ((LiveActivity) mContext).superCloseRoom();
- } else {
- ToastUtil.show(msg);
- }
- }
- };
-
@Override
- public void onDestroy() {
- LiveHttpUtil.cancel(LiveHttpConsts.GET_LIVE_USER);
- if (mAvatar != null) {
- ImgLoader.clear(mContext, mAvatar);
- mAvatar.setImageDrawable(null);
+ public void onClick(View v) {
+ int i = v.getId();
+ if (i == R.id.btn_follow) {
+ setAttention();
+ } else if (i == R.id.btn_home_page) {
+ forwardHomePage();
+ } else if (i == R.id.btn_report) {
+ report();
+ } else if (i == R.id.avatar) {
+ forwardHomePage();
+ } else if (i == R.id.btn_guard) {
+ ((LiveActivity) mContext).openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity);
}
- mAvatar = null;
- super.onDestroy();
}
}
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 28b94428a..9881fcb9a 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -298,6 +298,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private List wishlist = new ArrayList<>();
private TextView mHourRank, mHotText;
private LinearLayout msg; //默认悬浮窗布局
+ private LinearLayout mAnchorLayout;
+ private ImageView mGoodNumberIcon;
private View msg2; //悬浮窗来私信的布局
private ConstraintLayout msgLayout; //悬浮窗
private TextView msgNumber;//悬浮窗左上角数标
@@ -765,6 +767,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
fans = (TextView) findViewById(R.id.fans);
fans_btn = (LinearLayout) findViewById(R.id.fans_btn);
wishListLayout = (LinearLayout) findViewById(R.id.wish_list_layout);
+ mAnchorLayout = (LinearLayout) findViewById(R.id.group_1);
+ mGoodNumberIcon = (ImageView) findViewById(R.id.good_nub_ico);
if (LivePushTxViewHolder.mTRTCCloud != null || LivePushRyViewHolder.rtcRoom != null) {
fans_btn.setVisibility(View.GONE);
@@ -1050,6 +1054,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
Log.e("PortraitLiveManager", error);
}
});
+
}
public synchronized void showStart(StarChallengeStatusModel data) {
@@ -1971,12 +1976,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} else if (i == R.id.btn_prize_pool_level) {
((LiveActivity) mContext).openPrizePoolWindow();
} else if (i == R.id.user_more) {
- ((LiveActivity) mContext).openUserMoreListWindow(1, false, false,mContext instanceof LiveRyAnchorActivity);
+ ((LiveActivity) mContext).openUserMoreListWindow(1, false, false, mContext instanceof LiveRyAnchorActivity);
} else if (i == R.id.hot_btn) {
- ((LiveActivity) mContext).openUserMoreListWindow(1, false, false,mContext instanceof LiveRyAnchorActivity);
+ ((LiveActivity) mContext).openUserMoreListWindow(1, false, false, mContext instanceof LiveRyAnchorActivity);
} else if (i == R.id.noble_seat) {
- ((LiveActivity) mContext).openUserMoreListWindow(1, false, true,mContext instanceof LiveRyAnchorActivity);
+ ((LiveActivity) mContext).openUserMoreListWindow(1, false, true, mContext instanceof LiveRyAnchorActivity);
} else if (i == R.id.btn_close) {
close();
//小屏
@@ -2877,6 +2882,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
fragment.show(((LiveActivity) mContext).getSupportFragmentManager(), "faceUi");
}
+ public void setAnchorGoodNumber(String goodNumber) {
+ if (!StringUtil.isEmpty(goodNumber) && !goodNumber.equals("0")) {
+ mAnchorLayout.setBackgroundResource(R.drawable.bg_live_anchor_goodnum);
+ mGoodNumberIcon.setVisibility(View.VISIBLE);
+ }
+ }
+
private static class LiveRoomHandler extends Handler {
private LiveRoomViewHolder mLiveRoomViewHolder;
diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
index 17535b20e..0a9e2bd2d 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -267,6 +267,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.setName(data.getUserNiceName());
mLiveRoomViewHolder.setRoomNum(data.getLiangNameTip());
mLiveRoomViewHolder.setTitle(data.getTitle());
+ mLiveRoomViewHolder.setAnchorGoodNumber(data.getGoodNum());
mLiveRyLinkMicPkPresenter.setLiveUid(data.getUid(), "");
diff --git a/live/src/main/res/drawable/background_ff63c1.xml b/live/src/main/res/drawable/background_ff63c1.xml
new file mode 100644
index 000000000..6004c4a80
--- /dev/null
+++ b/live/src/main/res/drawable/background_ff63c1.xml
@@ -0,0 +1,9 @@
+
+
+-
+
+
+
+
+
+
diff --git a/live/src/main/res/drawable/bg_live_anchor_goodnum.xml b/live/src/main/res/drawable/bg_live_anchor_goodnum.xml
new file mode 100644
index 000000000..4b4a916f9
--- /dev/null
+++ b/live/src/main/res/drawable/bg_live_anchor_goodnum.xml
@@ -0,0 +1,10 @@
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/drawable/bg_user_card_fans.xml b/live/src/main/res/drawable/bg_user_card_fans.xml
new file mode 100644
index 000000000..60ab9e052
--- /dev/null
+++ b/live/src/main/res/drawable/bg_user_card_fans.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/drawable/bg_user_card_guard.xml b/live/src/main/res/drawable/bg_user_card_guard.xml
new file mode 100644
index 000000000..bcfe90830
--- /dev/null
+++ b/live/src/main/res/drawable/bg_user_card_guard.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/drawable/bg_user_card_honor.xml b/live/src/main/res/drawable/bg_user_card_honor.xml
new file mode 100644
index 000000000..7ad95101b
--- /dev/null
+++ b/live/src/main/res/drawable/bg_user_card_honor.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/drawable/bg_user_card_lv.xml b/live/src/main/res/drawable/bg_user_card_lv.xml
new file mode 100644
index 000000000..3190220a6
--- /dev/null
+++ b/live/src/main/res/drawable/bg_user_card_lv.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_live_user_bottom_1.xml b/live/src/main/res/layout/dialog_live_user_bottom_1.xml
index 94900faef..f3a185349 100644
--- a/live/src/main/res/layout/dialog_live_user_bottom_1.xml
+++ b/live/src/main/res/layout/dialog_live_user_bottom_1.xml
@@ -1,56 +1,19 @@
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ android:background="#eeeeee" />
+ android:orientation="horizontal">
-
-
-
-
-
-
-
-
-
-
-
-
+ android:orientation="horizontal">
+ android:src="@mipmap/icon_user_home_msg" />
+ android:textSize="13sp" />
@@ -90,22 +50,20 @@
android:id="@+id/btn_home_page"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1"
- >
+ android:layout_weight="1">
+ android:orientation="horizontal">
+ android:visibility="gone" />
+ android:textSize="16sp"
+ android:textStyle="bold" />
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_new_live_user.xml b/live/src/main/res/layout/dialog_new_live_user.xml
new file mode 100644
index 000000000..629330d43
--- /dev/null
+++ b/live/src/main/res/layout/dialog_new_live_user.xml
@@ -0,0 +1,457 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index cf6805f4f..b6fe3828a 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -68,14 +68,30 @@
android:textColor="@color/white"
android:textSize="12sp" />
-
+ android:gravity="center"
+ android:orientation="horizontal">
+
+
+
+
+
+
@@ -389,8 +405,8 @@
android:layout_height="wrap_content"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginStart="10dp"
- android:visibility="visible"
- android:layout_toEndOf="@id/live_wks_layout">
+ android:layout_toEndOf="@id/live_wks_layout"
+ android:visibility="visible">
@@ -2042,6 +2058,7 @@
android:textStyle="bold" />
+
+
觀眾
觀眾
粉絲
+ 獲讚
私信
選擇房間類型
公開房
diff --git a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
index 489a950e0..efc7bd235 100644
--- a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
@@ -25,6 +25,7 @@ import com.blankj.utilcode.util.GsonUtils;
import com.fm.openinstall.OpenInstall;
import com.fm.openinstall.listener.AppInstallAdapter;
import com.fm.openinstall.model.AppData;
+import com.lzy.okgo.model.Response;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
@@ -39,6 +40,7 @@ import com.yunbao.common.http.CommonHttpConsts;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
+import com.yunbao.common.http.JsonBean;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
@@ -336,6 +338,13 @@ public class LoginActivity extends AbsActivity {
finish();
}
+
+ @Override
+ public void onError(Response response) {
+ super.onError(response);
+ String message = response.message();
+ System.out.println(">>>>>"+message);
+ }
});
}