From ef4c37799058beef880fbef2a26cea72ab529286 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 9 Nov 2022 09:47:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/build.gradle | 2 + .../java/com/yunbao/common/Constants.java | 1 + .../adapter/CustomDrawerPopupAdapter.java | 29 +++ .../common/bean/CustomSidebarChildModel.java | 94 ++++++++ .../common/bean/CustomSidebarInfoModel.java | 99 +++++++++ .../com/yunbao/common/http/PDLiveApi.java | 10 +- .../common/http/live/LiveNetManager.java | 22 +- .../common/views/CustomDrawerPopupView.java | 57 +++++ .../views/DrawerRecommendViewHolder.java | 15 ++ .../common/views/DrawerTaskViewHolder.java | 15 ++ .../backgroud_custom_drawer_popup.xml | 7 + .../main/res/layout/custom_drawer_popup.xml | 168 ++++++++++++++ .../live_more_icon_connect_new.png | Bin 0 -> 2987 bytes .../live_more_icon_fenestrule_new.png | Bin 0 -> 2441 bytes .../res/mipmap-xxhdpi/live_more_icon_hd.png | Bin 0 -> 2091 bytes .../res/mipmap-xxhdpi/live_more_icon_more.png | Bin 0 -> 817 bytes .../live_more_icon_sliding_new.png | Bin 0 -> 4599 bytes .../live_more_icon_special_new.png | Bin 0 -> 2970 bytes config.gradle | 4 +- .../live/activity/LiveAudienceActivity.java | 103 ++++++--- .../yunbao/live/adapter/LiveChatAdapter.java | 4 + .../com/yunbao/live/bean/LiveChatBean.java | 5 +- .../live/dialog/SidebarLiveAudience.java | 206 +----------------- .../yunbao/live/socket/SocketRyClient.java | 19 +- .../live/views/PortraitLiveManager.java | 8 +- .../main/res/layout/activity_live_detail.xml | 11 +- .../res/layout/view_sidebar_live_audience.xml | 106 +-------- 27 files changed, 633 insertions(+), 352 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java create mode 100644 common/src/main/java/com/yunbao/common/bean/CustomSidebarChildModel.java create mode 100644 common/src/main/java/com/yunbao/common/bean/CustomSidebarInfoModel.java create mode 100644 common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java create mode 100644 common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java create mode 100644 common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java create mode 100644 common/src/main/res/drawable/backgroud_custom_drawer_popup.xml create mode 100644 common/src/main/res/layout/custom_drawer_popup.xml create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_connect_new.png create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_fenestrule_new.png create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_hd.png create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_more.png create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_sliding_new.png create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_special_new.png diff --git a/common/build.gradle b/common/build.gradle index 88851178a..a0649a127 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -188,4 +188,6 @@ dependencies { api 'com.github.princekin-f:EasyFloat:2.0.4' api files('libs/Msc.jar') + api 'com.github.li-xiaojun:XPopup:2.9.1' + } diff --git a/common/src/main/java/com/yunbao/common/Constants.java b/common/src/main/java/com/yunbao/common/Constants.java index 07f931213..6625e23cc 100644 --- a/common/src/main/java/com/yunbao/common/Constants.java +++ b/common/src/main/java/com/yunbao/common/Constants.java @@ -168,6 +168,7 @@ public class Constants { public static final String STAR_CHALLENGE_UPDATE = "starChallengeUpdate";//星级助力 public static final String AI_AUTOMATIC_SPEECH = "aiAutomaticSpeech";//机器人助手 public static final String STAR_CHALLENGE_UPGRADE_NOTIFY = "starChallengeUpgradeNotify";//星级挑战成功 + public static final String SUPER_VISION = "supervision";//超级发言警告 //游戏socket public static final String SOCKET_GAME_ZJH = "startGame";//炸金花 diff --git a/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java b/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java new file mode 100644 index 000000000..32fe68918 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java @@ -0,0 +1,29 @@ +package com.yunbao.common.adapter; + +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +/** + * 新侧边栏适配器 + */ +public class CustomDrawerPopupAdapter extends RecyclerView.Adapter { + + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return null; + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + + } + + @Override + public int getItemCount() { + return 0; + } +} diff --git a/common/src/main/java/com/yunbao/common/bean/CustomSidebarChildModel.java b/common/src/main/java/com/yunbao/common/bean/CustomSidebarChildModel.java new file mode 100644 index 000000000..41156f452 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/bean/CustomSidebarChildModel.java @@ -0,0 +1,94 @@ +package com.yunbao.common.bean; + +import com.google.gson.annotations.SerializedName; + +public class CustomSidebarChildModel extends BaseModel { + @SerializedName("id") + private String id; + @SerializedName("parent_id") + private String parentId; + @SerializedName("title") + private String title; + @SerializedName("subtitle") + private String subtitle; + @SerializedName("icon") + private String icon; + @SerializedName("src") + private String src; + @SerializedName("show_type") + private String showType; + @SerializedName("sort") + private String sort; + + public String getId() { + return id; + } + + public CustomSidebarChildModel setId(String id) { + this.id = id; + return this; + } + + public String getParentId() { + return parentId; + } + + public CustomSidebarChildModel setParentId(String parentId) { + this.parentId = parentId; + return this; + } + + public String getTitle() { + return title; + } + + public CustomSidebarChildModel setTitle(String title) { + this.title = title; + return this; + } + + public String getSubtitle() { + return subtitle; + } + + public CustomSidebarChildModel setSubtitle(String subtitle) { + this.subtitle = subtitle; + return this; + } + + public String getIcon() { + return icon; + } + + public CustomSidebarChildModel setIcon(String icon) { + this.icon = icon; + return this; + } + + public String getSrc() { + return src; + } + + public CustomSidebarChildModel setSrc(String src) { + this.src = src; + return this; + } + + public String getShowType() { + return showType; + } + + public CustomSidebarChildModel setShowType(String showType) { + this.showType = showType; + return this; + } + + public String getSort() { + return sort; + } + + public CustomSidebarChildModel setSort(String sort) { + this.sort = sort; + return this; + } +} diff --git a/common/src/main/java/com/yunbao/common/bean/CustomSidebarInfoModel.java b/common/src/main/java/com/yunbao/common/bean/CustomSidebarInfoModel.java new file mode 100644 index 000000000..9d3c85547 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/bean/CustomSidebarInfoModel.java @@ -0,0 +1,99 @@ +package com.yunbao.common.bean; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +/** + * 新版自定义侧边栏 + */ +public class CustomSidebarInfoModel extends BaseModel { + @SerializedName("id") + private String id; + @SerializedName("title") + private String title; + @SerializedName("subtitle") + private String subtitle; + @SerializedName("sort") + private String sort; + @SerializedName("show_type") + private String showType; + @SerializedName("src") + private String src; + @SerializedName("type") + private String type; + @SerializedName("child") + private List child; + + public String getId() { + return id; + } + + public CustomSidebarInfoModel setId(String id) { + this.id = id; + return this; + } + + public String getTitle() { + return title; + } + + public CustomSidebarInfoModel setTitle(String title) { + this.title = title; + return this; + } + + public String getSubtitle() { + return subtitle; + } + + public CustomSidebarInfoModel setSubtitle(String subtitle) { + this.subtitle = subtitle; + return this; + } + + public String getSort() { + return sort; + } + + public CustomSidebarInfoModel setSort(String sort) { + this.sort = sort; + return this; + } + + public String getShowType() { + return showType; + } + + public CustomSidebarInfoModel setShowType(String showType) { + this.showType = showType; + return this; + } + + public String getSrc() { + return src; + } + + public CustomSidebarInfoModel setSrc(String src) { + this.src = src; + return this; + } + + public String getType() { + return type; + } + + public CustomSidebarInfoModel setType(String type) { + this.type = type; + return this; + } + + public List getChild() { + return child; + } + + public CustomSidebarInfoModel setChild(List child) { + this.child = child; + 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 c3bddf6e6..5e71880e0 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -4,6 +4,7 @@ import com.yunbao.common.bean.ActiveModel; import com.yunbao.common.bean.AnchorRecommendModel; import com.yunbao.common.bean.BaseModel; import com.yunbao.common.bean.ContributeModel; +import com.yunbao.common.bean.CustomSidebarInfoModel; import com.yunbao.common.bean.FaceBookUpModel; import com.yunbao.common.bean.HourRank; import com.yunbao.common.bean.IMLoginModel; @@ -236,7 +237,8 @@ public interface PDLiveApi { Observable> getNobleRankHideUserList(); /** - *获取当前星级 + * 获取当前星级 + * * @param liveUid * @return */ @@ -248,4 +250,10 @@ public interface PDLiveApi { */ @GET("/api/public/?service=Live.getLiveRoomActivtyBanner") Observable>> getLiveRoomActivityBanner(); + + /** + * 新侧边栏请求 + */ + @GET("/api/public/?service=Live.getCustomSidebarInfo") + Observable>> getCustomSidebarInfo(); } 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 a84922559..bc4913516 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 @@ -6,6 +6,7 @@ import android.text.TextUtils; import com.yunbao.common.R; import com.yunbao.common.bean.ActiveModel; import com.yunbao.common.bean.BaseModel; +import com.yunbao.common.bean.CustomSidebarInfoModel; import com.yunbao.common.bean.LiveInfoModel; import com.yunbao.common.bean.LiveRoomActivityBanner; import com.yunbao.common.bean.NobleRankHideUserListModel; @@ -14,7 +15,6 @@ import com.yunbao.common.bean.SetAttentsModel; import com.yunbao.common.bean.StarChallengeStatusModel; import com.yunbao.common.bean.VipModel; import com.yunbao.common.http.API; -import com.yunbao.common.http.ResponseModel; import com.yunbao.common.http.base.HttpCallback; import java.util.List; @@ -63,6 +63,7 @@ public class LiveNetManager { if (callback != null) callback.onError(throwable.getMessage()); }).isDisposed(); + } /** @@ -237,7 +238,6 @@ public class LiveNetManager { /** * 获取 【新人特惠】【趣味游戏】【幸运天使】 - * */ public void getLiveRoomActivityBanner(HttpCallback> callback) { API.get().pdLiveApi(mContext) @@ -253,4 +253,22 @@ public class LiveNetManager { throwable.printStackTrace(); }).isDisposed(); } + + /** + * 获取新侧边数据 + * + * @param callback + */ + public void getCustomSidebarInfo(HttpCallback> callback) { + API.get().pdLiveApi(mContext) + .getCustomSidebarInfo() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(listResponseModel -> callback.onSuccess(listResponseModel.getData().getInfo()), throwable -> { + if (callback != null) { + callback.onError(throwable.getMessage()); + } + throwable.printStackTrace(); + }).isDisposed(); + } } diff --git a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java new file mode 100644 index 000000000..1ddfedce5 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java @@ -0,0 +1,57 @@ +package com.yunbao.common.views; + +import android.content.Context; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.lxj.xpopup.core.DrawerPopupView; +import com.yunbao.common.R; +import com.yunbao.common.bean.CustomSidebarInfoModel; +import com.yunbao.common.http.live.LiveNetManager; + +import java.util.List; + +public class CustomDrawerPopupView extends DrawerPopupView { + private Context mContext; + + private RecyclerView drawerList; + + public CustomDrawerPopupView(@NonNull Context context) { + super(context); + mContext = context; + } + + @Override + protected int getImplLayoutId() { + return R.layout.custom_drawer_popup; + } + + @Override + protected void onCreate() { + super.onCreate(); + + initView(); + initData(); + + } + + private void initView() { + drawerList = findViewById(R.id.drawerList); + } + + private void initData() { + LiveNetManager.get(mContext) + .getCustomSidebarInfo(new com.yunbao.common.http.base.HttpCallback>() { + @Override + public void onSuccess(List data) { + + } + + @Override + public void onError(String error) { + + } + }); + } +} \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java new file mode 100644 index 000000000..876bac123 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java @@ -0,0 +1,15 @@ +package com.yunbao.common.views; + +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +/** + * 侧边栏推荐布局 任务 + */ +public class DrawerRecommendViewHolder extends RecyclerView.ViewHolder { + public DrawerRecommendViewHolder(@NonNull View itemView) { + super(itemView); + } +} diff --git a/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java new file mode 100644 index 000000000..0ac077cdb --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java @@ -0,0 +1,15 @@ +package com.yunbao.common.views; + +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +/** + * 侧边栏任务布局 + */ +public class DrawerTaskViewHolder extends RecyclerView.ViewHolder { + public DrawerTaskViewHolder(@NonNull View itemView) { + super(itemView); + } +} diff --git a/common/src/main/res/drawable/backgroud_custom_drawer_popup.xml b/common/src/main/res/drawable/backgroud_custom_drawer_popup.xml new file mode 100644 index 000000000..18e7accd9 --- /dev/null +++ b/common/src/main/res/drawable/backgroud_custom_drawer_popup.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/custom_drawer_popup.xml b/common/src/main/res/layout/custom_drawer_popup.xml new file mode 100644 index 000000000..aec92c644 --- /dev/null +++ b/common/src/main/res/layout/custom_drawer_popup.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_connect_new.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_connect_new.png new file mode 100644 index 0000000000000000000000000000000000000000..779b2dc96cb59ac6643d655fd0a091284304af78 GIT binary patch literal 2987 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 Tq2)aJ|8)R>Y@DnaSYpyYagxVf literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_more.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_more.png new file mode 100644 index 0000000000000000000000000000000000000000..2b0398a85b910f91481f7b262e844688f902e9c0 GIT binary patch literal 817 zcmeAS@N?(olHy`uVBq!ia0vp^86eET1|(%=wk`xxjKx9jP7LeL$-HD>V0!K8;uum9 z_jb-kUlvCmS6fR?q1+2hOBDhc6hj4q7=)HyV9Hg9b+UV*!j$(uZDM-v>&3N8Dss

5*%dwJG*nc-QDEs57Rc|H zZBZy>dh~W zPgI|EPZu~MXg*D?@Q7@FL5$Ej)yx>7zS_dGb{iL$p8Y0!(xsX+XP-(1x6pg#1_k-` zpE6jcDt{Msnb03zY0`9R;%_dc6USHENI5<|QOhd$AMqd;3A;^#&1FP-VMomc{`L%;wt|eK0g+7CrR%@ z`GK3?Tw=tEj}x@FHO8osXS8aN%t$g zlcKs(j;;&RPb*|hi@8|Lp~Yky&E~lIN!L8*0KpeGjW}khhJTT1>T)SW2VtRX3ec>dv8~J zLj3C8U>}x-1ui=TR|<+a8XB@U2|aXM;ugSi^oR_HSBvySDMvvO;bH|1!915N7S{lu fGmX?$T*LhT8eheiIm{ivJiy@T>gTe~DWM4fu%%xV literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_sliding_new.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_sliding_new.png new file mode 100644 index 0000000000000000000000000000000000000000..f2abfe924213bdd2423ad90b6558eedc8c07a298 GIT binary patch literal 4599 zcmVPx`u}MThRCr$Pod>XdOHs!A6BPsI2nNh3U{;KXs02|K85F}^Ok}N90fT*a?fQp~>yUbp9&-TomvuFSNzkA4g%Y=O>hv{L125vfjwL9LBkFL+cOUA*>VpWb`aQ}abVAud(g0h!1jy- zd$!zzh8+a9XB^nGCO+aj}T_+KBl4h~U5fB_iG(5wDZ<&+}*5&k;_P zh800wIwGzS5ua0G=|>{sB@yuiN&m2)Y~OsIfX5!Z@{�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 literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_special_new.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_special_new.png new file mode 100644 index 0000000000000000000000000000000000000000..57d08e40e49e1678f92850aa1f98e55fdfa2c2ef GIT binary patch literal 2970 zcmV;L3uW|)P)Px=R7pfZRCr$Pod>LKMHPns--5l18oLp@#1eaniXALbF)D(B0TBdLp3*@DL=*&( zE@CG_009BfAgCk+>?p;cqNpe;V!?`vzxjD{bieJM-OfI<=iIkfa&uqaotZPUzB9Ae ztXZ=*G09SCfJ@cesk4}XE!me~0yY6#G7T(Qce9yclGY*lk0sMz^6riXOwug?JP*Lr z0XzV}Edl%szz+d@1Hd^Xf0tY%nSbCYz$C2?;B5fbtM_XDsYfM?CIY!0cjzX8~d3RUY)wB+rOxLee9{tb0n&C36TR zf1KpWLo_sR8!3Su9+@q>ll)%OKqTD>!1Ke;U7N~x{QGqP>}83ydlkuTI<~ox;z@u> zvN3T|Wbd^ZNgE5TB((K}FzX)Os?zF0HrIa%;1}WNzyBurXBUvPLDZlUwsh|>)MkC2!KMOc>(EwWSu-7M!cL5UboySy)~(y#^!Z=n6ewL-Gv^(0}J9QvkE4!ZWNab6JR;N7|x- zq=y1HprYs%B;VSiiG>$Q0nE=XKf}s$3CUd-KEe(kAj$i?Ju9kwhvZ%znp#-V6u`XC zdUeGJe5Q5e!baAkVM)&c@Ro|IUnO~9k0uANk^E!^nsOZq? zBtM)(M;8iA(sKdq5EIXYXhXiCLlH6~b_GQUtgFh&+ut|OwfJa40IO^#gB(KbhROpN(Z<>7q zP?qgT`inNY3=PZ%h7FA>abV~^B)>WOs3RSaQ9NgvsaE`tG+WMA9sYetlv zqqo@Ca4>4eZvlHLd4;T7e4BEIE{@YYLu zu;cdttP@d)m%x2LVU~S_WYT^lFYKbEoXR%LvSUboZmjMZLE?4S?}Sk}+kBz^yD=|$3G0PGzZ$Y`^yFR)lB*j6NcO=m?&jNPc%k&{}QcKNi5dbDCv+f$bY{@LnA*!3}bqH3#rDv&`ETuP8|^#=gLs z{D$WNI4-vnPL|^1^%F_jBwjjcm}NWZX;+6#L{Wu-K z$+P=dE$d}bOp-5c_}Wxik{Vib0SnN4E7D=i&Jxf@oEXI$>(f?(&lF8P=gv2SOJ_<6!{XLQ#Z8z3}Ak&vGu-(+(vvPb7`A`ealF4nj+tao&j=5 zKvsMfHUOE6lj{0Bi=puAVyinM1pW4kwW0aXt>f3j(ON22!lAe&+5y zh8r#kumU(QIR@w7F&Q+8NeCJD<~H^m>N;7k@k#rlSAtllk^(D$^GtJs%c`Zw`!%On znA;KTmJ` z$t9ibXutxrnAhKbc9ihf+iJI1PSU0TyuD~Ej`MfMwi%$ya`ncH4a^rN4vnNV@{;JK zu~UXnNsc~ly7BKeFE0SPoaAWBT-$Gz%Z&;w%(A-Ka1u!$mbMZ}c9FfTrm(#$#{g)R z#kAFjCN7i%Fh>mAvFcQ=WwGbOW`1LiCrLIgUQ(k!=RI`hIR9Q+868-dW!@vbGor{5J{WVYe<0QJchA=R+o3!!mhbo z7n=9mk`pjHT%87@Dw(p~K-&~8w*YIq;AoEN;i|9c+yw;EQZV>VpgbB1p}JB#A-zQB>KVUiWFFnfFn!Iu&GiaiuQwvT$zC3$9f zIjs`Uv>j8PadjDJcEAF(y1UYK$ZCpwikR`A%%Y16>6cRoSZW0H>Jxv~6+ML1t0>2td*WNioLpjR(>O<`^JMS8%W)c0aezyc*ny90Pq z1GGV7Ci_g)3E2OD*`wmkbn%U|Wu5w}lsD7f2aX~Wu!7npy{RG8z@!XytG}EY(2g`5Z|bgge>gW*oEc5CSJyNg~q>YpLb{ z%@JJQP&?Mcp>>C*&dWamYYEK7!i|~R0l1-U3}lDqTNRyvwNg_)g(hJ6uxQnj30NyN z T findViewById(@IdRes int id) { @@ -181,6 +186,7 @@ public class LiveAudienceActivity extends LiveActivity { private void initView() { // 竖直滑动 ViewPager verticalViewPager = findViewById(R.id.view_pager); + titleLine = findViewById(R.id.title_line); voicePress = findViewById(R.id.voice_press); verticalViewPager.setEnableScroll(IMLoginManager.get(mContext).isSlide()); //判断是否有直播悬浮窗，有直接关闭 @@ -688,23 +694,51 @@ public class LiveAudienceActivity extends LiveActivity { IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); switch (event.getType()) { case SIDEBAR: - int userIndex = -1; - for (int i = 0; i < list.size(); i++) { - if (TextUtils.equals(list.get(i).getUid(), PortraitLiveManager.liveID)) { - userIndex = i; - } - } - if (userIndex != -1) { - list.remove(userIndex); - } - //从右边打开侧边栏 - SidebarLiveAudience sidebarLiveAudience = new SidebarLiveAudience(); - bundle.putString("Avatar", mLiveBean.getAvatar()); - bundle.putString("banner", GsonUtils.toJson(slideInfoModels)); - bundle.putString("list", GsonUtils.toJson(list)); - bundle.putInt("LiveBg", liveBg); - sidebarLiveAudience.setArguments(bundle); - sidebarLiveAudience.show(getSupportFragmentManager(), "SidebarLiveAudience"); +// int userIndex = -1; +// for (int i = 0; i < list.size(); i++) { +// if (TextUtils.equals(list.get(i).getUid(), PortraitLiveManager.liveID)) { +// userIndex = i; +// } +// } +// if (userIndex != -1) { +// list.remove(userIndex); +// } +// //从右边打开侧边栏 +// SidebarLiveAudience sidebarLiveAudience = new SidebarLiveAudience(); +// bundle.putString("Avatar", mLiveBean.getAvatar()); +// bundle.putString("banner", GsonUtils.toJson(slideInfoModels)); +// bundle.putString("list", GsonUtils.toJson(list)); +// bundle.putInt("LiveBg", liveBg); +// sidebarLiveAudience.setArguments(bundle); +// sidebarLiveAudience.show(getSupportFragmentManager(), "SidebarLiveAudience"); +// MPopupWindow.create(mContext) +// .setLayoutId(R.layout.view_sidebar_live_audience) +// .setBackgroundDrawable(new ColorDrawable(Color.GREEN)) +// .setOnDismissListener(new MPopupWindow.MPopupListener() { +// @Override +// public void invoke(View contentView) { +// +// } +// +// @Override +// public void onDismiss() { +// +// } +// }).setGravity(TypeGravity.BOTTOM_RIGHT) +// .setTarget(titleLine) +// .setHeight(DeviceUtils.getScreenHeight(mContext)*2) +// .setWidth(DeviceUtils.getScreenWidth(mContext)/6*5) +// .build() +// .show(); + CustomDrawerPopupView drawerPopupView = new CustomDrawerPopupView(mContext); + new XPopup.Builder(mContext) + .hasShadowBg(false) + .isDestroyOnDismiss(true) + .isLightStatusBar(false) + .popupPosition(PopupPosition.Right)//右边 + .hasStatusBarShadow(true) //启用状态栏阴影 + .asCustom(drawerPopupView) + .show(); break; case BOTTOM_COLLECTION: LiveTotalDialog liveTotalDialog = new LiveTotalDialog(); @@ -1030,25 +1064,36 @@ public class LiveAudienceActivity extends LiveActivity { private List list = new ArrayList<>(); private void getDrawer() { - - //推荐位 - MainNetManager.get(mContext) - .anchorRecommend("12", new com.yunbao.common.http.base.HttpCallback() { + LiveNetManager.get(mContext) + .getCustomSidebarInfo(new com.yunbao.common.http.base.HttpCallback>() { @Override - public void onSuccess(AnchorRecommendModel anchorRecommendModel) { - list.clear(); - slideInfoModels.clear(); - List models = anchorRecommendModel.getList(); + public void onSuccess(List data) { - models.add(0, new AnchorRecommendItemModel()); - list.addAll(models); - slideInfoModels = anchorRecommendModel.getSlide(); } @Override public void onError(String error) { + } }); +// //推荐位 +// MainNetManager.get(mContext) +// .anchorRecommend("12", new com.yunbao.common.http.base.HttpCallback() { +// @Override +// public void onSuccess(AnchorRecommendModel anchorRecommendModel) { +// list.clear(); +// slideInfoModels.clear(); +// List models = anchorRecommendModel.getList(); +// +// models.add(0, new AnchorRecommendItemModel()); +// list.addAll(models); +// slideInfoModels = anchorRecommendModel.getSlide(); +// } +// +// @Override +// public void onError(String error) { +// } +// }); } public void onFollowEvent(FollowEvent e) { diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java index a2ad2f0c1..9096d03e8 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java @@ -299,6 +299,10 @@ public class LiveChatAdapter extends RecyclerView.Adapter { mBg.setBackground(null); mTextView.setText(bean.getContent()); } + } else if (bean.getType() == LiveChatBean.SYSTEM2) { + mTextView.setTextColor(0xffffffff); + mBg.setBackground(null); + mTextView.setText(bean.getContent()); } else if (bean.getType() == -1) {//自动消息，关注 boolean isContains = false; for (LiveChatBean model : mList) { diff --git a/live/src/main/java/com/yunbao/live/bean/LiveChatBean.java b/live/src/main/java/com/yunbao/live/bean/LiveChatBean.java index 6165349f5..5a492399f 100644 --- a/live/src/main/java/com/yunbao/live/bean/LiveChatBean.java +++ b/live/src/main/java/com/yunbao/live/bean/LiveChatBean.java @@ -11,8 +11,9 @@ import com.yunbao.common.bean.MsgModel; public class LiveChatBean { - public static final int NORMAL = 0; + public final int NORMAL = 0; public static final int SYSTEM = 1; + public static final int SYSTEM2 = 111; public static final int GIFT = 2; public static final int ENTER_ROOM = 3; public static final int LIGHT = 4; @@ -22,6 +23,8 @@ public class LiveChatBean { public static final int STAR_CHALLENGE_UPGRADE_NOTIFY = 105; public static final int LUCKY_ANGEL = 106;//幸运天使 + + private String id; private String userNiceName; private int level; diff --git a/live/src/main/java/com/yunbao/live/dialog/SidebarLiveAudience.java b/live/src/main/java/com/yunbao/live/dialog/SidebarLiveAudience.java index 03f0c2f49..89e28ad83 100644 --- a/live/src/main/java/com/yunbao/live/dialog/SidebarLiveAudience.java +++ b/live/src/main/java/com/yunbao/live/dialog/SidebarLiveAudience.java @@ -1,40 +1,19 @@ package com.yunbao.live.dialog; import android.content.DialogInterface; -import android.graphics.Color; import android.os.Bundle; -import android.text.TextUtils; -import android.view.Display; import android.view.Gravity; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.recyclerview.widget.GridLayoutManager; import com.alibaba.fastjson.JSON; -import com.blankj.utilcode.util.GsonUtils; -import com.google.gson.reflect.TypeToken; -import com.ms.banner.Banner; -import com.yunbao.common.activity.WebViewActivity; -import com.yunbao.common.bean.AnchorRecommendItemModel; -import com.yunbao.common.bean.AnchorRecommendModel; import com.yunbao.common.bean.LiveBean; -import com.yunbao.common.bean.SlideInfoModel; -import com.yunbao.common.custom.CommonRefreshView; -import com.yunbao.common.custom.ItemDecoration; import com.yunbao.common.dialog.AbsDialogFragment; -import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.HttpCallback; -import com.yunbao.common.http.main.MainNetManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.DeviceUtils; import com.yunbao.common.utils.RouteUtil; -import com.yunbao.common.views.SlideInBannerViewHolder; -import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.adapter.SidebarAdapter; import com.yunbao.live.event.LiveAudienceEvent; @@ -42,32 +21,18 @@ import com.yunbao.live.event.LiveRoomChangeEvent; import com.yunbao.live.http.LiveHttpUtil; import com.yunbao.live.presenter.LiveRoomCheckLivePresenter; import com.yunbao.live.views.LivePlayRyViewHolder; -import com.yunbao.live.views.PortraitLiveManager; import org.greenrobot.eventbus.EventBus; -import java.util.ArrayList; -import java.util.List; - /** * 直播间侧边栏 */ public class SidebarLiveAudience extends AbsDialogFragment { - //侧边栏背景 - private ImageView sidebarBack; - private View mask; - //侧边栏刷新列表 - public CommonRefreshView sidebarList; + //侧边栏适配器 private SidebarAdapter sidebarAdapter; - private List slideInfoModels = new ArrayList<>(); - private List list = new ArrayList<>(); - private int index = 0; - private LinearLayout haveData, noDataLive; - private Banner mBanner; - private TextView inBatch; @Override protected int getLayoutId() { @@ -84,176 +49,7 @@ public class SidebarLiveAudience extends AbsDialogFragment { super.onActivityCreated(savedInstanceState); Bundle bundle = getArguments(); - sidebarBack = (ImageView) findViewById(R.id.sidebar_back); - haveData = (LinearLayout) findViewById(R.id.have_data); - noDataLive = (LinearLayout) findViewById(R.id.view_no_data_live); - //侧边栏轮播 - mBanner = (Banner) findViewById(R.id.banner); - inBatch = (TextView) findViewById(R.id.in_batch); - mask = findViewById(R.id.mask); - if (bundle != null) { - String avatar = bundle.getString("Avatar"); - int liveBg = bundle.getInt("LiveBg"); - slideInfoModels = GsonUtils.fromJson(bundle.getString("banner"), new TypeToken>() { - }.getType()); - list = GsonUtils.fromJson(bundle.getString("list"), new TypeToken>() { - }.getType()); - //侧边栏背景 - if (liveBg == 1) { - ImgLoader.displayBlurLive(mContext, avatar, sidebarBack); - mask.setVisibility(View.VISIBLE); - } else { - ImgLoader.display(mContext, R.mipmap.live_bg, sidebarBack); - mask.setVisibility(View.GONE); - } - - } - sidebarList = (CommonRefreshView) findViewById(R.id.sidebarList); - sidebarList.setHeaderTextColor(Color.parseColor("#ffffff")); - GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.VERTICAL, false); - gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { - @Override - public int getSpanSize(int position) { - if (position == 0) { - return 2; - } - return 1; - } - }); - sidebarList.setLayoutManager(gridLayoutManager); - sidebarList.setEmptyLayoutId(R.layout.view_no_data_live); - sidebarList.setLoadMoreEnable(false); - ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 6, 0); - decoration.setOnlySetItemOffsetsButNoDraw(true); - sidebarList.setItemDecoration(decoration); - Display mDisplay = getActivity().getWindowManager().getDefaultDisplay(); - sidebarAdapter = new SidebarAdapter(mContext, mDisplay.getHeight()); - sidebarAdapter.setHasStableIds(true); - sidebarList.setRecyclerViewAdapter(sidebarAdapter); - ViewClicksAntiShake.clicksAntiShake(inBatch, new ViewClicksAntiShake.ViewClicksCallBack() { - @Override - public void onViewClicks() { - sidebarList.initData(); - } - }); - if (sidebarAdapter != null) { - if (list.size() == 1) { - haveData.setVisibility(View.GONE); - noDataLive.setVisibility(View.VISIBLE); - - if (mBanner.isStart()) { - mBanner.update(slideInfoModels); - } else { - mBanner.setAutoPlay(true) - .setPages(slideInfoModels, new SlideInBannerViewHolder()) - .setDelayTime(3000) - .setOnBannerClickListener((datas, p) -> { - if (p >= 0 && p < slideInfoModels.size()) { - SlideInfoModel bean = slideInfoModels.get(p); - if (bean != null) { - - String link = bean.getSlideUrl(); - if (link.contains("http")) { - WebViewActivity.forward(getContext(), link, true); - } else { - gotoLive(link); - } - } - } - }).start(); - } - } else { - haveData.setVisibility(View.VISIBLE); - noDataLive.setVisibility(View.GONE); - sidebarAdapter.addData(list); - sidebarAdapter.setData(slideInfoModels); - } - - } - sidebarList.setDataHelperNew(new CommonRefreshView.DataHelperNew() { - @Override - public void loadData(int p) { - - } - - @Override - public void refresh() { - if (index > 0) { - //推荐位 - MainNetManager.get(getActivity()) - .anchorRecommend("12", new com.yunbao.common.http.base.HttpCallback() { - @Override - public void onSuccess(AnchorRecommendModel anchorRecommendModel) { - List list = anchorRecommendModel.getList(); - int userIndex = -1; - for (int i = 0; i < list.size(); i++) { - if (TextUtils.equals(list.get(i).getUid(), PortraitLiveManager.liveID)) { - userIndex = i; - } - } - if (userIndex != -1) { - list.remove(userIndex); - } - - list.add(0, new AnchorRecommendItemModel()); - if (list.size() == 1) { - haveData.setVisibility(View.GONE); - noDataLive.setVisibility(View.VISIBLE); - - if (mBanner.isStart()) { - mBanner.update(slideInfoModels); - } else { - mBanner.setAutoPlay(true) - .setPages(slideInfoModels, new SlideInBannerViewHolder()) - .setDelayTime(3000) - .setOnBannerClickListener((datas, p) -> { - if (p >= 0 && p < slideInfoModels.size()) { - SlideInfoModel bean = slideInfoModels.get(p); - if (bean != null) { - - String link = bean.getSlideUrl(); - if (link.contains("http")) { - WebViewActivity.forward(getContext(), link, true); - } else { - gotoLive(link); - } - } - } - }).start(); - } - } else { - haveData.setVisibility(View.VISIBLE); - noDataLive.setVisibility(View.GONE); - sidebarAdapter.addData(list); - sidebarAdapter.setData(anchorRecommendModel.getSlide()); - } - - sidebarList.onFinish(); - } - - @Override - public void onError(String error) { - } - }); - } else { - index = index + 1; - } - - } - }); - sidebarList.initData(); - sidebarAdapter.setOnItemClickListener((bean, position) -> { - - gotoLive(bean.getUid()); - dismiss(); - }); - sidebarAdapter.setListener(new SidebarAdapter.SidebarListener() { - @Override - public void refresh() { - sidebarList.initData(); - } - }); } @Override diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index 0818c9784..a058d2023 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -204,12 +204,12 @@ public class SocketRyClient { } break; case Constants.SOCKET_KICK://踢人 - systemChatMessage(map.getString("ct")); + systemChatMessage2(map.getString("ct")); mListener.onKick(map.getString("touid")); break; case Constants.SOCKET_SHUT_UP://禁言 String ct = map.getString("ct"); - systemChatMessage(ct); + systemChatMessage2(ct); mListener.onShutUp(map.getString("touid"), ct); break; case Constants.SOCKET_SEND_MSG://文字消息，点亮，用户进房间，这种混乱的设计是因为服务器端逻辑就是这样设计的,客户端无法自行修改 @@ -333,9 +333,12 @@ public class SocketRyClient { mListener.addFakeFans(list); break; case Constants.SOCKET_SET_ADMIN://设置或取消管理员 - systemChatMessage(map.getString("ct")); + systemChatMessage2(map.getString("ct")); mListener.onSetAdmin(map.getString("touid"), map.getIntValue("action")); break; + case Constants.SUPER_VISION://设置或取消管理员 + systemChatMessage2(map.getString("ct")); + break; case Constants.SOCKET_BUY_GUARD://购买守护 buyGuardInSameRoom(map); break; @@ -858,6 +861,16 @@ public class SocketRyClient { mListener.onChat(bean, 1); } + /** + * 接收到系统消息，显示在聊天栏中 + */ + private static void systemChatMessage2(String content) { + LiveChatBean bean = new LiveChatBean(); + bean.setContent(content); + bean.setType(LiveChatBean.SYSTEM2); + mListener.onChat(bean, 1); + } + /** * 处理观众与主播连麦逻辑 */ 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 0a055d8ff..17535b20e 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -183,6 +183,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe //标记是调用正常退出还是手动切后台 private boolean isQuitF = false; + //是否成功调用进入房间接口 + private boolean isEnterRoom = false; + public PortraitLiveManager setQuitF(boolean quitF) { isQuitF = quitF; return this; @@ -224,6 +227,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe @Override public synchronized void onAdd(LiveBean data, int liveType, int liveTypeVal, int liveSdk) { + isEnterRoom = false; openParametersModel = new OpenParametersModel(); mContext.runOnUiThread(new Runnable() { @Override @@ -1062,7 +1066,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe LiveHttpUtil.enterRoom(mLiveBean.getUid(), mLiveBean.getStream(), new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - + isEnterRoom = true; if (code == 0 && info.length > 0) { JSONObject obj = JSON.parseObject(info[0]); mDanmuPrice = obj.getString("barrage_fee"); @@ -1418,7 +1422,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe * 退出直播间 */ public void exitLiveRoom() { - if (mLiveBean == null) { + if (mLiveBean == null && !isEnterRoom) { return; } RongChatRoomClient.getInstance().quitChatRoom("g" + mLiveBean.getUid(), new IRongCoreCallback.OperationCallback() { diff --git a/live/src/main/res/layout/activity_live_detail.xml b/live/src/main/res/layout/activity_live_detail.xml index 997e1794d..e69a2c00a 100644 --- a/live/src/main/res/layout/activity_live_detail.xml +++ b/live/src/main/res/layout/activity_live_detail.xml @@ -3,6 +3,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + android:layout_marginStart="54dp" + android:src="@mipmap/icon_voice_press" + android:visibility="gone" /> \ No newline at end of file diff --git a/live/src/main/res/layout/view_sidebar_live_audience.xml b/live/src/main/res/layout/view_sidebar_live_audience.xml index a5638be36..3dfd27392 100644 --- a/live/src/main/res/layout/view_sidebar_live_audience.xml +++ b/live/src/main/res/layout/view_sidebar_live_audience.xml @@ -1,110 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file