From 20ab9bd5401ab9663e66ebd669c612e34194d1ce Mon Sep 17 00:00:00 2001 From: huangjian Date: Thu, 14 Apr 2022 16:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E6=92=AD=E7=B2=89=E4=B8=9D=E5=9B=A2?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E7=B2=89=E4=B8=9D=E5=9B=A2=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/fansteam/FansTeamJoinActivity.kt | 73 +++++++++++-------- .../res/layout/activity_fans_team_join.xml | 24 +++--- .../fansteam/PrivilegeConfigVo.kt | 2 +- .../xchat_android_core/gift/GiftModel.java | 22 +++++- 4 files changed, 75 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt index 8d68d8057..58f869412 100644 --- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt @@ -29,7 +29,7 @@ class FansTeamJoinActivity : BaseViewBindingActivity - binding.tvNameplateTitle.text = privilegeConfig.name - binding.tvNameplateDesc.text = privilegeConfig.description - binding.ivFansNameplate.load(privilegeConfig.icon) - } + it.privilegeConfigVos.find { configVo -> configVo.type == 1 } + ?.let { privilegeConfig -> + binding.tvNameplateTitle.text = privilegeConfig.name + binding.tvNameplateDesc.text = privilegeConfig.description + binding.ivFansNameplate.load(privilegeConfig.icon) + } - it.privilegeConfigVos.getOrNull(1)?.let { privilegeConfig -> - binding.tvGiftTitle.text = privilegeConfig.name - binding.tvGiftDesc.text = privilegeConfig.description - binding.ivFansGift.load(privilegeConfig.icon) - } + it.privilegeConfigVos.find { configVo -> configVo.type == 2 } + ?.let { privilegeConfig -> + binding.tvGiftTitle.text = privilegeConfig.name + binding.tvGiftDesc.text = privilegeConfig.description + binding.ivFansGift.load(privilegeConfig.icon) + } - it.privilegeConfigVos.getOrNull(2)?.let { privilegeConfig -> - binding.ivJoinLogo.load(privilegeConfig.icon) - binding.tvJoin.text = privilegeConfig.name - binding.tvJoin.setOnClickListener { - privilegeConfig.giftVo?.let { giftInfo -> - GiftModel.get().sendFansTeamGift( - giftInfo.giftId, - AvRoomDataManager.get().roomUid.toString(), - ) - .compose(bindToLifecycle()) - .handleBeanData() - .subscribe({ - "加入粉丝团成功!".toast() - finish() - }, { t -> - t.message.toast() - }) + it.privilegeConfigVos.find { configVo -> configVo.type == 3 } + ?.let { privilegeConfig -> + binding.ivJoinLogo.load(privilegeConfig.icon) + binding.tvJoin.text = privilegeConfig.name + binding.tvJoin.setOnClickListener { + privilegeConfig.giftVo?.let { giftInfo -> + GiftModel.get().sendFansTeamGift( + giftInfo.giftId, + AvRoomDataManager.get().roomUid.toString(), + ) + .compose(bindToLifecycle()) + .handleBeanData() + .subscribe({ + "加入粉丝团成功!".toast() + finish() + }, { t -> + t.message.toast() + }) - } ?: run { - "数据初始化中,请稍后~".toast() + } ?: run { + "数据初始化中,请稍后~".toast() + } } } - } } } diff --git a/app/src/main/res/layout/activity_fans_team_join.xml b/app/src/main/res/layout/activity_fans_team_join.xml index 4402560cb..8ec9a56a1 100644 --- a/app/src/main/res/layout/activity_fans_team_join.xml +++ b/app/src/main/res/layout/activity_fans_team_join.xml @@ -140,24 +140,24 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:text="粉丝专属铭牌" android:textColor="#ff333333" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@id/tv_nameplate_desc" app:layout_constraintStart_toEndOf="@id/iv_fans_nameplate" app:layout_constraintTop_toTopOf="@id/iv_fans_nameplate" - app:layout_constraintVertical_chainStyle="packed" /> + app:layout_constraintVertical_chainStyle="packed" + tools:text="粉丝专属铭牌" /> + app:layout_constraintTop_toBottomOf="@id/tv_nameplate_title" + tools:text="为你的TA争取独特的标志" /> + app:layout_constraintVertical_chainStyle="packed" + tools:text="专属礼物" /> + app:layout_constraintTop_toBottomOf="@id/tv_gift_title" + tools:text="送给爱的TA为爱发电（每日10个）" /> + app:layout_constraintTop_toTopOf="@id/bg_join" + tools:text="送入团礼物加入主播粉丝团（10钻）" /> + app:layout_constraintStart_toStartOf="@id/bg_join" + tools:src="@drawable/fans_team_ic_join_logo" /> diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt b/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt index 386e18c13..9e341cdad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt +++ b/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt @@ -12,6 +12,6 @@ data class PrivilegeConfigVo( val privilegeId: Int = 0, val seq: Int = 0, val status: Int = 0, - val type: Int = 0, + val type: Int = 0,//特权类型 1铭牌 2专属礼物 3入团礼物 val giftVo: GiftInfo? = null ) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java index 06f7c12c8..9adb93447 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java @@ -570,9 +570,9 @@ public class GiftModel extends BaseModel implements IGiftModel { @Override public Single> sendFansTeamGift(int giftId, String targetUid) { - return api.sendGift(AuthModel.get().getCurrentUid(), + return api.sendJoinFansGift(AuthModel.get().getCurrentUid(), targetUid, - null, + String.valueOf(AvRoomDataManager.get().getRoomUid()), giftId, 1, "", @@ -623,6 +623,24 @@ public class GiftModel extends BaseModel implements IGiftModel { @Field("giftSource") int giftSource, @Field("chatSessionId") String chatSessionId); + /** + * 送加入粉丝团礼物 + * + * @return + */ + @POST("/anchorFansTeam/sendJoinTeamGift") + @FormUrlEncoded + Single> sendJoinFansGift( + @Field("uid") long uid, + @Field("targetUids") String targetUids, + @Field("roomUid") String roomUid, + @Field("giftId") int giftId, + @Field("giftNum") int giftNum, + @Field("msg") String msg, + @Field("sendType") int sendType, + @Field("giftSource") int giftSource, + @Field("chatSessionId") String chatSessionId); + } private static class UiHandler extends Handler {