界面修改

2022-08-19 10:04:50 +08:00
parent f8ea294d6d
commit b5aa768f5b
12 changed files with 106 additions and 90 deletions
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -370,7 +370,8 @@ public class LiveAudienceActivity extends LiveActivity {
        sidebarList.setEmptyLayoutId(R.layout.view_no_data_live);
        GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.VERTICAL, false);
        sidebarList.setLayoutManager(gridLayoutManager);
-        ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 5, 0);
+        sidebarList.setLoadMoreEnable(false);
+        ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 6, 0);
        decoration.setOnlySetItemOffsetsButNoDraw(true);
        sidebarList.setItemDecoration(decoration);
        Display mDisplay = getWindowManager().getDefaultDisplay();
--- a/live/src/main/java/com/yunbao/live/adapter/SidebarAdapter.java
+++ b/live/src/main/java/com/yunbao/live/adapter/SidebarAdapter.java
@@ -32,7 +32,7 @@ public class SidebarAdapter extends RefreshAdapter<AnchorRecommendItemModel> {
    @Override
    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

-        return new SidebarLiveItemViewHolder(mInflater.inflate(R.layout.item_main_home_lives, parent, false));
+        return new SidebarLiveItemViewHolder(mInflater.inflate(R.layout.item_sidebar_lives, parent, false));
    }

    @Override
--- a/live/src/main/java/com/yunbao/live/views/SidebarLiveItemViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/SidebarLiveItemViewHolder.java
@@ -1,7 +1,6 @@
 package com.yunbao.live.views;

 import android.content.Context;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -9,15 +8,14 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.request.RequestOptions;
 import com.jakewharton.rxbinding3.view.RxView;
 import com.squareup.picasso.Picasso;
-import com.yunbao.common.Constants;
 import com.yunbao.common.bean.AnchorRecommendItemModel;
-import com.yunbao.common.custom.RatioRoundImageView;
 import com.yunbao.common.glide.ImgLoader;
-import com.yunbao.common.utils.formatBigNum;
 import com.yunbao.live.R;
-import com.yunbao.live.utils.MainIconUtil;

 import java.util.concurrent.TimeUnit;

@@ -29,29 +27,16 @@ import kotlin.Unit;
 * 直播页面布局
 */
 public class SidebarLiveItemViewHolder extends RecyclerView.ViewHolder {
-    private ImageView mCover, liveType, mLiveIco, mType, pkico, drPkIco, pkAvatar;
-    private RatioRoundImageView bgs;
-    private View views;
-    private TextView mLiveState, mTitle, mName, mNum;
+    private ImageView mCover, liveType;
+    private TextView mName;

    public SidebarLiveItemViewHolder(@NonNull View itemView) {
        super(itemView);
        //展示普通布局，隐藏周星榜布局
-        itemView.findViewById(R.id.live_info_view).setVisibility(View.VISIBLE);
-        itemView.findViewById(R.id.lt_week_list).setVisibility(View.GONE);
+
        mCover = itemView.findViewById(R.id.cover);
-        bgs = itemView.findViewById(R.id.bgs);
        liveType = itemView.findViewById(R.id.live_type);
-        views = itemView.findViewById(R.id.views);
-        mLiveIco = (ImageView) itemView.findViewById(R.id.tv_live_ico);
-        mLiveState = (TextView) itemView.findViewById(R.id.tv_live_state);
-        mType = (ImageView) itemView.findViewById(R.id.type);
-        mTitle = (TextView) itemView.findViewById(R.id.title);
-        mName = (TextView) itemView.findViewById(R.id.name);
-        mNum = (TextView) itemView.findViewById(R.id.num);
-        pkico = (ImageView) itemView.findViewById(R.id.pk_ico);
-        drPkIco = (ImageView) itemView.findViewById(R.id.dr_pk_ico);
-        pkAvatar = (ImageView) itemView.findViewById(R.id.pk_avatar);
+        mName = itemView.findViewById(R.id.name);
    }

    /**
@@ -73,51 +58,10 @@ public class SidebarLiveItemViewHolder extends RecyclerView.ViewHolder {
                    .load(bean.getContentPicSizeThree())
                    .into(liveType);
        }
-        ImgLoader.display(itemView.getContext(), bean.getThumb(), mCover);
-        bgs.setVisibility(View.VISIBLE);
-        pkico.setVisibility(View.GONE);
-        pkAvatar.setVisibility(View.GONE);
-        drPkIco.setVisibility(View.GONE);
-        if (bean.getDrpkStatus() != null && bean.getDrpkStatus().equals("1")) {
-            drPkIco.setVisibility(View.VISIBLE);
-        }
-        if (bean.getPkAvatarThumb() != null && !bean.getPkAvatarThumb().equals("")) {
-            ImgLoader.display(mContext, bean.getPkAvatarThumb(), pkAvatar);
-            pkico.setVisibility(View.VISIBLE);
-            pkAvatar.setVisibility(View.VISIBLE);
-        }
+        ImgLoader.display(itemView.getContext(),bean.getThumb(),mCover);
+
        mName.setText(bean.getUserNicename());
-        if (TextUtils.isEmpty(bean.getTitle())) {
-            if (mTitle.getVisibility() == View.VISIBLE) {
-                mTitle.setVisibility(View.GONE);
-            }
-        } else {
-            if (mTitle.getVisibility() != View.VISIBLE) {
-                mTitle.setVisibility(View.VISIBLE);
-            }
-            mTitle.setText(bean.getTitle());
-        }
-        mNum.setText(formatBigNum.formatBigNum(bean.getHotNum()));
-        views.setVisibility(View.GONE);
-        if ("1".equals(bean.getIslive())) {
-            views.setVisibility(View.VISIBLE);
-            //直播中
-            mType.setImageResource(MainIconUtil.getLiveTypeIcon(Integer.parseInt(bean.getType())));
-            mType.setVisibility(View.VISIBLE);
-            mLiveIco.setImageResource(R.mipmap.icon_main_rest_work);
-            mNum.setVisibility(View.VISIBLE);
-            liveType.setVisibility(View.VISIBLE);
-            mLiveState.setText(R.string.lives_state);
-        } else {
-            views.setVisibility(View.VISIBLE);
-            //休息中
-            mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
-            mType.setVisibility(View.GONE);
-            mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot);
-            mLiveState.setText(R.string.rest_state);
-            liveType.setVisibility(View.GONE);
-            mNum.setVisibility(View.GONE);
-        }
+
        RxView.clicks(itemView)
                .throttleFirst(2, TimeUnit.SECONDS)  // 才发送 2s内第1次点击按钮的事件
                .subscribe(new Observer<Unit>() {
@@ -143,14 +87,7 @@ public class SidebarLiveItemViewHolder extends RecyclerView.ViewHolder {

                    }
                });
-        views.setVisibility(View.GONE);
-        mLiveIco.setVisibility(View.GONE);
-        mLiveState.setVisibility(View.GONE);
-        mNum.setVisibility(View.GONE);
-        pkAvatar.setVisibility(View.GONE);
-        pkico.setVisibility(View.GONE);
-        mTitle.setVisibility(View.GONE);
-        drPkIco.setVisibility(View.GONE);
+
    }

    public interface OnItemClickListener {