From 5d9ff675a7619b14a82e88546fe166e4247af7c9 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 13 Dec 2023 20:48:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=81=A2=E5=A4=8D=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=A6=9C=E3=80=81=E6=A6=9C=E5=8D=95=EF=BC=88?= =?UTF-8?q?=E6=A6=9C=E5=8D=95=E5=85=A5=E5=8F=A3=E6=8D=A2=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=89=20feat=EF=BC=9A=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=9F=B3=E4=B9=90=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/avroom/fragment/BaseRoomFragment.kt | 25 ++--- .../fragment/HomePartyRoomFragment.java | 24 +++-- .../app/avroom/fragment/SingleRoomFragment.kt | 18 +++- .../avroom/presenter/BaseRoomPresenter.java | 14 --- .../chwl/app/avroom/rank/RoomRankWidget.kt | 90 +++++++++++++++++ .../app/avroom/redpackage/RedPackageWidget.kt | 14 --- .../com/chwl/app/avroom/view/IBaseRoomView.kt | 2 - .../drawable-xhdpi/ic_single_room_rank.webp | Bin 1330 -> 0 bytes .../drawable-xxhdpi/room_ic_hour_rank.webp | Bin 0 -> 3360 bytes .../res/drawable-xxhdpi/room_ic_music.webp | Bin 0 -> 2020 bytes .../main/res/drawable/room_bg_hour_rank.xml | 10 ++ .../main/res/drawable/room_rank_widget_bg.xml | 10 ++ app/src/main/res/layout/room_rank_widget.xml | 55 +++++++++++ .../res/layout/fragment_av_room_game.xml | 44 ++++++++- .../res/layout/fragment_single_room.xml | 45 ++++++++- .../app/music/widget/MusicPlayerView.java | 92 ++++++++++++------ .../res/drawable-xhdpi/icon_music_flag.webp | Bin 1586 -> 0 bytes .../res/layout/layout_music_player_view.xml | 28 ------ .../support/room/FrameLayoutRoomWidget.kt | 17 +++- .../res/drawable/base_arrow_right_f1f1fa.xml | 9 ++ 20 files changed, 375 insertions(+), 122 deletions(-) create mode 100644 app/src/main/java/com/chwl/app/avroom/rank/RoomRankWidget.kt delete mode 100644 app/src/main/res/drawable-xhdpi/ic_single_room_rank.webp create mode 100644 app/src/main/res/drawable-xxhdpi/room_ic_hour_rank.webp create mode 100644 app/src/main/res/drawable-xxhdpi/room_ic_music.webp create mode 100644 app/src/main/res/drawable/room_bg_hour_rank.xml create mode 100644 app/src/main/res/drawable/room_rank_widget_bg.xml create mode 100644 app/src/main/res/layout/room_rank_widget.xml delete mode 100644 app/src/module_music/res/drawable-xhdpi/icon_music_flag.webp create mode 100644 modules/module_base/src/main/res/drawable/base_arrow_right_f1f1fa.xml diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt index c3f8b534a..ded4be529 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt @@ -287,7 +287,6 @@ open class BaseRoomFragment?> : // 刷新禮物列表，獲取房間專屬禮物列表 GiftModel.get().refreshGiftList(AvRoomDataManager.get().roomUid.toString()).subscribe() checkFollowOwner() - mvpPresenter?.loadRoomRank() GiftValueMrg.get().updateRoomGiftValue(false) //先隐藏航海冒险 @@ -496,6 +495,9 @@ open class BaseRoomFragment?> : if (isOnMic) { if (musicPlayerView == null) { musicPlayerView = mVsMusicPlayer?.inflate() as? MusicPlayerView + musicPlayerView?.let { + onInitMusicPlayerView(it) + } } musicPlayerView?.visibility = View.VISIBLE } else { @@ -618,11 +620,6 @@ open class BaseRoomFragment?> : sendMsg() } -// R.id.contribute_list -> { -// DialogWebViewActivity.start(mContext, UriProvider.getRoomRanking()) -// mvpPresenter?.loadRoomRank() -// } - R.id.iv_first_charge_enter -> FirstChargeDialog.start(mContext) // R.id.iv_treasure_box, // R.id.iv_treasure_box_cp -> GoldBoxHelper.handleBoxClick(mContext) @@ -1058,18 +1055,6 @@ open class BaseRoomFragment?> : microView.adapter.notifyDataSetChanged() } - override fun updateRoomRanks(data: List) { -// val avatarList = arrayListOf( -// 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 = getString(R.string.room) @@ -1266,4 +1251,8 @@ open class BaseRoomFragment?> : protected open fun onEnterRoom(){ } + + protected open fun onInitMusicPlayerView(view: MusicPlayerView) { + + } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java index c0e0f3257..44d68bb4e 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java @@ -5,8 +5,12 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.View; +import androidx.annotation.NonNull; import androidx.databinding.DataBindingUtil; +import com.chwl.app.avroom.rank.RoomRankWidget; +import com.chwl.app.music.widget.MusicPlayerView; +import com.chwl.app.ui.webview.DialogWebViewActivity; import com.netease.nim.uikit.common.util.log.LogUtil; import com.trello.rxlifecycle3.android.FragmentEvent; import com.chwl.app.R; @@ -36,7 +40,6 @@ import com.chwl.app.utils.UserUtils; import com.chwl.core.Constants; import com.chwl.core.UriProvider; import com.chwl.core.auth.AuthModel; -import com.chwl.core.home.bean.BannerInfo; import com.chwl.core.home.event.ShareRoomEvent; import com.chwl.core.im.custom.bean.RoomPKAttachment; import com.chwl.core.im.custom.bean.RoomPkBean; @@ -134,6 +137,7 @@ public class HomePartyRoomFragment extends BaseRoomFragment 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 diff --git a/app/src/main/java/com/chwl/app/avroom/rank/RoomRankWidget.kt b/app/src/main/java/com/chwl/app/avroom/rank/RoomRankWidget.kt new file mode 100644 index 000000000..5603f1ce1 --- /dev/null +++ b/app/src/main/java/com/chwl/app/avroom/rank/RoomRankWidget.kt @@ -0,0 +1,90 @@ +package com.chwl.app.avroom.rank + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.core.view.isVisible +import androidx.databinding.DataBindingUtil +import com.chwl.app.R +import com.chwl.app.databinding.RoomRankWidgetBinding +import com.chwl.app.ui.utils.loadAvatar +import com.chwl.app.ui.webview.DialogWebViewActivity +import com.chwl.core.UriProvider +import com.chwl.core.room.bean.RoomContributeDataInfo +import com.chwl.core.room.bean.RoomContributeUserInfo +import com.chwl.core.room.model.RoomContributeListModel +import com.chwl.core.support.room.FrameLayoutRoomWidget +import com.chwl.core.support.room.RoomContext +import com.chwl.core.support.room.RoomView +import com.chwl.core.support.room.RoomWidget +import com.chwl.core.utils.net.RxHelper +import com.example.lib_utils.ktx.singleClick + +/** + * 房间榜单入口 + */ +class RoomRankWidget : FrameLayoutRoomWidget, RoomWidget { + + private val binding: RoomRankWidgetBinding = + DataBindingUtil.inflate( + LayoutInflater.from( + context + ), R.layout.room_rank_widget, this, true + ) + + constructor(context: Context) : super(context) + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super( + context, + attrs, + defStyleAttr + ) + + constructor( + context: Context, + attrs: AttributeSet?, + defStyleAttr: Int, + defStyleRes: Int + ) : super(context, attrs, defStyleAttr, defStyleRes) + + init { + this.singleClick { + DialogWebViewActivity.start(context, UriProvider.getRoomRanking()) + refreshData() + } + } + + override fun onInitialize(roomView: RoomView, roomContext: RoomContext) { + super.onInitialize(roomView, roomContext) + refreshData() + } + + override fun onUnbindContext() { + super.onUnbindContext() + updateView(null) + } + + private fun refreshData() { + val disposable = RoomContributeListModel.get() + .getSingleRoomRanking(1, RoomContributeDataInfo.TYPE_ROOM_DAY_RANKING) + .compose(RxHelper.handleBeanData()) + .subscribe { roomContributeDataInfo: RoomContributeDataInfo -> + updateView(roomContributeDataInfo.rankings) + } + getCompositeDisposable().add(disposable) + } + + private fun updateView(list: List?) { + arrayListOf( + binding.ivRank0, binding.ivRank1, binding.ivRank2 + ).forEachIndexed { index, imageView -> + val url = list?.getOrNull(index)?.avatar + if (url.isNullOrEmpty()) { + imageView.isVisible = false + } else { + imageView.loadAvatar(url) + imageView.isVisible = true + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt index bb59fca8d..b360e57c5 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt @@ -56,8 +56,6 @@ class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget { ), R.layout.red_package_widget, this, true ) - private var compositeDisposable: CompositeDisposable? = null - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super( @@ -218,26 +216,14 @@ class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget { getCompositeDisposable().add(disposable) } - private fun getCompositeDisposable(): CompositeDisposable { - var disposable = compositeDisposable - if (disposable == null) { - disposable = CompositeDisposable() - compositeDisposable = disposable - } - return disposable - } - override fun onStop() { super.onStop() this.dialogManager?.dismissDialog() this.dialogManager = null - this.roomView = null } override fun onUnbindContext() { super.onUnbindContext() - compositeDisposable?.dispose() - compositeDisposable = null loadData(null) } diff --git a/app/src/main/java/com/chwl/app/avroom/view/IBaseRoomView.kt b/app/src/main/java/com/chwl/app/avroom/view/IBaseRoomView.kt index 829ae8c1f..a7c50aa15 100644 --- a/app/src/main/java/com/chwl/app/avroom/view/IBaseRoomView.kt +++ b/app/src/main/java/com/chwl/app/avroom/view/IBaseRoomView.kt @@ -71,6 +71,4 @@ interface IBaseRoomView : IMvpBaseView { fun updateMicView() - fun updateRoomRanks(data: List) - } \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_single_room_rank.webp b/app/src/main/res/drawable-xhdpi/ic_single_room_rank.webp deleted file mode 100644 index a94ec675d98554a2ec9b406bb52ee61e4d8d701c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1330 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/room_ic_music.webp b/app/src/main/res/drawable-xxhdpi/room_ic_music.webp new file mode 100644 index 0000000000000000000000000000000000000000..335a6612b4b67198bcb7facc6b0266465ece2b5a GIT binary patch literal 2020 zcmVlRNBW|L<~9^03F`VB-2fvQwv^3WsEH&+Y6*n+S4D^fJlrcmY1>ASQSU*w|EPxq z0!jXCLyXe@3BaXu0t65&7BDUrPlL#_Sen*NEP&_@f5oAoZ5t-$PkV<#L`*0J2!H`pwrAD=3_t)1KyxSn zY$DrsvhA^e9@PTt&D2hwryi)yIsw;wz0JP6U?z~8*%bY0D#Q=0Gt2;asqnxJ_&yC zIe5UW>SnC@0Swsnc6O$_HgFB_R`UP_8t^`u(;S>&Z8dxb7#JWY^BdUDS!@OB*UGZ* zU)Dm`Un`5Rzpf?z-8!r6w>4WoCo7$2&(v2|y!I?MS@pCGlhsd=TYY8%4=%Geq6TH* zcEX6HP%f)IsBilve%fWY?#&I1&%_U# zUtNHW#ZMA=6TQ{>TK?x#&VC$%BX5<~v~WqzJ# z)|r)9$NsHj6MzRG6skR_5!VXN0HlZrI@X16mvCepEiz65I)SRAGAlpNv#L{&J+r~} z?;YEQNbhwtU$anzhzN#Cn^xY1>02^Q00WYMJoDGe%FJvMR37!~(TXio0o%j|sKl4u zjwcZjm?mAmx4(5>a7&|6{?DvBD$mTytfTU5EXtNGJ+?a_5!|C_`2G}JWqTw-~ZNn&fb(-!J<-f$G$plmd;9>uKJK>(YK2=cb>X*n&he))qAiD?KZjYkUlP|)0u7J>7SW-V7;1E>U%|cc5o760m11}!O*5Fg2J8KE zO=M{S$fBhnh>)gIch|>!G{%qqfmynaQ5~bIF7wyXmg)^LAm_qjuD@li){bV6SsqEW zDs~pDRO0R`^R2DZ;`XdL7l4V?WvPBU#;W0{*!F^RQHgeIGCx_OT~9u(nQKlax~^6k z!#A;#XcWxPQrf10%S1*h#WJr%v|MwpWURI$6=SBPKvFjljJuG4zmda5)~95AJHm5_ zD9%YlcGB0)ReS8+WJ<+MQp29Aun)sJYF8_{F~G7ii7N@-LlkODF}9slvJMD_5=b1V z2052qtFH)bG%~~Qd)a^I+$|cJ1j`e?AnF=1rn4r_MI{GGg4IM31~N)$!w7*CojTh; zyPwsukwa<32u$R}U}9yIacj~3qtL+iqJcfbu*0v7EhDq1x;+ssikVo<1wclI1nhhj z#3*Kx&_3F4i_RlpHi(sTP2KDh#6oPvjQ8k1#dDD{Yc_znW`TwsSs~cwYqm!z^9eIL z?)K>HmEVD=Il&V9+?Eyx7Zn66gy8SLJ&)fxj&zc5Bx=s}1+KTw&5KEPVdB0Q3WL4B zb#AIMcFwi36Sb{pJLc;6nY1(caui~Vv;2&=K$?n0AiomK*W+2oD@(Dwl%u5u@P#6N zdf4mm2Z8BOvb542^|yT4u~l~p+pt1c1n-6N>Wn$3)nt=-E$Rtp?og}4)R{k;*WfK! zbZlNKw!zY|gTqSLwg=0b-nXzk=EuDm>uf*&@0?TM+QtZ09B< + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/room_rank_widget_bg.xml b/app/src/main/res/drawable/room_rank_widget_bg.xml new file mode 100644 index 000000000..d962ed74c --- /dev/null +++ b/app/src/main/res/drawable/room_rank_widget_bg.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/room_rank_widget.xml b/app/src/main/res/layout/room_rank_widget.xml new file mode 100644 index 000000000..2d05b65bc --- /dev/null +++ b/app/src/main/res/layout/room_rank_widget.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index f508b0fa7..eaeb35cf3 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -24,14 +24,13 @@ + android:layout_height="wrap_content" /> + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/iv_music" /> showBoxInAnim()); + } + + @Override + public void setVisibility(int visibility) { + super.setVisibility(visibility); + if (musicFlagLayout != null) { + this.musicFlagLayout.setVisibility(visibility); + } + if (musicFlag != null) { + this.musicFlag.setVisibility(visibility); + } + } } diff --git a/app/src/module_music/res/drawable-xhdpi/icon_music_flag.webp b/app/src/module_music/res/drawable-xhdpi/icon_music_flag.webp deleted file mode 100644 index 1e24f3ebf2bf0c0e6eee62627a2942db10de4f8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1586 zcmb`HeOQuL6u^%lMz+e7m5COWOKO{6E31Wqm>On9=11a`R1lq_1m-lqo28ZEw8$CF zNYc%8v(j)4KU%p^(=16VHO;hKVxdx2^P^ts>9IfBvwwEpd(Qd2=broAbMJee*MsKb zvQiJg$C*m^rmx+h4*=GP;@%FLlM~$-g}egFSZj5WDQ;vm-@}zk*x}0{Xk+gsFj&BQ z&mZwR0AuZdSODdhADREJ&`cIv5R4=ZBO1*|HV4pQA&ld^<5(>Rz2i(R^F2MBkQ@oZ zM9v2s^Z|bt&5K5I>b3d7JieB@5GHXWc5C<2iniiU*pXh_5x)abQxJd$xB?a7|5c{% zGpYb!?Q;P157V)rJb=o50LC5DF>?vP+%y1L3ono#__i2b#G*n%07icXnC%N-bOS)& z?|q@uYp1`(znqnTtT9E-8HGF?hyXSafCiBe43-GlB28igc1Xv#tIz;eIKUV%XSm9^ z%J#S(+2JNxbCc|@xCijr+)kM~aV(yrj-=d^J$b3=R=3zGqhysVpH3O~^U2m9k5#=+ zY2GB`T1^SjIp#DE)3T5mV(HXtirL*$^3*$aIm_0$c&X#@Y1X9idm^`W+gopk*Y)U@ zol(84C9f`dl6;U+7b^%yOU*;uEF;)1v7#V1Y+i1W=+ThPlBz>t^$a7IDR;dieibo3 zlfkvsWaYeTjpCNRJ%0)alE-n8n`Uroq|c7a%gp1y!e1rY{4>0fZMjp?rMO->P|=>g z+oF27G(2)?e|EIF^3aJkMvda=F4qviC5Fb&XSqKNBa3bs{&pq(P_3xZTF9O0IK(;{zL zNHiuD_v(i>UtDx9PP5WxF6s8zmCDJDD&|17<}|6jbcI=5)<9bf%Pck_B6+fZ!1QE1 zx_o%Bx!+g@%bso)0SNZV}cPCWlPaN1!&gZOv!xRo!>V}3^7#lw~hsdj-eDi zEEav5aGy@JAlwIufj$p?ia^mjYDA`SR#iTH7{X7|M;Rlg9RaI&-Aw*Y)YAb8FYa&Y?nUoe@=Xa}5q| z&Qk8R_C3kQ5H!+ryp~kSLHXC))@$m-l(SO-y_I-pgR_PHwdE$4sD!kn*|uF_eFdb# zGbQe?D3XU_OwJrWq#W>C!8{M5n!m6`t6AZmvr_u93!@`DGRSe7BkM7#+g~?~@$g|8 qzL+(&#=E4w9$W1bA9cM7uT+y0jukg#rsgGwO^WuPrwAJT0p0*!JT?3P diff --git a/app/src/module_music/res/layout/layout_music_player_view.xml b/app/src/module_music/res/layout/layout_music_player_view.xml index c712ae044..7fb06d861 100644 --- a/app/src/module_music/res/layout/layout_music_player_view.xml +++ b/app/src/module_music/res/layout/layout_music_player_view.xml @@ -4,34 +4,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - + +