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 3f0c434c1..918d6de18 100644 --- a/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java +++ b/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java @@ -19,6 +19,7 @@ import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.DrawerRecommendViewHolder; import com.yunbao.common.views.DrawerTaskViewHolder; import com.yunbao.common.views.FunGamesViewHolder; +import com.yunbao.common.views.InteractionGamesViewHolder; import com.yunbao.common.views.RecommendViewHolder; import com.yunbao.common.views.RigtsInterestsViewHolder; @@ -72,9 +73,12 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter { case RIGHTS_INTERESTS: View rightsInterestsView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_rights_interests, parent, false); return new RigtsInterestsViewHolder(rightsInterestsView); - default: + case RECOMMEND: View recommendView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_recommend, parent, false); return new RecommendViewHolder(recommendView); + default: + View gamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_interaction_games_view, parent, false); + return new InteractionGamesViewHolder(gamesView); } } @@ -92,6 +96,9 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter { } else if (holder instanceof RigtsInterestsViewHolder) { RigtsInterestsViewHolder rigtsInterestsViewHolder = (RigtsInterestsViewHolder) holder; rigtsInterestsViewHolder.setData(infoModels.get(position)); + } else if (holder instanceof InteractionGamesViewHolder) { + InteractionGamesViewHolder interactionGamesViewHolder = (InteractionGamesViewHolder) holder; + interactionGamesViewHolder.setData(infoModels.get(position)); } else if (holder instanceof RecommendViewHolder) { RecommendViewHolder recommendViewHolder = (RecommendViewHolder) holder; diff --git a/common/src/main/java/com/yunbao/common/adapter/InteractionGamesAdapter.java b/common/src/main/java/com/yunbao/common/adapter/InteractionGamesAdapter.java new file mode 100644 index 000000000..3aa7909bc --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/InteractionGamesAdapter.java @@ -0,0 +1,64 @@ +package com.yunbao.common.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.views.FunGamesChildViewHolder; +import com.yunbao.common.views.InteractionGamesChildViewHolder; + +import java.util.ArrayList; +import java.util.List; + +public class InteractionGamesAdapter extends RecyclerView.Adapter { + private Context mContext; + private boolean rigts; + private List child = new ArrayList<>(); + + public InteractionGamesAdapter(Context mContext, boolean rigts) { + this.mContext = mContext; + this.rigts = rigts; + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_fun_games_child_view, parent, false); + return new InteractionGamesChildViewHolder(runGamesView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + InteractionGamesChildViewHolder childViewHolder = (InteractionGamesChildViewHolder) holder; + childViewHolder.setData(child.get(position), rigts); + } + + @Override + public int getItemCount() { + return child.size(); + } + + public void updateData(List mChild) { + child.clear(); + if (mChild.size() > 8) { + for (int i = 0; i < 8; i++) { + child.add(mChild.get(i)); + } + } else { + child.addAll(mChild); + } + notifyDataSetChanged(); + } + + public void selectAll(List mChild){ + child.clear(); + child.addAll(mChild); + notifyDataSetChanged(); + } +} diff --git a/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleFunGamesAdapter.java b/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleFunGamesAdapter.java new file mode 100644 index 000000000..17cb37cf3 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleFunGamesAdapter.java @@ -0,0 +1,64 @@ +package com.yunbao.common.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.views.FunGamesChildViewHolder; +import com.yunbao.common.views.NewRoleFunGamesChildViewHolder; + +import java.util.ArrayList; +import java.util.List; + +public class LiveNewRoleFunGamesAdapter extends RecyclerView.Adapter { + private Context mContext; + private boolean rigts; + private List child = new ArrayList<>(); + + public LiveNewRoleFunGamesAdapter(Context mContext, boolean rigts) { + this.mContext = mContext; + this.rigts = rigts; + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view, parent, false); + return new NewRoleFunGamesChildViewHolder(runGamesView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + NewRoleFunGamesChildViewHolder childViewHolder = (NewRoleFunGamesChildViewHolder) holder; + childViewHolder.setData(child.get(position), rigts); + } + + @Override + public int getItemCount() { + return child.size(); + } + + public void updateData(List mChild) { + child.clear(); + if (mChild.size() > 8) { + for (int i = 0; i < 8; i++) { + child.add(mChild.get(i)); + } + } else { + child.addAll(mChild); + } + notifyDataSetChanged(); + } + + public void selectAll(List mChild) { + child.clear(); + child.addAll(mChild); + notifyDataSetChanged(); + } +} diff --git a/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java b/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java new file mode 100644 index 000000000..7ae09c10c --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java @@ -0,0 +1,63 @@ +package com.yunbao.common.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.views.InteractionGamesChildViewHolder; + +import java.util.ArrayList; +import java.util.List; + +public class LiveNewRoleInteractionGamesAdapter extends RecyclerView.Adapter { + private Context mContext; + private boolean rigts; + private List child = new ArrayList<>(); + + public LiveNewRoleInteractionGamesAdapter(Context mContext, boolean rigts) { + this.mContext = mContext; + this.rigts = rigts; + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view, parent, false); + return new InteractionGamesChildViewHolder(runGamesView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + InteractionGamesChildViewHolder childViewHolder = (InteractionGamesChildViewHolder) holder; + childViewHolder.setData(child.get(position), rigts); + } + + @Override + public int getItemCount() { + return child.size(); + } + + public void updateData(List mChild) { + child.clear(); + if (mChild.size() > 8) { + for (int i = 0; i < 8; i++) { + child.add(mChild.get(i)); + } + } else { + child.addAll(mChild); + } + notifyDataSetChanged(); + } + + public void selectAll(List mChild){ + child.clear(); + child.addAll(mChild); + notifyDataSetChanged(); + } +} diff --git a/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java b/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java new file mode 100644 index 000000000..67e49c60a --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java @@ -0,0 +1,101 @@ +package com.yunbao.common.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.AnchorRecommendItemModel; +import com.yunbao.common.bean.CustomSidebarInfoModel; +import com.yunbao.common.views.LiveNewRoleFunGamesViewHolder; +import com.yunbao.common.views.LiveNewRoleInteractionGamesViewHolder; +import com.yunbao.common.views.LiveNewRoleRigtsInterestsViewHolder; + +import java.util.ArrayList; +import java.util.List; + +/** + * + */ +public class LiveNewRolerPopupAdapter extends RecyclerView.Adapter { + private Context mContext; + // "type": 1,//模块类型 1 充值送好礼类型2 任务中心类型 3趣味游戏类4 权益 ,5为你推荐 + private final int FUN_GAMES = 3; + private final int RIGHTS_INTERESTS = 4; + private List infoModels = new ArrayList<>(); + + public LiveNewRolerPopupAdapter(Context mContext) { + this.mContext = mContext; + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + switch (viewType) { + case FUN_GAMES: + View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_new_roler_fun_games_view, parent, false); + return new LiveNewRoleFunGamesViewHolder(runGamesView); + case RIGHTS_INTERESTS: + View rightsInterestsView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_roler_ights_interests, parent, false); + return new LiveNewRoleRigtsInterestsViewHolder(rightsInterestsView); + default: + View gamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_interaction_games_view, parent, false); + return new LiveNewRoleInteractionGamesViewHolder(gamesView); + } + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + if (holder instanceof LiveNewRoleFunGamesViewHolder) { + LiveNewRoleFunGamesViewHolder funGamesViewHolder = (LiveNewRoleFunGamesViewHolder) holder; + funGamesViewHolder.setData(infoModels.get(position)); + } else if (holder instanceof LiveNewRoleRigtsInterestsViewHolder) { + LiveNewRoleRigtsInterestsViewHolder rigtsInterestsViewHolder = (LiveNewRoleRigtsInterestsViewHolder) holder; + rigtsInterestsViewHolder.setData(infoModels.get(position)); + } else if (holder instanceof LiveNewRoleInteractionGamesViewHolder) { + LiveNewRoleInteractionGamesViewHolder interactionGamesViewHolder = (LiveNewRoleInteractionGamesViewHolder) holder; + interactionGamesViewHolder.setData(infoModels.get(position)); + } + } + + @Override + public int getItemCount() { + return infoModels.size(); + } + + @Override + public int getItemViewType(int position) { + CustomSidebarInfoModel model = infoModels.get(position); + switch (model.getType()) { + + case "3": + return FUN_GAMES; + case "4": + return RIGHTS_INTERESTS; + + } + return super.getItemViewType(position); + + } + + public void updateData(List mInfoModels) { + infoModels.clear(); + infoModels.addAll(mInfoModels); + notifyDataSetChanged(); + } + + private CustomDrawerListener listener; + + public LiveNewRolerPopupAdapter 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/NewRoleFunGamesAdapter.java b/common/src/main/java/com/yunbao/common/adapter/NewRoleFunGamesAdapter.java new file mode 100644 index 000000000..f9a020e6b --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/NewRoleFunGamesAdapter.java @@ -0,0 +1,64 @@ +package com.yunbao.common.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.views.NewRoleFunGamesChildViewHolder; + +import java.util.ArrayList; +import java.util.List; + +public class NewRoleFunGamesAdapter extends RecyclerView.Adapter { + private Context mContext; + + private List child = new ArrayList<>(); + private boolean rigts; + + public NewRoleFunGamesAdapter(Context mContext, boolean rigts) { + this.mContext = mContext; + this.rigts = rigts; + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view2, parent, false); + return new NewRoleFunGamesChildViewHolder(runGamesView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + NewRoleFunGamesChildViewHolder childViewHolder = (NewRoleFunGamesChildViewHolder) holder; + childViewHolder.setData(child.get(position), rigts); + } + + @Override + public int getItemCount() { + return child.size(); + } + + public void updateData(List mChild) { + child.clear(); + if (mChild.size() > 8) { + for (int i = 0; i < 8; i++) { + child.add(mChild.get(i)); + } + } else { + child.addAll(mChild); + } + notifyDataSetChanged(); + } + + public void selectAll(List mChild) { + child.clear(); + child.addAll(mChild); + notifyDataSetChanged(); + } +} diff --git a/common/src/main/java/com/yunbao/common/dialog/LiveNewRolePopup.java b/common/src/main/java/com/yunbao/common/dialog/LiveNewRolePopup.java new file mode 100644 index 000000000..e09f5c337 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/dialog/LiveNewRolePopup.java @@ -0,0 +1,83 @@ +package com.yunbao.common.dialog; + +import android.content.Context; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.lxj.xpopup.core.BottomPopupView; +import com.yunbao.common.R; +import com.yunbao.common.adapter.LiveNewRolerPopupAdapter; +import com.yunbao.common.bean.CustomSidebarInfoModel; +import com.yunbao.common.event.LiveNewRoleEvent; +import com.yunbao.common.http.live.LiveNetManager; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.ToastUtil; + +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +import java.util.List; + +public class LiveNewRolePopup extends BottomPopupView { + public LiveNewRolePopup(@NonNull Context context) { + super(context); + mContext = context; + } + + private RecyclerView drawerList; + private LiveNewRolerPopupAdapter adapter; + private Context mContext; + + // 返回自定义弹窗的布局 + @Override + protected int getImplLayoutId() { + return R.layout.dialog_live_new_role; + } + + // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑 + @Override + protected void onCreate() { + super.onCreate(); + Bus.getOn(this); + initView(); + initDate(); + + } + + private void initDate() { + LiveNetManager.get(mContext) + .getCustomSidebarInfo("1", new com.yunbao.common.http.base.HttpCallback>() { + @Override + public void onSuccess(List data) { + adapter.updateData(data); + } + + @Override + public void onError(String error) { + ToastUtil.show(R.string.net_error); + } + }); + } + + private void initView() { + drawerList = findViewById(R.id.drawerList); + adapter = new LiveNewRolerPopupAdapter(mContext); + drawerList.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false)); + drawerList.setAdapter(adapter); + } + + @Override + protected void onDismiss() { + Bus.getOff(this); + + super.onDismiss(); + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onLiveNewRoleEvent(LiveNewRoleEvent event) { + dismiss(); + } + +} diff --git a/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java b/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java index 436161b05..1a1d138d9 100644 --- a/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java +++ b/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java @@ -28,6 +28,26 @@ public class CustomDrawerPopupEvent extends BaseModel { //畫質選擇 private boolean qualitySelection = false; private boolean fontSize = false; + private boolean interaction = false; + private long interactionID; + + public boolean isInteraction() { + return interaction; + } + + public CustomDrawerPopupEvent setInteraction(boolean interaction) { + this.interaction = interaction; + return this; + } + + public long getInteractionID() { + return interactionID; + } + + public CustomDrawerPopupEvent setInteractionID(long interactionID) { + this.interactionID = interactionID; + return this; + } public boolean isSmallWindow() { return smallWindow; diff --git a/common/src/main/java/com/yunbao/common/event/LiveNewRoleEvent.java b/common/src/main/java/com/yunbao/common/event/LiveNewRoleEvent.java new file mode 100644 index 000000000..a5e7acf36 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/event/LiveNewRoleEvent.java @@ -0,0 +1,4 @@ +package com.yunbao.common.event; + +public class LiveNewRoleEvent { +} diff --git a/common/src/main/java/com/yunbao/common/event/NewRoleCustomDrawerPopupEvent.java b/common/src/main/java/com/yunbao/common/event/NewRoleCustomDrawerPopupEvent.java new file mode 100644 index 000000000..7d78790dc --- /dev/null +++ b/common/src/main/java/com/yunbao/common/event/NewRoleCustomDrawerPopupEvent.java @@ -0,0 +1,168 @@ +package com.yunbao.common.event; + +import com.yunbao.common.bean.BaseModel; + +public class NewRoleCustomDrawerPopupEvent extends BaseModel { + //是否关闭弹窗 + private boolean isDisMiss = false; + //权益的名字 + private String rightsInterests = ""; + //活动的id + private int activityId = 0; + //跳转网页地址 + private String htmlUrl; + //是否半屏展示 + private boolean screen = false; + //系统消息 + private boolean systemNotice = false; + //在线客服 + private boolean online = false; + //举报 + private boolean reportLayout = false; + //刷新 + private boolean refresh = false; + //特效設置 + private boolean effects = false; + //小窗播放 + private boolean smallWindow = false; + //畫質選擇 + private boolean qualitySelection = false; + private boolean fontSize = false; + private boolean interaction = false; + private long interactionID; + + public boolean isInteraction() { + return interaction; + } + + public NewRoleCustomDrawerPopupEvent setInteraction(boolean interaction) { + this.interaction = interaction; + return this; + } + + public long getInteractionID() { + return interactionID; + } + + public NewRoleCustomDrawerPopupEvent setInteractionID(long interactionID) { + this.interactionID = interactionID; + return this; + } + + public boolean isSmallWindow() { + return smallWindow; + } + + public NewRoleCustomDrawerPopupEvent setSmallWindow(boolean smallWindow) { + this.smallWindow = smallWindow; + return this; + } + + public boolean isQualitySelection() { + return qualitySelection; + } + + public NewRoleCustomDrawerPopupEvent setQualitySelection(boolean qualitySelection) { + this.qualitySelection = qualitySelection; + return this; + } + + public boolean isRefresh() { + return refresh; + } + + public NewRoleCustomDrawerPopupEvent setRefresh(boolean refresh) { + this.refresh = refresh; + return this; + } + + public boolean isSystemNotice() { + return systemNotice; + } + + public NewRoleCustomDrawerPopupEvent setSystemNotice(boolean systemNotice) { + this.systemNotice = systemNotice; + return this; + } + + public boolean isOnline() { + return online; + } + + public NewRoleCustomDrawerPopupEvent setOnline(boolean online) { + this.online = online; + return this; + } + + public boolean isReportLayout() { + return reportLayout; + } + + public NewRoleCustomDrawerPopupEvent setReportLayout(boolean reportLayout) { + this.reportLayout = reportLayout; + return this; + } + + public String getHtmlUrl() { + return htmlUrl; + } + + public NewRoleCustomDrawerPopupEvent setHtmlUrl(String htmlUrl) { + this.htmlUrl = htmlUrl; + return this; + } + + public boolean isScreen() { + return screen; + } + + public NewRoleCustomDrawerPopupEvent setScreen(boolean screen) { + this.screen = screen; + return this; + } + + public int getActivityId() { + return activityId; + } + + public NewRoleCustomDrawerPopupEvent setActivityId(int activityId) { + this.activityId = activityId; + return this; + } + + public String getRightsInterests() { + return rightsInterests; + } + + public NewRoleCustomDrawerPopupEvent setRightsInterests(String rightsInterests) { + this.rightsInterests = rightsInterests; + return this; + } + + public boolean isDisMiss() { + return isDisMiss; + } + + public NewRoleCustomDrawerPopupEvent setDisMiss(boolean disMiss) { + isDisMiss = disMiss; + return this; + } + + public boolean isEffects() { + return effects; + } + + public NewRoleCustomDrawerPopupEvent setEffects(boolean effects) { + this.effects = effects; + return this; + } + + public boolean isFontSize() { + return fontSize; + } + + public NewRoleCustomDrawerPopupEvent setFontSize(boolean fontSize) { + this.fontSize = fontSize; + return this; + } +} diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index 29e10a140..2e31e7f21 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -297,7 +297,7 @@ public interface PDLiveApi { * 新侧边栏请求 */ @GET("/api/public/?service=Live.getCustomSidebarInfo") - Observable>> getCustomSidebarInfo(); + Observable>> getCustomSidebarInfo(@Query("type") String type); /** * 任务领取接口 diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java index d63b8dcff..7ff497ed9 100644 --- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java +++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java @@ -29,7 +29,6 @@ import com.yunbao.common.bean.LiveAiRobotBean; import com.yunbao.common.bean.LiveAnchorCallMeModel; import com.yunbao.common.bean.LiveAnchorSayModel; import com.yunbao.common.bean.LiveDataInfoModel; -import com.yunbao.common.bean.LiveGiftBean; import com.yunbao.common.bean.LiveInfoModel; import com.yunbao.common.bean.LiveRoomActivityBanner; import com.yunbao.common.bean.LiveRoomVoteModel; @@ -50,6 +49,7 @@ import com.yunbao.common.bean.RedPacketInfoModel; import com.yunbao.common.bean.RedPacketListBean; import com.yunbao.common.bean.SetAttentsModel; import com.yunbao.common.bean.StarChallengeStatusModel; +import com.yunbao.common.bean.SudgameCodeModel; import com.yunbao.common.bean.UserAreaBean; import com.yunbao.common.bean.UserAvatarSelectBean; import com.yunbao.common.bean.VipModel; @@ -314,9 +314,9 @@ public class LiveNetManager { * * @param callback */ - public void getCustomSidebarInfo(HttpCallback> callback) { + public void getCustomSidebarInfo(String type,HttpCallback> callback) { API.get().pdLiveApi(mContext) - .getCustomSidebarInfo() + .getCustomSidebarInfo(type) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(listResponseModel -> callback.onSuccess(listResponseModel.getData().getInfo()), throwable -> { @@ -2194,6 +2194,28 @@ public class LiveNetManager { }).isDisposed(); } + public void getCode(HttpCallback> callback) { + API.get().pdLiveApi(mContext) + .getCode() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>>() { + @Override + public void accept(ResponseModel> listResponseModel) throws Exception { + if (callback != null) { + callback.onSuccess(listResponseModel.getData().getInfo()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(R.string.net_error)); + } + } + }).isDisposed(); + } + /** * 直播间取消网络请求 */ diff --git a/common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java b/common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java index db360ecde..01733549e 100644 --- a/common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java +++ b/common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java @@ -5,23 +5,15 @@ import android.view.View; import androidx.lifecycle.MutableLiveData; +import com.yunbao.common.CommonAppContext; +import com.yunbao.common.bean.SudgameCodeModel; +import com.yunbao.common.http.base.HttpCallback; +import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.sud.model.GameConfigModel; import com.yunbao.common.sud.model.GameViewInfoModel; -import com.yunbao.common.sud.state.MGStateResponse; import com.yunbao.common.sud.state.SudMGPMGState; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.Objects; - -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; +import java.util.List; import tech.sud.mgp.core.ISudFSMMG; import tech.sud.mgp.core.ISudFSMStateHandle; @@ -34,29 +26,57 @@ import tech.sud.mgp.core.ISudFSMStateHandle; */ public class QuickStartGameViewModel extends BaseGameViewModel { - /** Sud平台申请的appId */ + /** + * Sud平台申请的appId + */ public static String SudMGP_APP_ID = "1701178631292395522"; - /** Sud平台申请的appKey */ + /** + * Sud平台申请的appKey + */ public static String SudMGP_APP_KEY = "E3Eokfq58ZklwR8fM7iKWYGzarbIOkyh"; - /** true 加载游戏时为测试环境 false 加载游戏时为生产环境 */ + /** + * true 加载游戏时为测试环境 false 加载游戏时为生产环境 + */ public static final boolean GAME_IS_TEST_ENV = true; - /** 使用的UserId。这里随机生成作演示，开发者将其修改为业务使用的唯一userId */ - public static String userId = QuickStartUtils.genUserID(); + /** + * 使用的UserId。这里随机生成作演示，开发者将其修改为业务使用的唯一userId + */ + public static String userId = QuickStartUtils.genUserID(CommonAppContext.sInstance.getApplicationContext()); - /** 游戏自定义安全操作区域 */ + /** + * 游戏自定义安全操作区域 + */ public GameViewInfoModel.GameViewRectModel gameViewRectModel; - /** 游戏的语言代码 */ + /** + * 游戏的语言代码 + */ public String languageCode = "zh-CN"; public final MutableLiveData gameViewLiveData = new MutableLiveData<>(); // 游戏View回调 - /** 向接入方服务器获取code */ + /** + * 向接入方服务器获取code + */ @Override protected void getCode(Activity activity, String userId, String appId, GameGetCodeListener listener) { // TODO: 2022/6/10 注意，这里是演示使用OkHttpClient请求hello-sud服务 // TODO: 2022/6/10 开发者在与后端联调时需将其改成自己的网络请求方式向自己的服务器获取code + LiveNetManager.get(activity) + .getCode(new HttpCallback>() { + @Override + public void onSuccess(List data) { + + listener.onSuccess(data.get(0).getCode()); + + } + + @Override + public void onError(String error) { + listener.onFailed(); + } + }); // OkHttpClient client = new OkHttpClient(); // String req; // try { @@ -115,25 +135,33 @@ public class QuickStartGameViewModel extends BaseGameViewModel { // }); } - /** 设置当前用户id(接入方定义) */ + /** + * 设置当前用户id(接入方定义) + */ @Override protected String getUserId() { return userId; } - /** 设置Sud平台申请的appId */ + /** + * 设置Sud平台申请的appId + */ @Override protected String getAppId() { return SudMGP_APP_ID; } - /** 设置Sud平台申请的appKey */ + /** + * 设置Sud平台申请的appKey + */ @Override protected String getAppKey() { return SudMGP_APP_KEY; } - /** 设置游戏的语言代码 */ + /** + * 设置游戏的语言代码 + */ @Override protected String getLanguageCode() { return languageCode; @@ -175,13 +203,17 @@ public class QuickStartGameViewModel extends BaseGameViewModel { return GAME_IS_TEST_ENV; } - /** 将游戏View添加到页面中 */ + /** + * 将游戏View添加到页面中 + */ @Override protected void onAddGameView(View gameView) { gameViewLiveData.setValue(gameView); } - /** 将页面中的游戏View移除 */ + /** + * 将页面中的游戏View移除 + */ @Override protected void onRemoveGameView() { gameViewLiveData.setValue(null); diff --git a/common/src/main/java/com/yunbao/common/sud/QuickStartUtils.java b/common/src/main/java/com/yunbao/common/sud/QuickStartUtils.java index 1df24fba6..c378a182a 100644 --- a/common/src/main/java/com/yunbao/common/sud/QuickStartUtils.java +++ b/common/src/main/java/com/yunbao/common/sud/QuickStartUtils.java @@ -1,15 +1,20 @@ package com.yunbao.common.sud; +import android.content.Context; + +import com.yunbao.common.manager.IMLoginManager; + import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.UUID; public class QuickStartUtils { - /** 随机生成一个userId，用于演示 */ - public static String genUserID() { - return md5Hex8(UUID.randomUUID().toString()); + /** + * 随机生成一个userId，用于演示 + */ + public static String genUserID(Context mContext) { + return md5Hex8(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId())); } public static String md5Hex8(String plainText) { 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 232ea3a6c..2a8beec76 100644 --- a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java +++ b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java @@ -170,7 +170,7 @@ public class CustomDrawerPopupView extends DrawerPopupView { adapter.updateData(data); } else { LiveNetManager.get(mContext) - .getCustomSidebarInfo(new com.yunbao.common.http.base.HttpCallback>() { + .getCustomSidebarInfo("0",new com.yunbao.common.http.base.HttpCallback>() { @Override public void onSuccess(List data) { adapter.updateData(data); @@ -221,6 +221,8 @@ public class CustomDrawerPopupView extends DrawerPopupView { void share(); void changeFontSize(); + + void interaction(long interactionID); } @Subscribe(threadMode = ThreadMode.MAIN) @@ -263,10 +265,13 @@ public class CustomDrawerPopupView extends DrawerPopupView { dismiss(); callBack.changeVideo(); } - if(event.isFontSize()){ + if (event.isFontSize()) { dismiss(); callBack.changeFontSize(); } + if (event.isInteraction()){ + callBack.interaction(event.getInteractionID()); + } } if (event.isRefresh()) { diff --git a/common/src/main/java/com/yunbao/common/views/InteractionGamesChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/InteractionGamesChildViewHolder.java new file mode 100644 index 000000000..d876e03cc --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/InteractionGamesChildViewHolder.java @@ -0,0 +1,56 @@ +package com.yunbao.common.views; + +import android.text.TextUtils; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.event.CustomDrawerPopupEvent; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +public class InteractionGamesChildViewHolder extends RecyclerView.ViewHolder { + private ImageView funGamePic; + private TextView funGameName; + + public InteractionGamesChildViewHolder(@NonNull View itemView) { + super(itemView); + funGamePic = itemView.findViewById(R.id.fun_game_pic); + funGameName = itemView.findViewById(R.id.fun_game_name); + } + + public void setData(CustomSidebarChildModel model, boolean rigts) { + if (rigts) { + ImgLoader.display(itemView.getContext(), model.getIcon(), funGamePic); + } else { + ImgLoader.display(itemView.getContext(), model.getResIcon(), funGamePic); + } + + + funGameName.setText(model.getTitle()); + + ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + + if (!rigts) { + Bus.get().post(new CustomDrawerPopupEvent() + .setDisMiss(true).setRightsInterests(model.getTitle())); + } else { + long activityID = TextUtils.isEmpty(model.getSrc()) ? 0 : Long.parseLong(model.getSrc()); + if (activityID != 0) { + Bus.get().post(new CustomDrawerPopupEvent() + .setDisMiss(true).setInteractionID(activityID).setInteraction(true)); + } + + } + } + }); + } +} diff --git a/common/src/main/java/com/yunbao/common/views/InteractionGamesViewHolder.java b/common/src/main/java/com/yunbao/common/views/InteractionGamesViewHolder.java new file mode 100644 index 000000000..b8f4ca34e --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/InteractionGamesViewHolder.java @@ -0,0 +1,63 @@ +package com.yunbao.common.views; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.adapter.FunGamesAdapter; +import com.yunbao.common.adapter.InteractionGamesAdapter; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.bean.CustomSidebarInfoModel; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +import java.util.List; + +public class InteractionGamesViewHolder extends RecyclerView.ViewHolder { + private InteractionGamesAdapter funGamesAdapter; + private TextView sendGoodGift, selectMore; + private RecyclerView childList; + private ImageView selectMoreIcon; + boolean isShowMore = true; + + public InteractionGamesViewHolder(@NonNull View itemView) { + super(itemView); + sendGoodGift = itemView.findViewById(R.id.send_good_gift); + childList = itemView.findViewById(R.id.child_list); + selectMoreIcon = itemView.findViewById(R.id.select_more_icon); + selectMore = itemView.findViewById(R.id.select_more); + funGamesAdapter = new InteractionGamesAdapter(itemView.getContext(), true); + childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 4)); + childList.setAdapter(funGamesAdapter); + + } + + public void setData(CustomSidebarInfoModel model) { + List sidebarChildModels = model.getChild(); + itemView.findViewById(R.id.select_more_layout).setVisibility(sidebarChildModels.size() >= 8 ? View.VISIBLE : View.GONE); + sendGoodGift.setText(model.getTitle()); + funGamesAdapter.updateData(sidebarChildModels); + + ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.select_more_layout), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + if (isShowMore) { + funGamesAdapter.selectAll(sidebarChildModels); + + selectMore.setText(R.string.video_comment_collapsed); + ImgLoader.display(itemView.getContext(), R.mipmap.icon_more_up, selectMoreIcon); + } else { + funGamesAdapter.updateData(sidebarChildModels); + selectMore.setText(R.string.moer); + ImgLoader.display(itemView.getContext(), R.mipmap.icon_more_down, selectMoreIcon); + } + isShowMore = !isShowMore; + } + }); + } +} diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewRoleFunGamesViewHolder.java b/common/src/main/java/com/yunbao/common/views/LiveNewRoleFunGamesViewHolder.java new file mode 100644 index 000000000..731ff761e --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/LiveNewRoleFunGamesViewHolder.java @@ -0,0 +1,65 @@ +package com.yunbao.common.views; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.adapter.FunGamesAdapter; +import com.yunbao.common.adapter.NewRoleFunGamesAdapter; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.bean.CustomSidebarInfoModel; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +import java.util.List; + +public class LiveNewRoleFunGamesViewHolder extends RecyclerView.ViewHolder { + private NewRoleFunGamesAdapter funGamesAdapter; + private TextView sendGoodGift, selectMore; + private RecyclerView childList; + private ImageView selectMoreIcon; + boolean isShowMore = true; + + public LiveNewRoleFunGamesViewHolder(@NonNull View itemView) { + super(itemView); + sendGoodGift = itemView.findViewById(R.id.send_good_gift); + childList = itemView.findViewById(R.id.child_list); + selectMoreIcon = itemView.findViewById(R.id.select_more_icon); + selectMore = itemView.findViewById(R.id.select_more); + funGamesAdapter = new NewRoleFunGamesAdapter(itemView.getContext(),true); + childList.setLayoutManager(new LinearLayoutManager(itemView.getContext(), LinearLayoutManager.HORIZONTAL, false)); + childList.setAdapter(funGamesAdapter); + + } + + public void setData(CustomSidebarInfoModel model) { + + List sidebarChildModels = model.getChild(); + itemView.findViewById(R.id.select_more_layout).setVisibility(sidebarChildModels.size() >= 8 ? View.VISIBLE : View.GONE); + sendGoodGift.setText(model.getTitle()); + funGamesAdapter.updateData(sidebarChildModels); + + ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.select_more_layout), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + if (isShowMore) { + funGamesAdapter.selectAll(sidebarChildModels); + + selectMore.setText(R.string.video_comment_collapsed); + ImgLoader.display(itemView.getContext(), R.mipmap.icon_more_up, selectMoreIcon); + } else { + funGamesAdapter.updateData(sidebarChildModels); + selectMore.setText(R.string.moer); + ImgLoader.display(itemView.getContext(), R.mipmap.icon_more_down, selectMoreIcon); + } + isShowMore = !isShowMore; + } + }); + } +} diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewRoleInteractionGamesViewHolder.java b/common/src/main/java/com/yunbao/common/views/LiveNewRoleInteractionGamesViewHolder.java new file mode 100644 index 000000000..98380e2f6 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/LiveNewRoleInteractionGamesViewHolder.java @@ -0,0 +1,44 @@ +package com.yunbao.common.views; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.adapter.InteractionGamesAdapter; +import com.yunbao.common.adapter.LiveNewRoleInteractionGamesAdapter; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.bean.CustomSidebarInfoModel; + +import java.util.List; + +public class LiveNewRoleInteractionGamesViewHolder extends RecyclerView.ViewHolder { + private LiveNewRoleInteractionGamesAdapter funGamesAdapter; + private TextView sendGoodGift; + private RecyclerView childList; + private ImageView selectMoreIcon; + boolean isShowMore = true; + + public LiveNewRoleInteractionGamesViewHolder(@NonNull View itemView) { + super(itemView); + sendGoodGift = itemView.findViewById(R.id.send_good_gift); + childList = itemView.findViewById(R.id.child_list); + selectMoreIcon = itemView.findViewById(R.id.select_more_icon); + funGamesAdapter = new LiveNewRoleInteractionGamesAdapter(itemView.getContext(), true); + childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 4)); + childList.setAdapter(funGamesAdapter); + + } + + public void setData(CustomSidebarInfoModel model) { + List sidebarChildModels = model.getChild(); + sendGoodGift.setText(model.getTitle()); + funGamesAdapter.updateData(sidebarChildModels); + + + } +} diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewRoleRigtsInterestsViewHolder.java b/common/src/main/java/com/yunbao/common/views/LiveNewRoleRigtsInterestsViewHolder.java new file mode 100644 index 000000000..d5e7e22ab --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/LiveNewRoleRigtsInterestsViewHolder.java @@ -0,0 +1,56 @@ +package com.yunbao.common.views; + +import android.view.View; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.adapter.FunGamesAdapter; +import com.yunbao.common.adapter.LiveNewRoleFunGamesAdapter; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.bean.CustomSidebarInfoModel; + +import java.util.ArrayList; +import java.util.List; + +public class LiveNewRoleRigtsInterestsViewHolder extends RecyclerView.ViewHolder { + private LiveNewRoleFunGamesAdapter funGamesAdapter; + private TextView sendGoodGift; + private RecyclerView childList; + + public LiveNewRoleRigtsInterestsViewHolder(@NonNull View itemView) { + super(itemView); + sendGoodGift = itemView.findViewById(R.id.send_good_gift); + childList = itemView.findViewById(R.id.child_list); + sendGoodGift = itemView.findViewById(R.id.send_good_gift); + childList = itemView.findViewById(R.id.child_list); + funGamesAdapter = new LiveNewRoleFunGamesAdapter(itemView.getContext(), false); + childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 4)); + childList.setAdapter(funGamesAdapter); + } + + public void setData(CustomSidebarInfoModel model) { + + sendGoodGift.setText(model.getTitle()); + funGamesAdapter.updateData(generateData()); + } + + private List generateData() { + List child = new ArrayList<>(); + child.add(new CustomSidebarChildModel() + .setTitle(itemView.getContext().getString(R.string.noble)) + .setResIcon(R.mipmap.live_more_icon_aristocrat)); + child.add(new CustomSidebarChildModel() + .setTitle(itemView.getContext().getString(R.string.guard_guard)) + .setResIcon(R.mipmap.live_more_icon_guard)); + child.add(new CustomSidebarChildModel() + .setTitle(itemView.getContext().getString(R.string.fan_club)) + .setResIcon(R.mipmap.live_more_icon_fans)); + return child; + + } +} + diff --git a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java new file mode 100644 index 000000000..471ad4106 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java @@ -0,0 +1,85 @@ +package com.yunbao.common.views; + +import android.app.Activity; +import android.content.Context; +import android.view.View; +import android.widget.FrameLayout; + +import androidx.annotation.NonNull; +import androidx.lifecycle.Observer; + +import com.lxj.xpopup.core.BottomPopupView; +import com.yunbao.common.R; +import com.yunbao.common.event.LiveNewWishListEvent; +import com.yunbao.common.sud.QuickStartGameViewModel; +import com.yunbao.common.utils.Bus; + +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +/** + * sub半屏游戏弹窗 + */ +public class LiveSudGamePopup extends BottomPopupView { + private FrameLayout gameContainer; + private long mInteractionID; + private String mLiveUid; + private final QuickStartGameViewModel gameViewModel = new QuickStartGameViewModel(); // 创建ViewModel + + public LiveSudGamePopup(@NonNull Context context, long interactionID,String liveUid) { + super(context); + mInteractionID = interactionID; + mLiveUid = liveUid; + } + + // 返回自定义弹窗的布局 + @Override + protected int getImplLayoutId() { + return R.layout.dialog_live_sud_game; + } + + // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑 + @Override + protected void onCreate() { + super.onCreate(); + Bus.getOn(this); + initView(); + initDate(); + + } + + private void initView() { + gameContainer = findViewById(R.id.game_container); + gameViewModel.gameViewLiveData.observe(this, new Observer() { + @Override + public void onChanged(View view) { + if (view == null) { // 在关闭游戏时，把游戏View给移除 + gameContainer.removeAllViews(); + } else { // 把游戏View添加到容器内 + gameContainer.addView(view, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT); + } + } + }); + // 加载游戏，参数定义可查看BaseGameViewModel.switchGame()方法注释 + + + // SudMGP平台64bit游戏ID + gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID); + } + + private void initDate() { + + } + + @Override + protected void onDismiss() { + Bus.getOff(this); + + super.onDismiss(); + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onLiveNewWishListEvent(LiveNewWishListEvent event) { + + } +} diff --git a/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java new file mode 100644 index 000000000..9a2a2d7a9 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java @@ -0,0 +1,87 @@ +package com.yunbao.common.views; + +import android.text.TextUtils; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.CommonAppConfig; +import com.yunbao.common.R; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.bean.IMLoginModel; +import com.yunbao.common.event.CustomDrawerPopupEvent; +import com.yunbao.common.event.LiveNewRoleEvent; +import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder { + private ImageView funGamePic; + private TextView funGameName; + + public NewRoleFunGamesChildViewHolder(@NonNull View itemView) { + super(itemView); + funGamePic = itemView.findViewById(R.id.fun_game_pic); + funGameName = itemView.findViewById(R.id.fun_game_name); + } + + public void setData(CustomSidebarChildModel model, boolean rigts) { + if (rigts) { + ImgLoader.display(itemView.getContext(), model.getIcon(), funGamePic); + } else { + ImgLoader.display(itemView.getContext(), model.getResIcon(), funGamePic); + } + + + funGameName.setText(model.getTitle()); + + ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + if (!rigts) { + Bus.get().post(new NewRoleCustomDrawerPopupEvent() + .setDisMiss(true).setRightsInterests(model.getTitle())); + } else { + int activityID = TextUtils.isEmpty(model.getActivityId()) ? 0 : Integer.parseInt(model.getActivityId()); + if (activityID != 0) { + Bus.get().post(new NewRoleCustomDrawerPopupEvent() + .setDisMiss(true).setActivityId(activityID)); + } else { + IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo(); + StringBuffer htmlUrl = new StringBuffer(); + if (model.getSrc().contains("?")) { + htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc()) + .append("&uid=") + .append(userInfo.getId()) + .append("&token=") + .append(userInfo.getToken()); + } else { + htmlUrl.append(CommonAppConfig.HOST) + .append("/") + .append(model.getSrc()) + .append("?uid=") + .append(userInfo.getId()) + .append("&token=") + .append(userInfo.getToken()); + } + Bus.get().post(new NewRoleCustomDrawerPopupEvent() + .setHtmlUrl(htmlUrl.toString()) + .setDisMiss(true) + .setScreen(TextUtils.equals(model.getShowType(), "2"))); + + + + } + } + + + Bus.get().post(new LiveNewRoleEvent()); + } + }); + } +} diff --git a/common/src/main/res/layout/dialog_live_new_function.xml b/common/src/main/res/layout/dialog_live_new_function.xml index 8a1234d84..22711cedf 100644 --- a/common/src/main/res/layout/dialog_live_new_function.xml +++ b/common/src/main/res/layout/dialog_live_new_function.xml @@ -245,6 +245,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/dialog_live_sud_game.xml b/common/src/main/res/layout/dialog_live_sud_game.xml new file mode 100644 index 000000000..d2753e471 --- /dev/null +++ b/common/src/main/res/layout/dialog_live_sud_game.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/view_interaction_games_view.xml b/common/src/main/res/layout/view_interaction_games_view.xml new file mode 100644 index 000000000..c291f4db3 --- /dev/null +++ b/common/src/main/res/layout/view_interaction_games_view.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/view_live_new_role_fun_games_child_view.xml b/common/src/main/res/layout/view_live_new_role_fun_games_child_view.xml new file mode 100644 index 000000000..7525c91c4 --- /dev/null +++ b/common/src/main/res/layout/view_live_new_role_fun_games_child_view.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/view_live_new_role_fun_games_child_view2.xml b/common/src/main/res/layout/view_live_new_role_fun_games_child_view2.xml new file mode 100644 index 000000000..9698ed388 --- /dev/null +++ b/common/src/main/res/layout/view_live_new_role_fun_games_child_view2.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/view_live_new_role_interaction_games_view.xml b/common/src/main/res/layout/view_live_new_role_interaction_games_view.xml new file mode 100644 index 000000000..5ab821e4a --- /dev/null +++ b/common/src/main/res/layout/view_live_new_role_interaction_games_view.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/view_live_new_roler_ights_interests.xml b/common/src/main/res/layout/view_live_new_roler_ights_interests.xml new file mode 100644 index 000000000..0cf062d9b --- /dev/null +++ b/common/src/main/res/layout/view_live_new_roler_ights_interests.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/view_new_roler_fun_games_view.xml b/common/src/main/res/layout/view_new_roler_fun_games_view.xml new file mode 100644 index 000000000..457a59633 --- /dev/null +++ b/common/src/main/res/layout/view_new_roler_fun_games_view.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config.gradle b/config.gradle index 7a8acf55c..70d7f4fb4 100644 --- a/config.gradle +++ b/config.gradle @@ -5,13 +5,13 @@ ext { minSdkVersion : 21, targetSdkVersion : 33, versionCode : 450, - versionName : "6.5.5" + versionName : "6.5.6" ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : " https://ceshi.yaoulive.com", + serverHost : " https://ceshi.yaoulive.com", diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 0f59a4142..99c87f40c 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -65,6 +65,7 @@ import com.yunbao.common.event.GiftWallIlluminateEvent; import com.yunbao.common.event.JavascriptInterfaceEvent; import com.yunbao.common.event.LiveErrorEvent; import com.yunbao.common.event.LiveRoomChangeEvent; +import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.CommonHttpConsts; import com.yunbao.common.http.CommonHttpUtil; @@ -89,6 +90,7 @@ import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.CustomDrawerPopupView; +import com.yunbao.common.views.LiveSudGamePopup; import com.yunbao.common.views.floatingview.APPEasyFloat; import com.yunbao.common.views.weight.VerticalViewPager; import com.yunbao.live.R; @@ -121,10 +123,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import io.rong.imlib.IRongCoreCallback; -import io.rong.imlib.IRongCoreEnum; -import io.rong.imlib.chatroom.base.RongChatRoomClient; - /** * Created by cxf on 2018/10/10. * 看直播 @@ -983,6 +981,18 @@ public class LiveAudienceActivity extends LiveActivity { .setBean(mLiveBean) .setType(LiveAudienceEvent.LiveAudienceType.FONT_SIZE)); } + + @Override + public void interaction(long interactionID) { + new XPopup.Builder(mContext) + .enableDrag(false) + .hasBlurBg(true) + .dismissOnTouchOutside(false) + .dismissOnBackPressed(false) + .asCustom(new LiveSudGamePopup(mContext, interactionID, mLiveUid)) + + .show(); + } }); new XPopup.Builder(mContext) .hasShadowBg(false) @@ -1078,6 +1088,7 @@ public class LiveAudienceActivity extends LiveActivity { fragment.setActivityId(6); fragment.setRoomId(mLiveUid); fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGameDialogFragment"); + break; case FAN_CLUB: @@ -1622,6 +1633,51 @@ public class LiveAudienceActivity extends LiveActivity { }); } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onNewRoleCustomDrawerPopupEvent(NewRoleCustomDrawerPopupEvent event) { + //是否关闭弹窗 + + if (!TextUtils.isEmpty(event.getHtmlUrl())) { + if (TextUtils.equals(event.getHtmlUrl(), "recharge")) { + RouteUtil.forwardMyCoin(mContext); + } else if (TextUtils.equals(event.getHtmlUrl(), "to_me_information")) { + RouteUtil.forwardEditProfileActivity(); + } else { + if (!event.isScreen()) { + ZhuangBanActivity.forward(mContext, event.getHtmlUrl(), false, 1); + } else { + Bundle bundle = new Bundle(); + bundle.putString("url", event.getHtmlUrl()); + LiveHDDialogFragment fragment = new LiveHDDialogFragment(); + fragment.setArguments(bundle); + fragment.show(getSupportFragmentManager(), "LiveHDDialogFragment"); + } + } + } + if (event.getActivityId() != 0) { + LiveGameDialogFragment fragment = new LiveGameDialogFragment(); + fragment.setActivityId(event.getActivityId()); + fragment.setRoomId(mLiveUid); + fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGameDialogFragment"); + } + if (!TextUtils.isEmpty(event.getRightsInterests())) { + //跳转贵族 + if (TextUtils.equals(event.getRightsInterests(), getString(com.yunbao.common.R.string.noble))) { + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.NOBLE)); + //跳转守护 + } else if (TextUtils.equals(event.getRightsInterests(), getString(com.yunbao.common.R.string.guard_guard))) { + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.GUARD)); + //跳转粉丝团 + } else if (TextUtils.equals(event.getRightsInterests(), getString(com.yunbao.common.R.string.fan_club))) { + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.FAN_CLUB)); + } + } + + } + @SuppressLint("SetTextI18n") public void showMsgRed(int num) { if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPoint == null) { diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index 3ee8cd3fb..0ed407271 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java @@ -29,6 +29,7 @@ import com.umeng.analytics.MobclickAgent; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; import com.yunbao.common.bean.NewPeopleInfo; +import com.yunbao.common.dialog.LiveNewRolePopup; import com.yunbao.common.event.MessageIMEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.API; @@ -38,7 +39,6 @@ import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.ProcessResultUtil; import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.live.dialog.LiveGiftPopup; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; @@ -47,7 +47,6 @@ import com.yunbao.live.bean.LiveChatBean; import com.yunbao.live.dialog.LiveHDDialogFragment; import com.yunbao.live.dialog.LiveMicUserDialogFragment; import com.yunbao.live.dialog.LivePromotionDialogFragment; -import com.yunbao.live.dialog.LiveRoleDialogFragment; import com.yunbao.live.dialog.TextHintDialog; import com.yunbao.live.dialog.VoiceDialog; import com.yunbao.live.event.LiveAudienceEvent; @@ -461,11 +460,16 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { * 身份特权 */ public void openRoleDialog() { - LiveRoleDialogFragment fragment = new LiveRoleDialogFragment(); - Bundle bundle = new Bundle(); - bundle.putBoolean("showRed", mRedPointPrivilege.getVisibility() == View.VISIBLE); - fragment.setArguments(bundle); - fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveRoleDialogFragment"); +// LiveRoleDialogFragment fragment = new LiveRoleDialogFragment(); +// Bundle bundle = new Bundle(); +// bundle.putBoolean("showRed", mRedPointPrivilege.getVisibility() == View.VISIBLE); +// fragment.setArguments(bundle); +// fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveRoleDialogFragment"); + new XPopup.Builder(mContext) + .enableDrag(false) + .hasBlurBg(true) + .asCustom(new LiveNewRolePopup(mContext)) + .show(); } diff --git a/live/src/main/res/layout/dialog_live_role.xml b/live/src/main/res/layout/dialog_live_role.xml index 99de1edf8..8b117c44a 100644 --- a/live/src/main/res/layout/dialog_live_role.xml +++ b/live/src/main/res/layout/dialog_live_role.xml @@ -1,10 +1,10 @@ - + android:layout_height="354dp" + android:background="@drawable/bg_live_tota"> - \ No newline at end of file + \ No newline at end of file diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml index e9bb0ffb5..ca4ab61d2 100644 --- a/live/src/main/res/layout/view_live_audience.xml +++ b/live/src/main/res/layout/view_live_audience.xml @@ -345,6 +345,7 @@