moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 幸运礼包 UI

Browse Source
This commit is contained in:
eggmanQQQ
2025-02-07 17:00:39 +08:00
parent db2194fe02
commit a542955da2
31 changed files with 1163 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/common/res/drawable/shape_black_t20_17.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:radius="17dp"
/>
<solid
android:color="@color/black_transparent_20"
/>
</shape>

85
app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagBiliDialog.kt Normal file
View File

@@ -0,0 +1,85 @@
package com.chwl.app.avroom.dialog
import android.view.Gravity
import android.view.WindowManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chwl.app.R
import com.chwl.app.base.BaseDialogFragment
import com.chwl.app.bindadapter.BaseBindingAdapter
import com.chwl.app.bindadapter.BaseBindingViewHolder
import com.chwl.app.databinding.DialogRoomLuckyBagBiliBinding
import com.chwl.app.databinding.ItemRoomLuckyBagBiliBinding
import com.chwl.app.ui.utils.load
import com.chwl.core.user.UserModel
import com.chwl.library.common.util.ClickUtils.click
import com.chwl.library.common.util.toColor
import com.chwl.library.widget.text.DrawableTextView
import com.example.lib_utils.ktx.getColor
class RoomLuckyBagBiliDialog : BaseDialogFragment<DialogRoomLuckyBagBiliBinding>() {
override var width = WindowManager.LayoutParams.MATCH_PARENT
override var height = WindowManager.LayoutParams.WRAP_CONTENT
override var dimAmount = 0f
override var gravity = Gravity.CENTER
private lateinit var mAdapter : RoomLuckyBagBiliAdapter
override fun init() {
mAdapter = RoomLuckyBagBiliAdapter()
mAdapter.setOnLoadMoreListener({
},binding.rvList)
binding.rvList.adapter = mAdapter
binding.rvList.layoutManager = LinearLayoutManager(context,RecyclerView.VERTICAL,false)
UserModel.get().cacheLoginUserInfo?.let {
binding.avatar.load(it.avatar)
binding.nick.text = it.nick
}
binding.btnBack.click {
dismiss()
}
binding.btnReceived.click {
changeBtn(binding.btnReceived,true)
changeBtn(binding.btnSent,false)
}
binding.btnSent.click {
changeBtn(binding.btnSent,true)
changeBtn(binding.btnReceived,false)
}
}
private fun changeBtn(text: DrawableTextView, select: Boolean) {
if (select) {
text.changeGradientColor("#FF9F00".toColor(), -1, "#FFF437".toColor())
text.setTextColor(R.color.color_292601.getColor())
} else {
text.changeGradientColor("#00FF9F00".toColor(),-1,"#00FFF437".toColor())
text.setTextColor(R.color.color_FFEA5C.getColor())
}
}
class RoomLuckyBagBiliAdapter : BaseBindingAdapter<ItemRoomLuckyBagBiliBinding, String>() {
override fun convert(
helper: BaseBindingViewHolder<ItemRoomLuckyBagBiliBinding>,
item: String
) {
}
}
}

287
app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt
View File

@@ -1,35 +1,237 @@
package com.chwl.app.avroom.dialog
import android.view.Gravity
import android.view.View
import android.view.WindowManager
import androidx.core.widget.doOnTextChanged
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chwl.app.R
import com.chwl.app.base.BaseDialogFragment
import com.chwl.app.bindadapter.BaseBindingAdapter
import com.chwl.app.bindadapter.BaseBindingViewHolder
import com.chwl.app.databinding.DialogRoomLuckyBagBinding
import com.chwl.app.databinding.ItemRoomLuckyBagGiftBinding
import com.chwl.app.databinding.ItemRoomLuckyBagGoldBinding
import com.chwl.app.databinding.ItemRoomLuckyBagTimeBinding
import com.chwl.app.databinding.ItemRoomLuckyBagViewOthersBinding
import com.chwl.app.ui.utils.loadImage
import com.chwl.core.gift.GiftModel
import com.chwl.core.gift.bean.GiftType
import com.chwl.core.gift.bean.LuckyBagGift
import com.chwl.core.gift.bean.LuckyBagGold
import com.chwl.core.gift.bean.LuckyBagTime
import com.chwl.core.gift.bean.LuckyBagViewOthers
import com.example.lib_utils.ktx.getDimension
import com.chwl.core.widget.layoutmanager.pagergridlayoutmanager.PagerGridLayoutManager
import com.chwl.library.common.util.ClickUtils.click
import com.chwl.library.common.util.setMargin
import com.chwl.library.common.util.setViewWH
import com.chwl.library.common.util.setVis
import com.chwl.library.common.util.toColor
import com.chwl.library.common.util.toDP
import com.example.lib_utils.ktx.getColor
import com.example.lib_utils.ktx.getString
import com.example.lib_utils.ktx.setPadding2
class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {
override var width = WindowManager.LayoutParams.MATCH_PARENT
override var height = R.dimen.dp_323.getDimension().toInt()
override var height = WindowManager.LayoutParams.WRAP_CONTENT
override var dimAmount = 0f
override var gravity = Gravity.BOTTOM
private lateinit var mGiftAdapter : GiftAdapter
private lateinit var mGiftTimeAdapter : NumberItemAdapter
private lateinit var mGoldAdapter : GoldAdapter
private lateinit var mGoldNumAdapter : NumberItemAdapter
private lateinit var mGoldTimeAdapter : NumberItemAdapter
private var mGiftData = mutableListOf<LuckyBagGift>()
private var mGiftDataSelect = mutableListOf<LuckyBagGift>()
private var mIsGift = true
private var mIsGiftReview = false
override fun init() {
mGiftAdapter = GiftAdapter()
mGiftAdapter.onItemChildClickListener = object : BaseQuickAdapter.OnItemChildClickListener {
override fun onItemChildClick(
adapter: BaseQuickAdapter<*, *>?,
view: View?,
position: Int
) {
view?.let {
when (it.id) {
R.id.up -> {
}
R.id.down -> {
}
else -> {}
}
}
}
}
binding.rvListGiftType.layoutManager = PagerGridLayoutManager(2,4,PagerGridLayoutManager.HORIZONTAL,false).apply {
setPagerChangedListener(object : PagerGridLayoutManager.PagerChangedListener {
override fun onPagerCountChanged(pagerCount: Int) {
}
override fun onPagerIndexSelected(prePagerIndex: Int, currentPagerIndex: Int) {
}
})
}
binding.rvListGiftType.adapter = mGiftAdapter
mGiftTimeAdapter = NumberItemAdapter()
mGiftAdapter.onItemClickListener = object : BaseQuickAdapter.OnItemClickListener {
override fun onItemClick(adapter: BaseQuickAdapter<*, *>?, view: View?, position: Int) {
mGiftTimeAdapter.select(position)
}
}
binding.rvListGiftTime.layoutManager = LinearLayoutManager(context,RecyclerView.HORIZONTAL,false)
binding.rvListGiftTime.adapter = mGiftTimeAdapter
//--金币礼包
mGoldAdapter = GoldAdapter()
mGoldAdapter.onItemClickListener = object : BaseQuickAdapter.OnItemClickListener {
override fun onItemClick(adapter: BaseQuickAdapter<*, *>?, view: View?, position: Int) {
mGoldAdapter.select(position)
}
}
binding.rvListGoldType.layoutManager = LinearLayoutManager(context,RecyclerView.HORIZONTAL,false)
binding.rvListGoldType.adapter = mGoldAdapter
mGoldNumAdapter = NumberItemAdapter()
mGoldNumAdapter.onItemClickListener = object : BaseQuickAdapter.OnItemClickListener {
override fun onItemClick(adapter: BaseQuickAdapter<*, *>?, view: View?, position: Int) {
mGoldNumAdapter.select(position)
}
}
binding.rvListGoldNum.layoutManager = LinearLayoutManager(context,RecyclerView.HORIZONTAL,false)
binding.rvListGoldNum.adapter = mGoldNumAdapter
mGoldTimeAdapter = NumberItemAdapter()
mGoldTimeAdapter.onItemClickListener = object : BaseQuickAdapter.OnItemClickListener {
override fun onItemClick(adapter: BaseQuickAdapter<*, *>?, view: View?, position: Int) {
mGoldTimeAdapter.select(position)
}
}
binding.rvListGiftTime.layoutManager = LinearLayoutManager(context,RecyclerView.HORIZONTAL,false)
binding.rvListGiftTime.adapter = mGoldTimeAdapter
val giftInfoList = GiftModel.get().getGiftInfoList(GiftType.GIFT_TYPE_NORMAL)
giftInfoList.forEach {
mGiftData.add(LuckyBagGift()).apply {
}
}
binding.bgGiftBag.click {
tabChange(true)
}
binding.bgGoldBag.click {
tabChange(false)
}
tabChange(true)
binding.btnConfirm.click {
}
}
private fun tabChange(isGift:Boolean) {
if (isGift) {
binding.bgGoldBag.setBackgroundResource(R.drawable.anim_match)
binding.bgGiftBag.setBackgroundResource(R.drawable.anim_match)
binding.giftBagLayout.setVis(true,true)
binding.goldBagLayout.setVis(false, true)
mIsGift = true
changeViewStatus()
} else {
binding.bgGoldBag.setBackgroundResource(R.drawable.anim_match)
binding.bgGiftBag.setBackgroundResource(R.drawable.anim_match)
binding.goldBagLayout.setVis(true,true)
binding.giftBagLayout.setVis(false,true)
mIsGift = false
changeViewStatus()
}
binding.btnConfirm.text = if (mIsGift) R.string._ver_24_Send_Gift_Lucky_Bag.getString() else R.string._ver_24_Send_Coin_Lucky_Bag.getString()
}
private fun changeViewStatus() {
if (mIsGift && !mIsGiftReview) {
showGiftSelect()
}else if (mIsGift && mIsGiftReview) {
showGiftReview()
} else {
showGoldSelect()
}
}
private fun showGiftSelect() {
binding.giftBagLayout.setVis(true)
binding.goldBagLayout.setVis(false)
binding.groupGiftSelect.setVis(true)
binding.groupReViewGift.setVis(false)
binding.flListGiftTypeLayout.setMargin(top = 37)
binding.flListGiftTypeLayout.setViewWH(height = 282)
binding.bottomSpace.setVis(true)
binding.userGold.setVis(true)
binding.redBagDesc.setPadding2(bottom = 0.toDP())
mGiftAdapter.setNewData(mGiftData)
}
private fun showGiftReview() {
binding.giftBagLayout.setVis(true)
binding.goldBagLayout.setVis(false)
binding.groupReViewGift.setVis(true)
binding.groupGiftSelect.setVis(false)
binding.flListGiftTypeLayout.setMargin(top = 83)
binding.flListGiftTypeLayout.setViewWH(height = 282)
binding.bottomSpace.setVis(false)
binding.userGold.setVis(false)
binding.redBagDesc.setPadding2(bottom = 0.toDP())
mGiftAdapter.setNewData(mGiftDataSelect)
}
private fun showGoldSelect() {
binding.goldBagLayout.setVis(true)
binding.giftBagLayout.setVis(false)
binding.bottomSpace.setVis(true)
binding.userGold.setVis(true)
binding.redBagDesc.setPadding2(bottom = 20.toDP())
}
private class GiftAdapter : BaseBindingAdapter<ItemRoomLuckyBagGiftBinding, LuckyBagGift>() {
@@ -38,21 +240,96 @@ class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {
helper: BaseBindingViewHolder<ItemRoomLuckyBagGiftBinding>,
item: LuckyBagGift
) {
helper?.binding?.let {
it.gift.loadImage(item.giftPic)
it.giftName.text = item.giftName
it.gold.text = item.giftPrice.toString()
it.etNum.setText(item.count.toString())
it.giftCount.text = item.count.toString()
it.etNum.doOnTextChanged { text, start, before, count ->
item.count = text?.toString()?.toInt()?:0
it.giftCount.text = item.count.toString()
}
helper.addOnClickListener(R.id.up)
helper.addOnClickListener(R.id.down)
if (item.isReView) {
it.selectViews.setVis(false)
it.giftCount.setVis(true)
} else {
it.selectViews.setVis(true)
it.giftCount.setVis(false)
}
}
}
}
private class TimeAdapter : BaseBindingAdapter<ItemRoomLuckyBagTimeBinding, LuckyBagTime>() {
private class NumberItemAdapter : BaseBindingAdapter<ItemRoomLuckyBagTimeBinding, LuckyBagTime>() {
public fun select(pos:Int) {
data?.forEachIndexed { index, luckyBagGold ->
luckyBagGold.isSelect = index == pos
}
notifyDataSetChanged()
}
override fun convert(
helper: BaseBindingViewHolder<ItemRoomLuckyBagTimeBinding>,
item: LuckyBagTime
) {
helper?.binding?.let {
it.number.text = item.time.toString()
if (item.isSelect()) {
it.number.changeGradientColor("#ff9f00".toColor(),-1,"#fff437".toColor())
it.number.changeStrikeColor("#00ffd168".toColor())
it.number.setTextColor(R.color.color_FFEA5C.getColor())
} else {
it.number.changeGradientColor("#610015".toColor(),-1,"#97000c".toColor())
it.number.changeStrikeColor("#ffd168".toColor())
it.number.setTextColor(R.color.color_292601.getColor())
}
}
}
}
private class GoldAdapter : BaseBindingAdapter<ItemRoomLuckyBagGoldBinding, LuckyBagGold>(){
public fun select(pos:Int) {
data?.forEachIndexed { index, luckyBagGold ->
luckyBagGold.isSelect = index == pos
}
notifyDataSetChanged()
}
override fun convert(
helper: BaseBindingViewHolder<ItemRoomLuckyBagGoldBinding>,
item: LuckyBagGold
) {
helper?.binding?.let {
if (item.isSelect()) {
it.goldBg.changeGradientColor("#ff9f00".toColor(),-1,"#fff437".toColor())
it.goldBg.changeStrikeColor("#00ffd168".toColor())
it.gold.setTextColor(R.color.color_FFEA5C.getColor())
} else {
it.goldBg.changeGradientColor("#610015".toColor(),-1,"#97000c".toColor())
it.goldBg.changeStrikeColor("#ffd168".toColor())
it.gold.setTextColor(R.color.color_292601.getColor())
}
}
}
}
}

153
app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt
View File

@@ -1,16 +1,27 @@
package com.chwl.app.avroom.dialog
import android.content.DialogInterface
import android.view.Gravity
import android.view.View
import android.view.WindowManager
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.chwl.app.R
import com.chwl.app.base.BaseDialogFragment
import com.chwl.app.bindadapter.BaseBindingAdapter
import com.chwl.app.bindadapter.BaseBindingViewHolder
import com.chwl.app.databinding.DialogRoomLuckyBagOpenBinding
import com.chwl.app.databinding.ItemRoomLuckyBagViewOthersBinding
import com.chwl.app.ui.utils.loadImage
import com.chwl.core.gift.bean.LuckyBagViewOthers
import com.chwl.library.common.util.ClickUtils.click
import com.chwl.library.common.util.setViewWH
import com.chwl.library.common.util.setVis
import com.example.lib_utils.ktx.getString
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
class RoomLuckyBagOpenDialog : BaseDialogFragment<DialogRoomLuckyBagOpenBinding>() {
@@ -22,59 +33,121 @@ class RoomLuckyBagOpenDialog : BaseDialogFragment<DialogRoomLuckyBagOpenBinding>
private var mAdapter : ViewOtherAdapter ? = null
var isGift = true
private var isOpen = false
private var mTimeJop : Job?=null
override fun init() {
mAdapter = ViewOtherAdapter()
binding.rvListViewOthers.adapter = mAdapter
binding.rvListViewOthers.layoutManager = LinearLayoutManager(context,RecyclerView.VERTICAL,false)
binding.viewOthers.click {
viewOthers()
}
binding.confirm.click {
if (isOpen) {
doOpenBag()
} else {
dismiss()
}
}
if (isGift) {
binding.bagImg.setImageResource(R.drawable.anim_match)
} else {
binding.bagImg.setImageResource(R.drawable.anim_match)
}
}
private fun doOpenBag() {
}
private fun timeDown() {
def()
binding.viewOthers.setVis(true)
binding.bagImg.setVis(true)
binding.time.setVis(true)
binding.comingHint.setVis(true)
binding.comingHint.text = R.string._ver_24_luckBagOpenHint.getString()
startTimeDown(10)
}
private fun startTimeDown(time:Int) {
mTimeJop?.cancel()
mTimeJop = lifecycleScope.launch {
var t = 0
while (t < time) {
binding.time.text = "00:00"
delay(1000)
t++
}
}
}
private fun ready() {
def()
binding.bagImg.setVis(true)
binding.confirm.text = R.string._ver_24_Click_Open.getString()
isOpen = true
}
private fun open() {
def()
if (isGift) {
binding.viewOthers.setVis(true)
binding.giftName.setVis(true)
binding.giftNum.setVis(true)
binding.giftImg.setVis(true)
binding.giftName.text = "礼物名"
binding.giftNum.text = "x0"
binding.giftImg.loadImage("")
} else {
binding.gold.setVis(true)
binding.gold.text = "0"
}
}
private fun showEmpty() {
def()
binding.viewOthers.setVis(true)
binding.bagImg.setVis(true)
binding.comingHint.setVis(true)
binding.comingHint.text = R.string._ver_24_luckBagOpen_Empty.getString()
}
private fun viewOthers() {
def()
binding.viewOthersHint.setVis(true)
binding.rvListViewOthers.setVis(true)
binding.bg.setViewWH(height = 414)
// binding.bg.setImageResource()
mAdapter = ViewOtherAdapter()
binding.rvListViewOthers.adapter = mAdapter
}
private fun open() {
def()
binding.viewOthers.setVis(true)
binding.giftImg.setVis(true)
binding.giftName.setVis(true)
binding.giftName.setVis(true)
binding.gold.setVis(true)
}
private fun ready() {
def()
binding.bagImg.setVis(true)
}
private fun timeDown() {
def()
binding.viewOthers.setVis(true)
binding.bagImg.setVis(true)
binding.time.setVis(true)
}
private fun showEmpty() {
def()
binding.viewOthers.setVis(true)
binding.bagImg.setVis(true)
binding.comingHint.setVis(true)
}
private fun def() {
binding.viewOthers.visibility = View.INVISIBLE
@@ -88,6 +161,14 @@ class RoomLuckyBagOpenDialog : BaseDialogFragment<DialogRoomLuckyBagOpenBinding>
binding.rvListViewOthers.visibility = View.INVISIBLE
binding.viewOthersHint.visibility = View.INVISIBLE
binding.bg.setViewWH(height = 326)
binding.confirm.text = R.string.ok.getString()
}
override fun onDismiss(dialog: DialogInterface) {
super.onDismiss(dialog)
mTimeJop?.cancel()
}

2
app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
View File

@@ -1967,7 +1967,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
mIvQueuingMicro?.setVis(false)
}
btnFold.setVis((AvRoomDataManager.get().is19Room || AvRoomDataManager.get().is20Room))
btnFold.setVis((AvRoomDataManager.get().is19Room || AvRoomDataManager.get().is20Room|| AvRoomDataManager.get().isGameRoom))
floatBtnLayoutFold.setViewWH(
height = if (btnFold.isVisible) 1 else ViewGroup.LayoutParams.WRAP_CONTENT,
isDP = false

17
app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt
View File

@@ -5,9 +5,11 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.FrameLayout
import com.chwl.app.databinding.ViewLuckyBagBtnBinding
import com.chwl.library.common.util.ClickUtils.click
import com.chwl.library.common.util.setVis
class LuckyBagBtn : FrameLayout{
constructor(context: Context) : super(context){initView(context)}
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs){initView(context)}
@@ -16,10 +18,23 @@ class LuckyBagBtn : FrameLayout{
private fun initView(context: Context) {
mBinding = ViewLuckyBagBtnBinding.inflate(LayoutInflater.from(context),this,true)
mBinding.number.setBgColor("#f33a49")
click {
onClick()
}
}
private fun onClick() {
}
private fun upDateView() {
mBinding.number.text = 11.toString()
mBinding.number.setVis(true)
mBinding.number.setBgColor("#f33a49")
}

28
app/src/main/java/com/chwl/app/avroom/widget/MessageView.java
View File

@@ -22,6 +22,7 @@ import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_
import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FANS_TEAM_JOIN;
import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_GIFT_COMPOUND;
import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUPER_LUCKY_GIFT_TEMPLATE;
import static com.chwl.core.im.custom.bean.CustomAttachment.ROOM_LUCKY_BAG_FIRST;
import static com.chwl.core.redpackage.RedPackageTypeKt.ALL_DIAMOND;
import static com.chwl.core.redpackage.RedPackageTypeKt.ALL_GIFT;
import static com.chwl.core.redpackage.RedPackageTypeKt.ROOM_DIAMOND;
@@ -176,6 +177,7 @@ import com.chwl.core.utils.extension.StringExtensionKt;
import com.chwl.core.utils.net.DontWarnObserver;
import com.chwl.core.utils.net.RxHelper;
import com.chwl.core.vip.bean.VipMessageInfo;
import com.chwl.core.widget.img.MyCircleImageView;
import com.chwl.library.common.util.OtherExtKt;
import com.chwl.library.common.util.Utils;
import com.chwl.library.rxbus.RxBus;
@@ -786,6 +788,13 @@ public class MessageView extends FrameLayout {
.inflate(R.layout.layout_msg_view_holder_room_album, parent, false));
}
if (viewType == ROOM_LUCKY_BAG_FIRST) {
return new MessageViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.layout_msg_view_holder_room_lucky_bag, parent, false));
}
return new MessageViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_item_chatrrom_msg, parent, false));
}
@@ -1050,6 +1059,8 @@ public class MessageView extends FrameLayout {
setFairyMsg(chatRoomMessage, tvContent);
} else if (first == CUSTOM_MSG_ROOM_ALBUM) {
setRoomAlbumMsg(chatRoomMessage, baseViewHolder);
} else if (first == ROOM_LUCKY_BAG_FIRST) {
setLuckyBagMsg(chatRoomMessage, baseViewHolder);
} else if (first == CUSTOM_MSG_ROOM_TEMPLATE) {
TemplateMessageAttachment templateMessageAttachment = (TemplateMessageAttachment) chatRoomMessage.getAttachment();
if (templateMessageAttachment != null) {
@@ -1160,6 +1171,23 @@ public class MessageView extends FrameLayout {
tvUnlock.setOnClickListener(v -> unlockRoomPhoto(baseViewHolder.getAbsoluteAdapterPosition(), roomPhoto));
}
//----幸运礼包消息
private void setLuckyBagMsg(ChatRoomMessage chatRoomMessage, MessageViewHolder baseViewHolder) {
RoomAlbumAttachment attachment = (RoomAlbumAttachment) chatRoomMessage.getAttachment();
RoomAlbumMsgInfo mRoomAlbumMsgInfo = attachment.getMRoomAlbumMsgInfo();
if (mRoomAlbumMsgInfo == null) {
return;
}
ImageView luckyBagBg = baseViewHolder.itemView.findViewById(R.id.bg);
MyCircleImageView luckyBagAvatar = baseViewHolder.itemView.findViewById(R.id.avatar);
TextView luckyBagNick = baseViewHolder.itemView.findViewById(R.id.nick);
TextView luckyBagContent = baseViewHolder.itemView.findViewById(R.id.content);
}
private void unlockRoomPhoto(int position, RoomPhoto roomPhoto) {
UnlockRoomAlbumPhotoDialog unlockRoomAlbumPhotoDialog = UnlockRoomAlbumPhotoDialog.Companion
.newInstance(roomPhoto.getId(), roomPhoto.getGiftUrl(), roomPhoto.getGiftName(), roomPhoto.getTotalGoldPrice());

5
app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt
View File

@@ -4,11 +4,11 @@ import android.view.View
import android.widget.TextView
import androidx.fragment.app.Fragment
import com.chwl.app.BuildConfig
import com.chwl.app.DemoActivity
import com.chwl.app.R
import com.chwl.app.application.IReportConstants
import com.chwl.app.application.ReportManager
import com.chwl.app.avroom.adapter.CommonVPAdapter
import com.chwl.app.avroom.dialog.RoomLuckyBagDialog
import com.chwl.app.base.BaseViewBindingFragment
import com.chwl.app.databinding.FragmentHomeBinding
import com.chwl.app.home.adapter.HomeIndicatorAdapter
@@ -42,7 +42,8 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>(), View.OnClic
context?.let {
DemoActivity.start(it)
// DemoActivity.start(it)
RoomLuckyBagDialog().show(it)
// GiftDialog(it,3224,false,false,false).show()

2
app/src/main/java/com/chwl/app/ui/webview/baishun/BaiShunGameWebFragment.kt
View File

@@ -158,7 +158,7 @@ class BaiShunGameWebFragment : BaseViewBindingFragment<RoomGameFragmentBinding>(
//设置可访问本地⽂件
settings?.allowFileAccess = true
//设置允许通过file url加载的Javascript读取全部资源(包括⽂件,http,https)
settings?.allowUniversalAccessFromFileURLs = true
settings?.allowUniversalAccessFromFileURLs = false
//设置优先加载缓存
settings?.cacheMode = WebSettings.LOAD_CACHE_ELSE_NETWORK
//设置启⽤HTML5 DOM storage

2
app/src/main/java/com/chwl/app/ui/webview/baishun/LeaderccGameWebFragment.kt
View File

@@ -155,7 +155,7 @@ class LeaderccGameWebFragment : BaseViewBindingFragment<RoomGameFragmentBinding>
//设置可访问本地⽂件
settings?.allowFileAccess = true
//设置允许通过file url加载的Javascript读取全部资源(包括⽂件,http,https)
settings?.allowUniversalAccessFromFileURLs = true
settings?.allowUniversalAccessFromFileURLs = false
//设置优先加载缓存
settings?.cacheMode = WebSettings.LOAD_CACHE_ELSE_NETWORK
//设置启⽤HTML5 DOM storage

180
app/src/main/res/layout/dialog_room_lucky_bag.xml
View File

@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/black"
android:orientation="vertical"
tools:background="@color/black">
@@ -14,7 +15,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="650dp"
android:layout_marginTop="-43dp"
android:orientation="vertical">
@@ -27,50 +28,58 @@
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/bgGiftPack"
android:id="@+id/bgGiftBag"
android:layout_width="0dp"
android:layout_height="47dp"
android:layout_marginStart="9dp"
app:layout_constraintEnd_toStartOf="@id/bgGoldPack"
app:layout_constraintEnd_toStartOf="@id/bgGoldBag"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/btnGiftPack"
android:id="@+id/btnGiftBag"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:text="@string/_ver_24_Gift_Lucky_Bag"
android:textColor="@color/color_FFEA5C"
app:layout_constraintBottom_toBottomOf="@+id/bgGiftPack"
app:layout_constraintEnd_toEndOf="@+id/bgGiftPack"
app:layout_constraintStart_toStartOf="@+id/bgGiftPack"
app:layout_constraintTop_toTopOf="@+id/bgGiftPack"
tools:text="111111" />
app:layout_constraintBottom_toBottomOf="@+id/bgGiftBag"
app:layout_constraintEnd_toEndOf="@+id/bgGiftBag"
app:layout_constraintStart_toStartOf="@+id/bgGiftBag"
app:layout_constraintTop_toTopOf="@+id/bgGiftBag" />
<ImageView
android:id="@+id/bgGoldPack"
android:id="@+id/bgGoldBag"
android:layout_width="0dp"
android:layout_height="47dp"
android:layout_marginEnd="9dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bgGiftPack"
app:layout_constraintTop_toTopOf="@+id/bgGiftPack" />
app:layout_constraintStart_toEndOf="@id/bgGiftBag"
app:layout_constraintTop_toTopOf="@+id/bgGiftBag" />
<TextView
android:id="@+id/btnGoldPack"
android:id="@+id/btnGoldBag"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:text="@string/_ver_24_Coin_Lucky_Bag"
android:textColor="@color/color_FFEA5C"
app:layout_constraintBottom_toBottomOf="@+id/bgGoldPack"
app:layout_constraintEnd_toEndOf="@+id/bgGoldPack"
app:layout_constraintStart_toStartOf="@+id/bgGoldPack"
app:layout_constraintTop_toTopOf="@+id/bgGoldPack"
tools:text="2222" />
app:layout_constraintBottom_toBottomOf="@+id/bgGoldBag"
app:layout_constraintEnd_toEndOf="@+id/bgGoldBag"
app:layout_constraintStart_toStartOf="@+id/bgGoldBag"
app:layout_constraintTop_toTopOf="@+id/bgGoldBag" />
<ImageView
android:layout_width="62dp"
android:layout_height="31dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -78,13 +87,13 @@
<FrameLayout
android:id="@+id/centerLayout"
android:layout_width="match_parent"
android:paddingBottom="16dp"
android:layout_height="wrap_content"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/bottomLayout"
app:layout_constraintTop_toBottomOf="@id/topLayout">
<!-- 礼物红包布局-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/giftPackLayout"
android:id="@+id/giftBagLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
@@ -93,8 +102,8 @@
<LinearLayout
android:id="@+id/lineGiftType"
android:layout_width="match_parent"
android:layout_marginTop="9dp"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:gravity="center_horizontal|center_vertical"
app:layout_constraintTop_toTopOf="parent">
@@ -118,20 +127,69 @@
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvListGiftType"
<FrameLayout
android:id="@+id/flListGiftTypeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
app:layout_constraintTop_toBottomOf="@id/lineGiftType" />
android:layout_height="282dp"
android:layout_marginTop="37dp"
app:layout_constraintTop_toTopOf="parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvListGiftType"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</FrameLayout>
<com.youth.banner.indicator.CircleIndicator
android:id="@+id/giftIndicator"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:layout_marginTop="5dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/flListGiftTypeLayout" />
<TextView
android:id="@+id/reviewTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:text="@string/_ver_24_reviewTime"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/flListGiftTypeLayout"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/btnModify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:drawablePadding="3.5dp"
android:text="@string/text_modify"
android:textColor="@color/color_FFEA5C"
android:textSize="12sp"
android:visibility="gone"
app:dt_drawableRightHeight="11dp"
app:dt_drawableRightSrc="@drawable/ic_login_next"
app:dt_drawableRightWidth="11dp"
app:layout_constraintEnd_toEndOf="@+id/reviewTime"
app:layout_constraintStart_toStartOf="@+id/reviewTime"
app:layout_constraintTop_toBottomOf="@+id/reviewTime"
tools:visibility="visible" />
<LinearLayout
android:id="@+id/lineGiftTime"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center_horizontal|center_vertical"
app:layout_constraintTop_toBottomOf="@+id/rvListGiftType">
app:layout_constraintTop_toBottomOf="@+id/flListGiftTypeLayout">
<ImageView
android:layout_width="80dp"
@@ -162,63 +220,27 @@
<androidx.constraintlayout.widget.Group
android:id="@+id/groupGiftPack"
android:id="@+id/groupGiftSelect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
app:constraint_referenced_ids="lineGiftType,rvListGiftType,lineGiftTime,rvListGiftTime"
app:constraint_referenced_ids="lineGiftType,lineGiftTime,rvListGiftTime"
tools:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/reViewRvListGIft"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@id/reViewGiftPackTime" />
<TextView
android:id="@+id/reViewGiftPackTime"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:gravity="center"
android:text="@string/_ver_24_Waiting_time_s_minutes"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@+id/reViewRvListGIft" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/reViewBtnBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:drawablePadding="3dp"
android:gravity="center_vertical"
android:text="@string/_ver_24_Modify"
android:textColor="@color/color_FFEA5C"
android:textSize="12sp"
app:dt_drawableRightHeight="11dp"
app:dt_drawableRightSrc="@drawable/ic_login_next"
app:dt_drawableRightWidth="11dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/reViewGiftPackTime" />
<androidx.constraintlayout.widget.Group
android:id="@+id/reViewGiftPack"
android:id="@+id/groupReViewGift"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
app:constraint_referenced_ids="reViewRvListGIft,reViewGiftPackTime,reViewBtnBack"
app:constraint_referenced_ids="reviewTime,btnModify"
tools:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- 金币红包布局-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/goldPackLayout"
android:id="@+id/goldBagLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
@@ -228,15 +250,15 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvListGoldType"
android:layout_width="match_parent"
android:layout_marginTop="52dp"
android:layout_height="100dp"
android:layout_marginTop="52dp"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/lineGoldNum"
android:layout_width="match_parent"
android:layout_marginTop="47dp"
android:layout_height="wrap_content"
android:layout_marginTop="47dp"
android:gravity="center_horizontal|center_vertical"
app:layout_constraintTop_toBottomOf="@+id/rvListGoldType">
@@ -305,6 +327,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
<!-- 底部-->
@@ -313,13 +336,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20dp"
app:layout_constraintTop_toBottomOf="@id/centerLayout">
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:id="@+id/redPackDesc"
android:id="@+id/redBagDesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/_ver_24_sendHint"
android:textColor="@color/color_FFEA5C"
android:textSize="12sp"
@@ -348,15 +370,15 @@
app:layout_constraintEnd_toStartOf="@id/bottomSpace"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/redPackDesc" />
app:layout_constraintTop_toBottomOf="@id/redBagDesc" />
<androidx.legacy.widget.Space
android:id="@+id/bottomSpace"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="0dp"
app:layout_constraintStart_toEndOf="@+id/userGold"
android:layout_height="40dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btnConfirm"
android:layout_height="40dp"/>
app:layout_constraintStart_toEndOf="@+id/userGold" />
<TextView
android:id="@+id/btnConfirm"
@@ -371,7 +393,7 @@
app:dt_drawableType="shape"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottomSpace"
app:layout_constraintTop_toBottomOf="@+id/redPackDesc" />
app:layout_constraintTop_toBottomOf="@+id/redBagDesc" />
</androidx.constraintlayout.widget.ConstraintLayout>

100
app/src/main/res/layout/dialog_room_lucky_bag_bili.xml Normal file
View File

@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="485dp"
android:layout_gravity="bottom"
tools:background="@color/black">
<ImageView
android:id="@+id/btnBack"
android:layout_width="52dp"
android:layout_height="30dp"
android:paddingHorizontal="11dp"
android:src="@drawable/treasure_fairy_ic_back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginHorizontal="22dp"
android:layout_marginTop="40dp"
android:background="@drawable/shape_black_t20_17"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="parent">
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/btnReceived"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:lines="1"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
android:textStyle="bold"
app:dt_drawableType="shape"
app:dt_endColor="@color/transparent"
app:dt_radius="17dp"
app:dt_startColor="@color/transparent"
tools:text="@string/send" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/btnSent"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:lines="1"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
android:textStyle="bold"
app:dt_drawableType="shape"
app:dt_endColor="@color/transparent"
app:dt_radius="17dp"
app:dt_startColor="@color/transparent"
tools:text="@string/send" />
</LinearLayout>
<com.chwl.core.widget.img.MyCircleImageView
android:id="@+id/avatar"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginTop="14dp"
android:src="@drawable/default_avatar"
app:borderColor="#ffd168"
app:borderRadius="50dp"
app:borderWidth="2dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tabLayout" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/loading"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/avatar" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvList"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="23dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nick" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/dialog_room_lucky_bag_open.xml
View File

@@ -13,10 +13,13 @@
android:layout_marginTop="38dp"
app:layout_constraintTop_toTopOf="@id/avatar" />
<ImageView
<com.chwl.core.widget.img.MyCircleImageView
android:id="@+id/avatar"
android:layout_width="77dp"
android:layout_height="77dp"
app:borderColor="@color/color_FFEA5C"
app:borderWidth="1dp"
app:borderRadius="50dp"
android:src="@drawable/default_avatar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -112,6 +115,7 @@
android:layout_marginTop="8dp"
android:textColor="#292601"
android:textSize="16sp"
android:text="@string/loading"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

10
app/src/main/res/layout/fragment_av_room_game.xml
View File

@@ -297,7 +297,7 @@
android:orientation="vertical"
android:gravity="center_horizontal"
android:layout_height="1px"
tools:layout_height="60px">
tools:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_team_pk"
@@ -320,6 +320,14 @@
tools:contentDescription="@string/layout_fragment_av_room_game_05"
tools:visibility="visible" />
<com.chwl.app.avroom.widget.LuckyBagBtn
android:id="@+id/luckyBagBtn"
android:layout_marginBottom="@dimen/dp_8"
android:layout_width="wrap_content"
android:visibility="gone"
tools:visibility="visible"
android:layout_height="wrap_content"/>
<FrameLayout
android:id="@+id/boomLayout"
android:layout_width="@dimen/dp_55"

10
app/src/main/res/layout/fragment_game_room.xml
View File

@@ -226,6 +226,16 @@
tools:contentDescription="@string/layout_fragment_av_room_game_05"
tools:visibility="visible" />
<com.chwl.app.avroom.widget.LuckyBagBtn
android:id="@+id/luckyBagBtn"
android:layout_marginBottom="@dimen/dp_8"
android:layout_width="wrap_content"
android:visibility="gone"
tools:visibility="visible"
android:layout_height="wrap_content"/>
<FrameLayout
android:id="@+id/boomLayout"
android:layout_width="@dimen/dp_55"

9
app/src/main/res/layout/fragment_single_room.xml
View File

@@ -253,6 +253,15 @@
tools:contentDescription="@string/layout_fragment_av_room_game_05"
tools:visibility="visible" />
<com.chwl.app.avroom.widget.LuckyBagBtn
android:id="@+id/luckyBagBtn"
android:layout_marginBottom="@dimen/dp_8"
android:layout_width="wrap_content"
android:visibility="gone"
tools:visibility="visible"
android:layout_height="wrap_content"/>
<FrameLayout
android:id="@+id/boomLayout"
android:layout_width="@dimen/dp_55"

48
app/src/main/res/layout/item_room_lucky_bag_bili.xml Normal file
View File

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="23dp"
android:layout_marginBottom="14dp">
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4.5dp"
app:layout_constraintBottom_toTopOf="@id/time"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4.5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/nick"
app:layout_constraintTop_toBottomOf="@id/nick" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="4.5dp"
android:textColor="@color/color_FFEA5C"
android:textSize="15sp"
app:dt_drawableRightHeight="17dp"
app:dt_drawableRightWidth="17dp"
app:layout_constraintBottom_toBottomOf="@id/time"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/nick" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

13
app/src/main/res/layout/item_room_lucky_bag_gift.xml
View File

@@ -3,8 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:paddingBottom="8dp"
android:layout_marginBottom="7.5dp"
tools:background="@color/red_font">
<ImageView
@@ -39,6 +40,7 @@
android:ellipsize="end"
android:gravity="center"
android:visibility="gone"
tools:visibility="visible"
android:lines="1"
android:text="@string/loading"
android:textColor="@color/color_FFEA5C"
@@ -49,6 +51,7 @@
android:id="@+id/gold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:layout_marginTop="3dp"
android:drawablePadding="3dp"
android:gravity="center_vertical"
@@ -110,4 +113,12 @@
app:layout_constraintTop_toTopOf="@id/bgNumber" />
<androidx.constraintlayout.widget.Group
android:id="@+id/selectViews"
android:layout_width="wrap_content"
android:visibility="visible"
app:constraint_referenced_ids="gold,bgNumber,up,down,etNum"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>

48
app/src/main/res/layout/item_room_lucky_bag_gold.xml Normal file
View File

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp">
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/goldBg"
android:layout_width="75dp"
app:dt_drawableType="shape"
app:dt_radius="12dp"
app:dt_strikeWidth="0.5dp"
app:dt_strikeColor="#ffd168"
app:dt_endColor="#97000c"
app:dt_startColor="#610015"
android:layout_height="100dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/goldPic"
android:layout_width="62dp"
android:layout_height="62dp"
android:layout_marginTop="6.5dp"
app:layout_constraintEnd_toEndOf="@+id/goldBg"
app:layout_constraintStart_toStartOf="@+id/goldBg"
app:layout_constraintTop_toTopOf="@+id/goldBg" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/gold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="9.5dp"
android:drawablePadding="2.5dp"
android:lines="1"
android:textColor="@color/color_FFEA5C"
android:textSize="13sp"
app:dt_drawableRightHeight="16dp"
app:dt_drawableRightSrc="@drawable/ic_login_next"
app:dt_drawableRightWidth="16dp"
app:dt_drawableType="shape"
app:layout_constraintEnd_toEndOf="@+id/goldPic"
app:layout_constraintStart_toStartOf="@+id/goldPic"
app:layout_constraintTop_toBottomOf="@+id/goldPic" />
</androidx.constraintlayout.widget.ConstraintLayout>

10
app/src/main/res/layout/item_room_lucky_bag_time.xml
View File

@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<com.chwl.library.widget.text.DrawableTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/time"
android:id="@+id/number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp"
android:gravity="center"
android:paddingVertical="10dp"
android:text="0"
android:textColor="@color/color_292601"
android:textColor="@color/color_FFEA5C"
android:textSize="12sp"
app:dt_drawableType="shape"
app:dt_endColor="#fff437"
app:dt_radius="6dp"
app:dt_startColor="#ff9f00" />
app:dt_strikeWidth="0.5dp"
app:dt_strikeColor="#ffd168"
app:dt_endColor="#97000c"
app:dt_startColor="#610015" />

55
app/src/main/res/layout/layout_msg_view_holder_room_lucky_bag.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:background="@color/black">
<ImageView
android:id="@+id/bg"
android:layout_width="match_parent"
android:minHeight="90dp"
android:layout_height="match_parent" />
<com.chwl.core.widget.img.MyCircleImageView
android:id="@+id/avatar"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_marginStart="9dp"
android:layout_marginTop="9dp"
app:borderColor="@color/color_FFEA5C"
app:borderRadius="50dp"
app:borderWidth="1dp"
app:layout_constraintStart_toStartOf="@id/bg"
app:layout_constraintTop_toTopOf="@id/bg" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/loading"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/avatar" />
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="9dp"
android:layout_marginTop="6dp"
android:paddingBottom="13dp"
android:text="@string/loading"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/avatar" />
</androidx.constraintlayout.widget.ConstraintLayout>

12
app/src/main/res/layout/view_room_lucky_bag_notify.xml
View File

@@ -2,7 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="100dp">
android:layout_height="100dp"
android:background="@color/color_7b7b7d">
<ImageView
android:id="@+id/avatar"
@@ -18,6 +19,7 @@
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="1dp"
android:text="@string/loading"
android:textColor="#ffea5c"
@@ -27,8 +29,10 @@
<TextView
android:id="@+id/desc"
android:layout_width="wrap_content"
android:layout_width="0dp"
app:layout_constraintEnd_toEndOf="@id/btnGo"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/loading"
android:textColor="#ffea5c"
android:textSize="12sp"
@@ -37,10 +41,10 @@
<ImageView
android:id="@+id/btnGo"
android:layout_width="wrap_content"
android:layout_width="43dp"
android:layout_height="20dp"
android:layout_marginEnd="30dp"
android:src="@drawable/ic_notify_go"
android:layout_height="20dp"
app:layout_constraintBottom_toBottomOf="@id/nick"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/nick" />

11
app/src/main/res/values/strings.xml
View File

@@ -5408,18 +5408,23 @@ You cannot join again within 24 hours after leaving</string>
<string name="_ver_23_setManagerRemoveSuccess">You have removed %s as a room admin.</string>
<string name="_ver_24_luckBagOpenTitle">开奖弹窗标题</string>
<string name="_ver_24_View_Others_24">View_Others 24小时提示</string>
<string name="_ver_24_luckBagOpen_Empty">没开到奖品</string>
<string name="_ver_24_Click_Open">Click Open</string>
<string name="_ver_24_luckBagOpenHint">coming soon</string>
<string name="_ver_24_View_Others">View_Others</string>
<string name="_ver_24_View_Others_24">View_Others 24小时提示</string>
<string name="_ver_24_Gift_Lucky_Bag">Gift Lucky Bag</string>
<string name="_ver_24_Coin_Lucky_Bag">Coin Lucky Bag</string>
<string name="_ver_24_Choose_Gift">Choose Gift</string>
<string name="_ver_24_Waiting_time">Waiting time</string>
<string name="_ver_24_reviewTime">等待 %s 分钟</string>
<string name="_ver_24_sendHint">Send %s gifts , %s coins</string>
<string name="_ver_24_Send_Coin_Lucky_Bag">Send Coin Lucky Bag</string>
<string name="_ver_24_Send_Gift_Lucky_Bag">Send Gift Lucky Bag</string>
<string name="_ver_24_Gift_Lucky_Bag">Gift Lucky Bag</string>
<string name="_ver_24_Coin_Lucky_Bag">Coin Lucky Bag</string>
<string name="_ver_24_Waiting_time_s_minutes">Waiting time %s minutes</string>
<string name="_ver_24_Lucky_Bag_Numbers">Lucky Bag Numbers</string>
<string name="_ver_24_Total_spend_s_coins">Total spend %s coins</string>