From aa2987cb0dc238ac665ce8dc3bb45332c331a745 Mon Sep 17 00:00:00 2001 From: max Date: Wed, 28 Aug 2024 17:36:57 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=AD=A3=E5=95=8F?= =?UTF-8?q?=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/avroom/headline/RoomHeadlineWidget.kt | 4 +- .../chwl/app/avroom/widget/RoomEffectView.kt | 5 +- .../com/chwl/app/home/HomeMessageViewModel.kt | 4 +- .../chwl/app/ui/widget/UserInfoDialog.java | 17 +-- .../drawable-xhdpi/vip_center_back_button.png | Bin 0 -> 1327 bytes .../vip_center_back_button.webp | Bin 1148 -> 0 bytes app/src/main/res/layout/dialog_user_info.xml | 2 +- .../ui/message/HeadlineViewModel.kt | 8 +- .../ui/message/PublicChatRoomViewModel.kt | 4 +- .../public_chat_hall/model/PublicChatModel.kt | 102 +++++++++--------- 10 files changed, 74 insertions(+), 72 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/vip_center_back_button.png delete mode 100644 app/src/main/res/drawable-xhdpi/vip_center_back_button.webp diff --git a/app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt b/app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt index 38e2af830..b31a33890 100644 --- a/app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt +++ b/app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt @@ -93,8 +93,8 @@ class RoomHeadlineWidget : FrameLayoutRoomWidget { private fun requestCurrentHeadline() { safeLaunch { - val data = PublicChatModel.getCurrentHeadline() - updateHeadline(data) +// val data = PublicChatModel.getCurrentHeadline() +// updateHeadline(data) } } diff --git a/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt index b31fa10c0..8852d9566 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt +++ b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt @@ -1442,6 +1442,7 @@ class RoomEffectView @JvmOverloads constructor( enterRoomEffects = remoteExtension[UserInfo.ENTER_ROOM_EFFECTS] as String? } val wrapNick = "【" + targetNicks[0].subAndReplaceDot(7) + "】" + enterText + if (!TextUtils.isEmpty(enterRoomEffects)) { playMemberInAnimByUrl(wrapNick, enterRoomEffects) } else { @@ -1495,8 +1496,8 @@ class RoomEffectView @JvmOverloads constructor( private fun playMemberInAnim(text: String, svgaVideoEntity: SVGAVideoEntity) { binding.roomMenberInSvga.visibility = VISIBLE - binding.roomMenberInSvga.loops = 1 - binding.roomMenberInSvga.clearsAfterStop = true + binding.roomMenberInSvga.loops = 10000 +// binding.roomMenberInSvga.clearsAfterStop = true val dynamicEntity = SVGADynamicEntity() val textPaint = TextPaint() textPaint.color = Color.WHITE //字體顏色 diff --git a/app/src/main/java/com/chwl/app/home/HomeMessageViewModel.kt b/app/src/main/java/com/chwl/app/home/HomeMessageViewModel.kt index a67c4ba06..25396fc5e 100644 --- a/app/src/main/java/com/chwl/app/home/HomeMessageViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/HomeMessageViewModel.kt @@ -13,8 +13,8 @@ class HomeMessageViewModel : BaseViewModel() { safeLaunch(needLoading = false, onError = { topPublicChatMessageLiveData.postValue(BeanResult.failed(it)) }) { - val value = PublicChatModel.getTopMessage() - topPublicChatMessageLiveData.postValue(BeanResult.success(value ?: emptyList())) +// val value = PublicChatModel.getTopMessage() +// topPublicChatMessageLiveData.postValue(BeanResult.success(value ?: emptyList())) } } diff --git a/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java index 6b27495aa..4a446ba7e 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java @@ -10,6 +10,7 @@ import android.annotation.SuppressLint; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; +import android.media.Image; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; @@ -761,15 +762,15 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe AvatarHelper.loadAvatarFrame(ivAvatarHeadWear, avatarFrame, userHeadwear.getType()); } } - if (vipInfo != null) { + if (vipInfo != null && !vipInfo.getUserCardBG().isEmpty()) { // findViewById(R.id.transition_mask).setVisibility(View.GONE); -// ivAvatarBg.setImageResource(R.drawable.user_card_bg_vip_9); - int lv = vipInfo.getVipLevel(); - String resourceName = "user_card_bg_vip_" + lv; - int resourceId = context.getResources().getIdentifier(resourceName, "drawable", context.getPackageName()); - if (resourceId != 0) { - ivAvatarBg.setImageResource(resourceId); - } + ivAvatarBg.setScaleType(ImageView.ScaleType.MATRIX); + ImageLoadUtils.loadImage( + context, + vipInfo.getUserCardBG().replace("\n",""), + ivAvatarBg, + R.drawable.default_avatar + ); } else { if (avatarBg == null || !avatarBg.equals(userInfo.getAvatar())) { avatarBg = userInfo.getAvatar(); diff --git a/app/src/main/res/drawable-xhdpi/vip_center_back_button.png b/app/src/main/res/drawable-xhdpi/vip_center_back_button.png new file mode 100644 index 0000000000000000000000000000000000000000..a3c6b78fb49e172aa4bfe4ac761f009123293284 GIT binary patch literal 1327 zcmV+~1Px(=}AOERCr$PnoVe2RTRhn=e{>@k~Gq!N+iw9G=&C3bt4uMDn+vpG!p3~Ff^Er zq)r6Vnd0)2gt&+t%@7~}2|IfMS-XVmKMSwyMWdb3HiV{K)A&B~<5Go>6M5u@@3uS1H z&>EpNLTlV>7ah19!ONLul%y6Y4H~t*c*Cm}AW$H9X{H;RIssXF8oIFx-FSmKhd%KF zMqof#5OnPu2$6tc07L*|5!&B}=-?|ww_yYV1mDQEK^4;w)N4W5Xa}!DZRw_iefK{I z{$sKolE|Sk+Jm+A3IqZq0jSzAB?iBATMfRq;k-1{1YP?PLL9Cs!5ozdLFYk=AJ2IK z!B-F!2ooS02D5FxY=G%aN+i#E1;IBEoXJS&RlY!za-wDjb2N=nV72%*B?jN~5`upq z3fb==q`o>kG$_DI=_GX~Kld7f=OFlMM!{a?JbMVFc)&8h{zLAZ3`Y%fKusOtgQ@D*GM4jU{|B#If4th*8rRYk*KL58ZjZvqoeg$ z(3DVx;V1|$O8OGF67(8>AO_=|J#!2cN zoZH2?9e>p|5cjl+Zm3}SNjmV-RmW$v!+@@WC@0X1-H@d@5VdTw$r6f24|NUwxx=wL z`kLz?EEt8{3jk+9)KJ@33Sl14UBNo_)1l)9M`yKzV4i>|D`Tn$P0~C{wnj{n08P7w zUt14TpT8}+XCN#X*K;XE#8=R5r*ft;G-ClmJxcM^tsN|;Bd>T0!h(^XIt_u3%s*kC zTbPe^vt?WY)B(R>cn+crBl|iY+H($fRyS7Dy6ZF+@LS6he%Qnp5S0Y_4unY8UGn&7 z6W>5=3!`ciNq&y@57;E*NGjMih_4`OFq#|FxU*)ni3I5SWr`pYqtAG80~QDnH5fp;P64J(G<_V)H(#YAr>ggau81TsAj-W-_A@9ACsDLrftn*^ zIY#k;MOO$^f(8bJ?J8gbk{Go%UDoK#b5H5P0bwbkdM~n=`@sCwjI~(IX~g316CHVQ ztWlLd|1=)Kqx;*e|6}dTZbPW(&Q0h2e_{tFNBE5_1QE2V5h}uO0-+-6S0Kz0p&~*> lY?+lpYlPMat+Ayw{sZE=#8SDDo^AjD002ovPDHLkV1mM^NxuL9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/vip_center_back_button.webp b/app/src/main/res/drawable-xhdpi/vip_center_back_button.webp deleted file mode 100644 index 328efd6551016f3de36b7687b9f35dd96b948d7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1148 zcmWIYbaN|VVPFV%bqWXzu!!JdU|=u+Vn;CYbaoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4K&2Mmlr2nLDC#RU)+RuZV{+ck*V%eq)q;1}dfNi9wWD)|7!Dn&rcfo>83vPIG% zYz+`Q3BtAkvCB&eN`PttK=2?(*InG6iuTNxN6ZXv`}7BDdI zw=ghlJC6`Ugh@eSQ6ktlU~DijrKK@2d|J-Hz#GZHAbf#=fh!s;2PAN~O#vt+19VqD z5T-NaFr+dlFnBWLF(fnS0a-@CNHt_I1IDmVD-#2QzN3SHz;tHqNx9*n>wW(n5>gB3 zAWPnq~d}#38RN7Q)l`X;u8;N21E- zyH=zxWszF8OCn;!sl<&b1q`lHj;%ILqU_DAnp~_5Yz%D-EKN-YF04!wN}_LXG`B9x zy}fPbtd-KY_x%6=B>Md2i*qB@1^=c$*_ONHfKzaW!S=j(STNF+YL}Yd{aC52q;_tbTG-{z zgGM}a&&tf|?{&>Qzw}gcvuoe{ymLAJp`YHL^i^>0Uw-Pbvub^xiE7yGnG-v1{3vos z^E)%G=Jq@-{V?w8gnDPScYfDbFa4Xg|ID3^NsTd;>3Z>Hra>p~1_htwzdPGuU;dmK rFN>ZAhG)&2lK9Eto$QB~kM>Wk_;G*soISy6D?c4*T=!r9y*mQ{MuB10 diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml index 778bbb1cf..a11571747 100644 --- a/app/src/main/res/layout/dialog_user_info.xml +++ b/app/src/main/res/layout/dialog_user_info.xml @@ -36,7 +36,7 @@ android:id="@+id/iv_avatar_bg" android:layout_width="match_parent" android:layout_height="wrap_content" - android:scaleType="fitXY" + android:scaleType="center" android:src="@drawable/default_banner" app:riv_corner_radius_top_left="@dimen/dp_10" app:riv_corner_radius_top_right="@dimen/dp_10" diff --git a/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/HeadlineViewModel.kt b/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/HeadlineViewModel.kt index 49e985be3..4369bdf8e 100644 --- a/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/HeadlineViewModel.kt +++ b/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/HeadlineViewModel.kt @@ -16,8 +16,8 @@ class HeadlineViewModel : BaseViewModel() { safeLaunch(needLoading = true, onError = { sendHeadlineFlow.emit(BeanResult.failed(it)) }) { - PublicChatModel.sendHeadline(message) - sendHeadlineFlow.emit(BeanResult.success(true)) +// PublicChatModel.sendHeadline(message) +// sendHeadlineFlow.emit(BeanResult.success(true)) } } @@ -30,8 +30,8 @@ class HeadlineViewModel : BaseViewModel() { fun getHeadlinePayMoney() { safeLaunch(needLoading = false, onError = { }) { - val value = PublicChatModel.getHeadlinePayMoney() - headlinePayMoneyLiveData.postValue(value) +// val value = PublicChatModel.getHeadlinePayMoney() +// headlinePayMoneyLiveData.postValue(value) } } } \ No newline at end of file diff --git a/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomViewModel.kt b/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomViewModel.kt index 7a11972ad..28a5980e5 100644 --- a/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomViewModel.kt +++ b/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomViewModel.kt @@ -35,8 +35,8 @@ class PublicChatRoomViewModel : BaseViewModel() { fun getCurrentHeadline() { safeLaunch(needLoading = false, onError = { }) { - val value = PublicChatModel.getCurrentHeadline() - updateHeadline(value) +// val value = PublicChatModel.getCurrentHeadline() +// updateHeadline(value) } } diff --git a/core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/model/PublicChatModel.kt b/core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/model/PublicChatModel.kt index 701a80e5b..8218bf529 100644 --- a/core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/model/PublicChatModel.kt +++ b/core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/model/PublicChatModel.kt @@ -12,55 +12,55 @@ import retrofit2.http.GET import retrofit2.http.POST object PublicChatModel : BaseModel() { - private val api = RxNet.create(PublicChatModel.Api::class.java) - - suspend fun getTopMessage(): List? = - launchRequest { - api.getTopMessage() - } - - suspend fun getCurrentHeadline(): HeadlineBean? = - launchRequest { - api.getCurrentHeadline() - } - - suspend fun sendHeadline(message: String): Any? = - launchRequest { - api.sendHeadline(message) - } - - suspend fun getHeadlinePayMoney(): Long? = - launchRequest { - api.getHeadlinePayMoney() - } - - interface Api { - - /** - * 获取前几条数据 - */ - @GET("publicChatTopRecord/getChatForTop50") - suspend fun getTopMessage(): ServiceResult> - - /** - * 获取头条 - */ - @GET("publicChatTopRecord/getTop") - suspend fun getCurrentHeadline(): ServiceResult - - /** - * 发送头条 - * - * @return - */ - @FormUrlEncoded - @POST("publicChatTopRecord/send") - suspend fun sendHeadline(@Field("content") content: String): ServiceResult - - /** - * 获取头条支付金额 - */ - @GET("publicChatTopRecord/payMoney") - suspend fun getHeadlinePayMoney(): ServiceResult - } +// private val api = RxNet.create(PublicChatModel.Api::class.java) +// +// suspend fun getTopMessage(): List? = +// launchRequest { +//// api.getTopMessage() +// } +// +// suspend fun getCurrentHeadline(): HeadlineBean? = +// launchRequest { +// api.getCurrentHeadline() +// } +// +// suspend fun sendHeadline(message: String): Any? = +// launchRequest { +// api.sendHeadline(message) +// } +// +// suspend fun getHeadlinePayMoney(): Long? = +// launchRequest { +// api.getHeadlinePayMoney() +// } +// +// interface Api { +// +// /** +// * 获取前几条数据 +// */ +// @GET("publicChatTopRecord/getChatForTop50") +// suspend fun getTopMessage(): ServiceResult> +// +// /** +// * 获取头条 +// */ +// @GET("publicChatTopRecord/getTop") +// suspend fun getCurrentHeadline(): ServiceResult +// +// /** +// * 发送头条 +// * +// * @return +// */ +// @FormUrlEncoded +// @POST("publicChatTopRecord/send") +// suspend fun sendHeadline(@Field("content") content: String): ServiceResult +// +// /** +// * 获取头条支付金额 +// */ +// @GET("publicChatTopRecord/payMoney") +// suspend fun getHeadlinePayMoney(): ServiceResult +// } } \ No newline at end of file