diff --git a/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java b/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java index b0cc3c2fd..34920b913 100644 --- a/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java +++ b/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java @@ -1,5 +1,6 @@ package com.yunbao.common.adapter; +import android.app.Activity; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -10,7 +11,9 @@ import androidx.recyclerview.widget.RecyclerView; import com.yunbao.common.R; import com.yunbao.common.bean.AnchorRecommendItemModel; +import com.yunbao.common.bean.AnchorRecommendModel; import com.yunbao.common.bean.CustomSidebarInfoModel; +import com.yunbao.common.http.main.MainNetManager; import com.yunbao.common.views.DrawerRecommendViewHolder; import com.yunbao.common.views.DrawerTaskViewHolder; import com.yunbao.common.views.FunGamesViewHolder; @@ -85,6 +88,34 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter { RecommendViewHolder recommendViewHolder = (RecommendViewHolder) holder; recommendViewHolder.setData(infoModels.get(position)); recommendViewHolder.updateData(list); + recommendViewHolder.setListener(new RecommendViewHolder.RecommendViewListener() { + @Override + public void changeOneBatch() { + //推荐位 + MainNetManager.get((Activity) mContext) + .anchorRecommend("9", new com.yunbao.common.http.base.HttpCallback() { + @Override + public void onSuccess(AnchorRecommendModel anchorRecommendModel) { + + List models = anchorRecommendModel.getList(); + + recommendViewHolder.updateData(models); + } + + @Override + public void onError(String error) { + } + }); + } + + @Override + public void goToLive(AnchorRecommendItemModel model) { + if (listener != null) { + listener.goToLive(model); + } + } + }); + } } @@ -117,4 +148,15 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter { infoModels.addAll(mInfoModels); notifyDataSetChanged(); } + + private CustomDrawerListener listener; + + public CustomDrawerPopupAdapter setListener(CustomDrawerListener listener) { + this.listener = listener; + return this; + } + + public interface CustomDrawerListener { + void goToLive(AnchorRecommendItemModel model); + } } diff --git a/common/src/main/java/com/yunbao/common/adapter/RecommendAdapter.java b/common/src/main/java/com/yunbao/common/adapter/RecommendAdapter.java index 935608060..c840d10ec 100644 --- a/common/src/main/java/com/yunbao/common/adapter/RecommendAdapter.java +++ b/common/src/main/java/com/yunbao/common/adapter/RecommendAdapter.java @@ -33,6 +33,14 @@ public class RecommendAdapter extends RecyclerView.Adapter { RecommendChildViewHolder itemViewHolder = (RecommendChildViewHolder) holder; itemViewHolder.setData(list.get(position)); + itemViewHolder.setListener(new RecommendChildViewHolder.RecommendChildListener() { + @Override + public void goToLive(AnchorRecommendItemModel model) { + if (callback != null) { + callback.goToLive(model); + } + } + }); } @Override @@ -45,4 +53,15 @@ public class RecommendAdapter extends RecyclerView.Adapter { list.addAll(mList); notifyDataSetChanged(); } + + private RecommendCallback callback; + + public RecommendAdapter setCallback(RecommendCallback callback) { + this.callback = callback; + return this; + } + + public interface RecommendCallback { + void goToLive(AnchorRecommendItemModel model); + } } diff --git a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java index 237c664c5..1b8132a5d 100644 --- a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java +++ b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java @@ -48,12 +48,21 @@ public class CustomDrawerPopupView extends DrawerPopupView { } + private void initView() { drawerList = findViewById(R.id.drawerList); adapter = new CustomDrawerPopupAdapter(mContext); adapter.setList(list); drawerList.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false)); drawerList.setAdapter(adapter); + adapter.setListener(new CustomDrawerPopupAdapter.CustomDrawerListener() { + @Override + public void goToLive(AnchorRecommendItemModel model) { + if (callBack != null) { + callBack.goToLive(model); + } + } + }); } private void initData() { @@ -70,4 +79,15 @@ public class CustomDrawerPopupView extends DrawerPopupView { } }); } + + private CustomDrawerPopupCallBack callBack; + + public CustomDrawerPopupView setCallBack(CustomDrawerPopupCallBack callBack) { + this.callBack = callBack; + return this; + } + + public interface CustomDrawerPopupCallBack { + void goToLive(AnchorRecommendItemModel model); + } } \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/views/RecommendChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/RecommendChildViewHolder.java index 6f7957c7e..0e832ba91 100644 --- a/common/src/main/java/com/yunbao/common/views/RecommendChildViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/RecommendChildViewHolder.java @@ -12,6 +12,7 @@ import com.squareup.picasso.Picasso; import com.yunbao.common.R; import com.yunbao.common.bean.AnchorRecommendItemModel; import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.views.weight.ViewClicksAntiShake; public class RecommendChildViewHolder extends RecyclerView.ViewHolder { private ImageView cover; @@ -38,5 +39,24 @@ public class RecommendChildViewHolder extends RecyclerView.ViewHolder { } ImgLoader.display(itemView.getContext(), bean.getThumb(), cover); name.setText(bean.getUserNicename()); + ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + if (listener != null) { + listener.goToLive(bean); + } + } + }); + } + + private RecommendChildListener listener; + + public RecommendChildViewHolder setListener(RecommendChildListener listener) { + this.listener = listener; + return this; + } + + public interface RecommendChildListener { + void goToLive(AnchorRecommendItemModel model); } } diff --git a/common/src/main/java/com/yunbao/common/views/RecommendViewHolder.java b/common/src/main/java/com/yunbao/common/views/RecommendViewHolder.java index a68bb0a30..0f4b6f555 100644 --- a/common/src/main/java/com/yunbao/common/views/RecommendViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/RecommendViewHolder.java @@ -11,6 +11,7 @@ import com.yunbao.common.R; import com.yunbao.common.adapter.RecommendAdapter; import com.yunbao.common.bean.AnchorRecommendItemModel; import com.yunbao.common.bean.CustomSidebarInfoModel; +import com.yunbao.common.views.weight.ViewClicksAntiShake; import java.util.List; @@ -28,6 +29,24 @@ public class RecommendViewHolder extends RecyclerView.ViewHolder { recommendAdapter = new RecommendAdapter(itemView.getContext()); childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 3)); childList.setAdapter(recommendAdapter); + ViewClicksAntiShake.clicksAntiShake(subtitle, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + if (listener != null) { + listener.changeOneBatch(); + } + } + }); + recommendAdapter.setCallback(new RecommendAdapter.RecommendCallback() { + @Override + public void goToLive(AnchorRecommendItemModel model) { + if (listener != null) { + listener.goToLive(model); + } + } + }); + + } public void setData(CustomSidebarInfoModel model) { @@ -38,4 +57,17 @@ public class RecommendViewHolder extends RecyclerView.ViewHolder { public void updateData(List list) { recommendAdapter.updateData(list); } + + private RecommendViewListener listener; + + public RecommendViewHolder setListener(RecommendViewListener listener) { + this.listener = listener; + return this; + } + + public interface RecommendViewListener { + void changeOneBatch(); + + void goToLive(AnchorRecommendItemModel model); + } } diff --git a/common/src/main/res/layout/item_sidebar_lives_new.xml b/common/src/main/res/layout/item_sidebar_lives_new.xml index b9a0e1eaa..fcd0955ce 100644 --- a/common/src/main/res/layout/item_sidebar_lives_new.xml +++ b/common/src/main/res/layout/item_sidebar_lives_new.xml @@ -29,7 +29,7 @@ @@ -38,9 +38,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_margin="6dp" + android:layout_margin="4dp" android:textColor="#FFF6F7FB" - android:textSize="12sp" /> + android:textSize="11sp" /> \ No newline at end of file diff --git a/common/src/main/res/layout/view_drawer_recommend_child.xml b/common/src/main/res/layout/view_drawer_recommend_child.xml index 1e1edf44f..30b983b18 100644 --- a/common/src/main/res/layout/view_drawer_recommend_child.xml +++ b/common/src/main/res/layout/view_drawer_recommend_child.xml @@ -11,8 +11,7 @@ android:layout_height="40dp" android:layout_centerVertical="true" android:layout_marginStart="6dp" - android:scaleType="fitCenter" - android:src="@mipmap/icon_start_number" /> + android:scaleType="fitCenter" /> () { + .anchorRecommend("9", new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(AnchorRecommendModel anchorRecommendModel) { list.clear(); diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml index 553800a23..f8ca03e26 100644 --- a/live/src/main/res/layout/view_live_audience.xml +++ b/live/src/main/res/layout/view_live_audience.xml @@ -341,13 +341,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" /> - - + - + + diff --git a/live/src/main/res/mipmap-xxxhdpi/live_icon_more.png b/live/src/main/res/mipmap-xxxhdpi/live_icon_more.png index 1d0939e93..3b02032fb 100644 Binary files a/live/src/main/res/mipmap-xxxhdpi/live_icon_more.png and b/live/src/main/res/mipmap-xxxhdpi/live_icon_more.png differ