yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:移除个播房 主播榜

Browse Source
This commit is contained in:
Max
2023-11-07 19:25:58 +08:00
parent 63cedcc467
commit c616082b21
5 changed files with 6 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/nnbc123/app/avroom/fragment/BaseRoomFragment.kt
View File

@@ -26,7 +26,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.nnbc123.core.Constants
import com.nnbc123.core.DemoCache
import com.nnbc123.core.UriProvider
import com.nnbc123.core.auth.AuthModel
import com.nnbc123.core.bean.RoomMicInfo
import com.nnbc123.core.gift.GiftModel
@@ -45,7 +44,6 @@ import com.nnbc123.core.music.event.MusicPlayingEvent
import com.nnbc123.core.music.event.MusicStopEvent
import com.nnbc123.core.room.anotherroompk.ShowGiftDialogEvent
import com.nnbc123.core.room.anotherroompk.ShowUserInfoDialogEvent
import com.nnbc123.core.room.bean.RoomContributeUserInfo
import com.nnbc123.core.room.bean.RoomInfo
import com.nnbc123.core.room.event.RoomAtEvent
import com.nnbc123.core.room.event.RoomClearScreenEvent
@@ -784,13 +782,6 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
sendMsg()
}
R.id.contribute_list -> {
DialogWebViewActivity.start(mContext, UriProvider.getRoomRanking())
StatisticManager.Instance()
.onEvent(StatisticsProtocol.EVENT_MP_ROOM_RANKING_LIST_CLICK, "房间榜")
mvpPresenter?.loadRoomRank()
}
R.id.iv_first_charge_enter -> FirstChargeDialog.start(mContext)
}
}
@@ -1282,18 +1273,6 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
microView.adapter.notifyDataSetChanged()
}
override fun updateRoomRanks(data: List<RoomContributeUserInfo>) {
val avatarList = arrayListOf<ImageView?>(
mView.findViewById(R.id.iv_rank_0),
mView.findViewById(R.id.iv_rank_1),
mView.findViewById(R.id.iv_rank_2)
)
for (i in 0 until avatarList.size) {
avatarList[i]?.loadAvatar(data.getOrNull(i)?.avatar)
}
}
private fun onSendGiftBtnClick(giftId: Int = 0) {
if (giftDialog == null) {
GiftDialog.GIFT_DIALOG_FROM = "房间"

1
app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -346,7 +346,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
}
GiftValueMrg.get().updateRoomGiftValue(false);
GiftModel.get().refreshGiftList(String.valueOf(AvRoomDataManager.get().getRoomUid())).subscribe();
getMvpPresenter().loadRoomRank();
EventBus.getDefault().post(new EnterRoomEvent(AvRoomDataManager.get().mCurrentRoomInfo.getType()));
UserModel.get().getCurrentUserInfo()
.compose(bindToLifecycle())

14
app/src/main/java/com/nnbc123/app/avroom/presenter/BaseRoomPresenter.java
View File

@@ -522,20 +522,6 @@ public class BaseRoomPresenter<V extends IBaseRoomView> extends BaseMvpPresenter
});
}
@SuppressLint("CheckResult")
public void loadRoomRank() {
String type = AvRoomDataManager.get().isSingleRoom() ? RoomContributeDataInfo.TYPE_ROOM_WEEK_RANKING : RoomContributeDataInfo.TYPE_ROOM_DAY_RANKING;
RoomContributeListModel.get().getSingleRoomRanking(1, type)
.compose(bindToLifecycle())
.compose(RxHelper.handleBeanData())
.subscribe(roomContributeDataInfo -> {
// if (getMvpView() == null) {
// return;
// }
getMvpView().updateRoomRanks(roomContributeDataInfo.getRankings());
});
}
/***
* 发送房间消息
* @param message

2
app/src/main/java/com/nnbc123/app/avroom/view/IBaseRoomView.kt
View File

@@ -70,6 +70,4 @@ interface IBaseRoomView : IMvpBaseView {
fun onFollowFail(msg: String?)
fun updateMicView()
fun updateRoomRanks(data: List<RoomContributeUserInfo>)
}

64
app/src/module_mini_world/res/layout/fragment_single_room.xml
View File

@@ -41,75 +41,23 @@
app:barrierDirection="bottom"
app:constraint_referenced_ids="view_pk_board,micro_view" />
<LinearLayout
android:id="@+id/contribute_list"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_marginTop="85dp"
android:background="@drawable/bg_contribute_entrance_single_room"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_rank_0"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="4dp"
android:src="@drawable/default_avatar" />
<ImageView
android:id="@+id/iv_rank_1"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="-12dp"
android:src="@drawable/default_avatar" />
<ImageView
android:id="@+id/iv_rank_2"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="-12dp"
android:src="@drawable/default_avatar" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:includeFontPadding="false"
android:text="主播榜"
android:textColor="@color/white"
android:textSize="12dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginEnd="4dp"
android:scaleType="center"
android:src="@drawable/arrow_right_white" />
</LinearLayout>
<com.nnbc123.app.ui.widget.rollviewpager.RollPagerView
android:id="@+id/pager_view_wish_list"
android:layout_width="80dp"
android:layout_height="30dp"
android:layout_marginTop="5dp"
android:layout_marginTop="90dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/contribute_list" />
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:id="@+id/fl_fans_team"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="15dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/contribute_list">
app:layout_constraintTop_toBottomOf="@id/hourRankWidget">
<TextView
android:id="@+id/tv_fans_team_opt"
@@ -164,11 +112,11 @@
<com.nnbc123.app.avroom.hour_rank.RoomHourRankWidget
android:id="@+id/hourRankWidget"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/contribute_list"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="6dp" />
android:layout_marginTop="92dp" />
<ImageView
android:id="@+id/iv_music_flag"