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

删除首充引导相关

Browse Source
This commit is contained in:
Max
2024-02-27 11:11:09 +08:00
parent c55b1ba737
commit b9d090cd25
45 changed files with 105 additions and 1793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java
View File

@@ -61,7 +61,6 @@ import com.trello.rxlifecycle3.android.ActivityEvent;
import com.chwl.app.R;
import com.chwl.app.avroom.dialog.NewUserGiftDialog;
import com.chwl.app.avroom.dialog.SingleRoomTipDialog;
import com.chwl.app.avroom.firstcharge.FirstChargeDialog;
import com.chwl.app.avroom.fragment.FakeSingleRoomBackFragment;
import com.chwl.app.avroom.fragment.FakeSingleRoomFragment;
import com.chwl.app.avroom.fragment.HomePartyFragment;
@@ -1340,22 +1339,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
new NewUserGiftDialog(giftInfo).show(this);
}
@Override
public void showFirstChargeDialog(FirstChargeInfo firstChargeInfo) {
Single.timer(firstChargeInfo.getShowAfterSecond() * 1000L, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
.compose(bindUntilEvent(ActivityEvent.DESTROY))
.doOnSuccess(aLong -> {
if (!DemoCache.readBoolean("FirstCharge", false) &&
(UIUtils.isTopActivity(AVRoomActivity.this)
// || UIUtils.isTopActivity(this, TreasureBoxActivity.class.getName())
|| UIUtils.isTopActivity(this, DialogWebViewActivity.class.getName())
|| UIUtils.isTopActivity(this, RoomMsgActivity.class.getName()))) {
FirstChargeDialog.start(this);
}
})
.subscribe();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onImPushMsgPmLimitTimeEvent(ImPushMsgPmLimitTimeEvent event) {
//时间到限制时间段之后，后台推送im消息

2
app/src/main/java/com/chwl/app/avroom/dialog/DatingVipRuleDialog.java
View File

@@ -6,7 +6,7 @@ import android.view.View;
import com.chwl.app.R;
import com.chwl.app.databinding.DialogDatingVipRuleBinding;
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog;
import com.chwl.app.base.BaseBindingDialog;
import com.chwl.library.annatation.ActLayoutRes;

2
app/src/main/java/com/chwl/app/avroom/dialog/RequestUpMicDialog.kt
View File

@@ -4,7 +4,7 @@ import android.content.Context
import android.view.View
import com.chwl.app.R
import com.chwl.app.databinding.DialogRequestUpmicBinding
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.core.manager.AvRoomDataManager
import com.chwl.core.manager.IMNetEaseManager
import com.chwl.core.user.bean.BaseInfo

2
app/src/main/java/com/chwl/app/avroom/dialog/SelectLabelDialog.kt
View File

@@ -5,7 +5,7 @@ import android.view.View
import com.donkingliang.labels.LabelsView
import com.chwl.app.R
import com.chwl.app.databinding.DialogSelectLabelBinding
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.dialog_select_label)

485
app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt
View File

@@ -1,485 +0,0 @@
package com.chwl.app.avroom.firstcharge
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.text.Spannable
import android.text.SpannableStringBuilder
import android.text.style.ForegroundColorSpan
import android.util.Log
import android.view.Gravity
import android.view.LayoutInflater
import android.view.View
import android.view.WindowManager
import android.widget.PopupWindow
import android.widget.TextView
import androidx.recyclerview.widget.GridLayoutManager
//import com.appsflyer.AFInAppEventParameterName
//import com.appsflyer.AFInAppEventType
//import com.appsflyer.AppsFlyerLib
import com.example.module_base.support.billing.IBillingResult
import com.example.module_base.support.billing.IBillingService
import com.example.module_base.support.billing.IProductDetails
import com.example.module_base.support.billing.IPurchase
import com.example.module_base.support.google.IGoogleService
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.chwl.app.R
import com.chwl.app.base.BaseViewBindingActivity
import com.chwl.app.databinding.DialogFirstChargeBinding
import com.chwl.app.ui.setting.ModifyPwdActivity
import com.chwl.app.ui.webview.CommonWebViewActivity
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil
import com.chwl.core.Constants
import com.chwl.core.DemoCache
import com.chwl.core.UriProvider
import com.chwl.core.pay.PayModel
import com.chwl.core.pay.bean.FirstChargeGoods
import com.chwl.core.pay.bean.FirstChargeReward
import com.chwl.core.pay.bean.PayRecordId
import com.chwl.core.pay.event.FirstChargeEvent
import com.chwl.core.room.model.AvRoomModel
import com.chwl.core.utils.net.IgnoreException
import com.chwl.core.utils.extension.toast
import com.chwl.library.common.util.DeviceUtil
import com.chwl.library.utils.AppMetaDataUtil
import com.chwl.library.utils.ResUtil
import com.chwl.library.utils.SingleToastUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
/**
* author: wushaocheng
* time: 2022/2/21
* desc: 限时首充
*/
class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
IBillingService.Listener {
private var goodsList: List<FirstChargeGoods>? = null
private var currGoods: FirstChargeGoods? = null
private lateinit var helpPopupWindow: PopupWindow
private var billingManager: IBillingService? = null
private var position = -1
private val mReward2Adapter by lazy { Reward2Adapter() }
companion object {
@JvmStatic
fun start(context: Context) {
val starter = Intent(context, FirstChargeDialog::class.java)
context.startActivity(starter)
}
private const val BIND_CODE_GOLD = 200
private const val TAG = "FirstChargeDialog"
}
@SuppressLint("CheckResult")
override fun init() {
//这里的height用MATCH_PARENT状态栏会被顶上去,不知道什么鬼
val height = ScreenUtil.screenHeight - ScreenUtil.getStatusBarHeight(context)
window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, height)
window.setGravity(Gravity.CENTER)
EventBus.getDefault().register(this)
binding.rbPlanA.setOnClickListener {
binding.rbPlanA.isChecked = true
binding.rbPlanB.isChecked = false
binding.rbPlanC.isChecked = false
binding.ivArrow1.visibility = View.VISIBLE
binding.ivArrow2.visibility = View.INVISIBLE
binding.ivArrow3.visibility = View.INVISIBLE
updateCurrGoods(goodsList?.getOrNull(0))
position = 0
}
binding.rbPlanB.setOnClickListener {
binding.rbPlanA.isChecked = false
binding.rbPlanB.isChecked = true
binding.rbPlanC.isChecked = false
binding.ivArrow1.visibility = View.INVISIBLE
binding.ivArrow2.visibility = View.VISIBLE
binding.ivArrow3.visibility = View.INVISIBLE
updateCurrGoods(goodsList?.getOrNull(1))
position = 1
}
binding.rbPlanC.setOnClickListener {
binding.rbPlanA.isChecked = false
binding.rbPlanB.isChecked = false
binding.rbPlanC.isChecked = true
binding.ivArrow1.visibility = View.INVISIBLE
binding.ivArrow2.visibility = View.INVISIBLE
binding.ivArrow3.visibility = View.VISIBLE
updateCurrGoods(goodsList?.getOrNull(2))
position = 2
}
binding.ivHelp.setOnClickListener { showHelpPopup() }
binding.tvCharge.setOnClickListener {
if (position == -1) {
ResUtil.getString(R.string.avroom_firstcharge_firstchargedialog_01).toast()
}
else{
goodsList?.get(position)?.let { charge ->
buyProduct(charge.productDetails)
}
}
}
binding.recyclerView.layoutManager = GridLayoutManager(this, 6)
//重新定义每行的item数量
mReward2Adapter.setSpanSizeLookup { _, position ->
val data = mReward2Adapter.data
var spanSize = 0
when (data[position].itemType) {
FirstChargeReward.ONE -> {
spanSize = 6
}
FirstChargeReward.TWO_LEFT -> {
spanSize = 3
}
FirstChargeReward.TWO_RIGHT -> {
spanSize = 3
}
FirstChargeReward.THREE -> {
spanSize = 2
}
FirstChargeReward.TWO_LEFT_SMALL -> {
spanSize = 3
}
FirstChargeReward.TWO_RIGHT_SMALL -> {
spanSize = 3
}
}
spanSize
}
binding.recyclerView.adapter = mReward2Adapter
PayModel.get().firstChargeList
.compose(bindToLifecycle())
.subscribe({
initData(it)
}, {
it.printStackTrace()
SingleToastUtil.showToast(it.message)
finish()
})
binding.viewBg.setOnClickListener {
//do nothing
}
binding.root.setOnClickListener {
finish()
}
DemoCache.saveBoolean("FirstCharge", true)
AvRoomModel.get().postFirstCharge()
.compose(bindToLifecycle())
.subscribe()
}
@SuppressLint("SetTextI18n")
private fun initData(goodsList: List<FirstChargeGoods>) {
this.goodsList = goodsList
binding.rbPlanA.isChecked = true
updateCurrGoods(goodsList.getOrNull(0))
position = 0
when (goodsList.size) {
1 -> {
binding.rbPlanB.visibility = View.GONE
binding.rbPlanC.visibility = View.GONE
binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
}
2 -> {
binding.rbPlanC.visibility = View.GONE
binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
binding.rbPlanB.text = "$${goodsList[1].chargeMoney}"
}
3 -> {
binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
binding.rbPlanB.text = "$${goodsList[1].chargeMoney}"
binding.rbPlanC.text = "$${goodsList[2].chargeMoney}"
}
}
initBilling()
}
private fun initBilling() {
billingManager = IGoogleService.newBillingService(this,this)
}
@SuppressLint("CheckResult")
override fun onBillingClientSetupFinished() {
Log.i(TAG, "onBillingClientSetupFinished")
goodsList?.let { initProduceList(it) }
}
private fun initProduceList(goodsList: List<FirstChargeGoods>) {
val productKeys: MutableList<String> = ArrayList()
for (bean in goodsList) {
productKeys.add(bean.chargeProdId)
}
billingManager?.querySkuDetailsAsync(productKeys,object :IBillingService.ProductDetailsResponseListener{
override fun onProductDetailsResponse(
billingResult: IBillingResult,
productDetails: List<IProductDetails>
) {
if (!billingResult.isResponseOk()) {
Log.w(
TAG,
"Unsuccessful query for Error code: " + billingResult.getResponseCode()
)
}else if (productDetails.isNotEmpty()) {
for (chargeBean in goodsList) {
for (skuDetails in productDetails) {
if (skuDetails.getProductId() == chargeBean.chargeProdId) {
chargeBean.productDetails = skuDetails
break
}
}
}
}
}
})
}
/*商品更新回调*/
@SuppressLint("CheckResult")
override fun onPurchasesUpdated(purchases: List<IPurchase>) {
for (purchase in purchases) {
if (purchase.isPurchasedState() &&
purchase.getAccountIdentifiers() != null
) {
PayModel.get().verifyOrder(
purchase.getAccountIdentifiers()!!.getObfuscatedAccountId(),
purchase.getProducts()[0],
purchase.getPackageName(),
purchase.getPurchaseToken()
)
.compose(bindToLifecycle())
.subscribe(
{ token: String ->
//L.i("token=" + token);
billingManager?.consumeAsync(token)
// var skuDetails: IProductDetails? = null
// val goodList = goodsList
// if (!goodList.isNullOrEmpty()) {
// for (datum in goodList) {
// if (datum.chargeProdId == purchase.getProducts()[0]) {
// skuDetails = datum.productDetails
// break
// }
// }
// }
// if (skuDetails != null) {
// val eventValue: MutableMap<String, Any> =
// HashMap()
// eventValue[AFInAppEventParameterName.CONTENT_TYPE] = "Gold"
// eventValue[AFInAppEventParameterName.QUANTITY] = 1
// eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.getOrderId()!!
// skuDetails.getOneTimePurchaseOfferDetails()?.let {
// eventValue[AFInAppEventParameterName.REVENUE] =
// it.getPriceAmountMicros() / 1000000f
// eventValue["Price"] = it.getFormattedPrice()
// eventValue[AFInAppEventParameterName.CURRENCY] =
// it.getPriceCurrencyCode()
// }
// AppsFlyerLib.getInstance().logEvent(
// applicationContext,
// AFInAppEventType.PURCHASE,
// eventValue
// )
// }
}
) { throwable: Throwable ->
if (throwable !is IgnoreException) {
SingleToastUtil.showToast(throwable.message)
}
}
}
}
Log.i(TAG, "onPurchasesUpdated")
}
override fun onConsumeFinished(token: String?, result: Int) {
}
override fun onFailedHandle(result: Int) {
}
/*购买商品*/
@SuppressLint("CheckResult")
fun buyProduct(skuDetails: IProductDetails?) {
if (skuDetails != null) {
Log.d(TAG, "BuyProduct:" + skuDetails.getProductId())
PayModel.get().placeOrder(skuDetails.getProductId())
.compose(bindToLifecycle())
.subscribe(
{ recordId: PayRecordId ->
billingManager?.initiatePurchaseFlow(
skuDetails,
recordId.recordId
)
}
) { throwable: Throwable ->
SingleToastUtil.showToast(
throwable.message
)
}
} else {
Log.w(TAG, "skuDetails ==null")
}
}
override fun onResume() {
super.onResume()
if (billingManager?.isServiceConnected() == true) {
billingManager?.onQueryPurchases()
}
}
override fun onDestroy() {
super.onDestroy()
EventBus.getDefault().unregister(this)
billingManager?.destroy()
}
private fun updateCurrGoods(firstChargeGoods: FirstChargeGoods?) {
firstChargeGoods?.let {
currGoods = it
val giveMoneyIndex = it.chargeProdTitle.lastIndexOf(it.giveMoney)
if (giveMoneyIndex == -1) {
binding.tvTitle.text = it.chargeProdTitle
} else {
val builder = SpannableStringBuilder(it.chargeProdTitle)
builder.setSpan(
ForegroundColorSpan(Color.parseColor("#BE5AF6")), giveMoneyIndex,
giveMoneyIndex + (it.giveMoney?.length ?: 0),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
)
binding.tvTitle.text = builder
}
val firstChargeRewardList = it.firstChargeRewardList ?: return
when (firstChargeRewardList.size) {
1 -> {
for (bean in firstChargeRewardList) {
bean.itemType = FirstChargeReward.ONE
}
}
2 -> {
for (i in firstChargeRewardList.indices) {
if (i == 0) {
firstChargeRewardList[i].itemType = FirstChargeReward.TWO_LEFT
} else if (i == 1) {
firstChargeRewardList[i].itemType = FirstChargeReward.TWO_RIGHT
}
}
}
3 -> {
for (bean in firstChargeRewardList) {
bean.itemType = FirstChargeReward.THREE
}
}
4 -> {
for (i in firstChargeRewardList.indices) {
if ((i + 1) % 2 != 0) {
firstChargeRewardList[i].itemType = FirstChargeReward.TWO_LEFT
} else {
firstChargeRewardList[i].itemType = FirstChargeReward.TWO_RIGHT
}
}
}
else -> {
if (firstChargeRewardList.size % 3 == 0) {
for (bean in firstChargeRewardList) {
bean.itemType = FirstChargeReward.THREE
}
} else {
val num = firstChargeRewardList.size / 3
val residueNUm = firstChargeRewardList.size - (num * 3)
for (i in firstChargeRewardList.indices) {
if ((i + 1) <= num * 3) {
firstChargeRewardList[i].itemType = FirstChargeReward.THREE
} else if (residueNUm == 2) {
if (firstChargeRewardList.size - (i + 1) == 1) {
firstChargeRewardList[i].itemType =
FirstChargeReward.TWO_LEFT_SMALL
} else if (firstChargeRewardList.size - (i + 1) == 0) {
firstChargeRewardList[i].itemType =
FirstChargeReward.TWO_RIGHT_SMALL
}
} else {
firstChargeRewardList[i].itemType = FirstChargeReward.THREE
}
}
}
}
}
mReward2Adapter.setNewData(it.firstChargeRewardList)
}
}
private fun showHelpPopup() {
if (currGoods == null) {
SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_firstcharge_firstchargedialog_02))
return
}
val contentView: View
if (!this::helpPopupWindow.isInitialized) {
contentView =
LayoutInflater.from(context)
.inflate(R.layout.layout_first_charge_help_view, null)
contentView.findViewById<TextView>(R.id.tv_content).text =
currGoods?.chargeProdDesc?.replace("\\n", "\n")?.replace("\\r", "\r")
helpPopupWindow =
PopupWindow(
contentView,
ScreenUtil.dip2px(150f),
WindowManager.LayoutParams.WRAP_CONTENT
)
helpPopupWindow.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
helpPopupWindow.isOutsideTouchable = true
helpPopupWindow.isFocusable = true
}
try {
helpPopupWindow.showAsDropDown(
binding.ivHelp,
UIUtil.dip2px(context, 18.0), UIUtil.dip2px(context, -3.0), Gravity.END
)
} catch (e: Exception) {
e.printStackTrace()
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
dialogManager.dismissDialog()
if (resultCode != RESULT_OK) {
return
}
if (requestCode == BIND_CODE_GOLD) {
ModifyPwdActivity.start(this, ModifyPwdActivity.FOGERT_PAY_PWD)
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onFirstRechargeEvent(event: FirstChargeEvent?) {
finish()
}
}

41
app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargePrizeDialog.kt
View File

@@ -1,41 +0,0 @@
package com.chwl.app.avroom.firstcharge
import android.content.Context
import com.google.android.flexbox.AlignItems
import com.google.android.flexbox.FlexboxLayoutManager
import com.google.android.flexbox.JustifyContent
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.chwl.app.R
import com.chwl.app.databinding.DialogFirstChargePrizeBinding
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.ui.utils.RVDelegate
import com.chwl.core.pay.bean.FirstChargeReward
import com.chwl.library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.dialog_first_charge_prize)
class FirstChargePrizeDialog(
context: Context,
val title: String?,
private val firstChargeRewardList: List<FirstChargeReward>?
) : BaseBindingDialog<DialogFirstChargePrizeBinding>(context) {
private lateinit var rvDelegate: RVDelegate<FirstChargeReward>
override fun init() {
rvDelegate = RVDelegate.Builder<FirstChargeReward>()
.setAdapter(RewardAdapter(ScreenUtil.dip2px(248f) / 3))
.setLayoutManager(FlexboxLayoutManager(context).apply {
alignItems = AlignItems.STRETCH
justifyContent = JustifyContent.SPACE_EVENLY
})
.setRecyclerView(binding.recyclerView)
.build()
binding.ivKnow.setOnClickListener {
closeDialog()
}
binding.tvDesc.text = title
rvDelegate.setNewData(firstChargeRewardList)
}
}

39
app/src/main/java/com/chwl/app/avroom/firstcharge/Reward2Adapter.kt
View File

@@ -1,39 +0,0 @@
package com.chwl.app.avroom.firstcharge
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.chwl.app.R
import com.chwl.app.ui.utils.ImageLoadUtils
import com.chwl.core.pay.bean.FirstChargeReward
import com.chwl.core.utils.CoreTextUtils
class Reward2Adapter : BaseMultiItemQuickAdapter<FirstChargeReward, BaseViewHolder>(null) {
init {
addItemType(FirstChargeReward.ONE, R.layout.item_first_charge_reward_one)
addItemType(FirstChargeReward.TWO_LEFT, R.layout.item_first_charge_reward_two_left)
addItemType(FirstChargeReward.TWO_RIGHT, R.layout.item_first_charge_reward_two_right)
addItemType(FirstChargeReward.THREE, R.layout.item_first_charge_reward_three)
addItemType(
FirstChargeReward.TWO_LEFT_SMALL,
R.layout.item_first_charge_reward_two_left_small
)
addItemType(
FirstChargeReward.TWO_RIGHT_SMALL,
R.layout.item_first_charge_reward_two_right_small
)
}
override fun convert(helper: BaseViewHolder, item: FirstChargeReward) {
ImageLoadUtils.loadImage(
mContext,
item.showPir,
helper.getView(R.id.iv_pic),
R.drawable.ic_first_charge_default
)
helper.setText(R.id.tv_name, item.showText)
.setText(R.id.tv_time, item.showTime)
.setGone(R.id.tv_time, !CoreTextUtils.isEmptyText(item.showTime))
}
}

28
app/src/main/java/com/chwl/app/avroom/firstcharge/RewardAdapter.kt
View File

@@ -1,28 +0,0 @@
package com.chwl.app.avroom.firstcharge
import androidx.core.view.updateLayoutParams
import androidx.recyclerview.widget.RecyclerView
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.chwl.app.R
import com.chwl.app.ui.utils.ImageLoadUtils
import com.chwl.core.pay.bean.FirstChargeReward
import com.chwl.core.utils.CoreTextUtils
class RewardAdapter(private val itemWidth: Int) :
BaseQuickAdapter<FirstChargeReward, BaseViewHolder>(R.layout.item_first_charge_reward) {
override fun convert(helper: BaseViewHolder, item: FirstChargeReward) {
helper.itemView.updateLayoutParams<RecyclerView.LayoutParams> {
width = itemWidth
}
ImageLoadUtils.loadImage(
mContext,
item.showPir,
helper.getView(R.id.iv_pic),
R.drawable.ic_first_charge_default
)
helper.setText(R.id.tv_name, item.showText)
.setText(R.id.tv_time, item.showTime)
.setGone(R.id.tv_time, !CoreTextUtils.isEmptyText(item.showTime))
}
}

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

@@ -40,7 +40,6 @@ import com.chwl.app.avroom.activity.RoomTitleEditActivity
import com.chwl.app.avroom.adapter.OnMicroItemClickListener
import com.chwl.app.avroom.dialog.AttentionHintDialog
import com.chwl.app.avroom.dialog.DatingVipRuleDialog
import com.chwl.app.avroom.firstcharge.FirstChargeDialog
import com.chwl.app.avroom.presenter.BaseRoomPresenter
import com.chwl.app.avroom.room_album.RoomAlbumModel
import com.chwl.app.avroom.view.IBaseRoomView
@@ -652,8 +651,6 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
R.id.input_send -> {
sendMsg()
}
R.id.iv_first_charge_enter -> FirstChargeDialog.start(mContext)
}
}

7
app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -27,7 +27,6 @@ import com.chwl.app.avroom.dialog.MicQueueDialog;
import com.chwl.app.avroom.dialog.PKMicQueueDialog;
import com.chwl.app.avroom.dialog.PKResultDialog;
import com.chwl.app.avroom.dialog.PKScoreBoardDialog;
import com.chwl.app.avroom.firstcharge.FirstChargePrizeDialog;
import com.chwl.app.avroom.giftvalue.GiftValueDialogUiHelper;
import com.chwl.app.avroom.presenter.HomePartyPresenter;
import com.chwl.app.avroom.view.IHomePartyView;
@@ -960,12 +959,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
initRoomAct(gameBinding.activityImg, bannerInfos, 11f);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onFirstRechargeEvent(FirstChargeEvent event) {
gameBinding.ivFirstChargeEnter.setVisibility(View.GONE);
new FirstChargePrizeDialog(requireContext(), event.getChargeProdTitle(), event.getFirstChargeRewardList()).openDialog();
}
/**
* 底部按钮点击处理
*/

11
app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
View File

@@ -13,7 +13,6 @@ import com.chwl.app.avroom.adapter.OnMicroItemClickListener
import com.chwl.app.avroom.adapter.SingleAnchorMicroViewAdapter
import com.chwl.app.avroom.adapter.SingleRoomPKMicroViewAdapter
import com.chwl.app.avroom.dialog.RequestUpMicDialog
import com.chwl.app.avroom.firstcharge.FirstChargePrizeDialog
import com.chwl.app.avroom.presenter.SingleRoomPresenter
import com.chwl.app.avroom.rank.RoomRankWidget
import com.chwl.app.avroom.singleroompk.SingleRoomPkFinishDialog
@@ -244,16 +243,6 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
initRoomAct(gameBinding.activityImg, dialogInfos, 10f)
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onFirstRechargeEvent(event: FirstChargeEvent) {
gameBinding.ivFirstChargeEnter.visibility = View.GONE
FirstChargePrizeDialog(
requireContext(),
event.chargeProdTitle,
event.firstChargeRewardList
).openDialog()
}
override fun initWidget() {
super.initWidget()
registerWidget(RoomRankWidget::class.java.simpleName, gameBinding.rankWidget)

2
app/src/main/java/com/chwl/app/avroom/newuserchargegift/NewUserChargePrizeDialog.kt
View File

@@ -5,7 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.chwl.app.R
import com.chwl.app.databinding.DialogNewUserChargePrizeBinding
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.app.ui.utils.RVDelegate
import com.chwl.core.pay.bean.FirstChargeReward
import com.chwl.library.annatation.ActLayoutRes

7
app/src/main/java/com/chwl/app/avroom/presenter/AvRoomPresenter.java
View File

@@ -459,13 +459,6 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
*/
@SuppressLint("CheckResult")
public void checkFirstCharge() {
AvRoomModel.get().getFirstCharge()
.compose(bindToLifecycle())
.subscribe(firstChargeInfo -> {
if (getMvpView() != null && firstChargeInfo.getNeedToShow()) {
getMvpView().showFirstChargeDialog(firstChargeInfo);
}
});
}
/**

3
app/src/main/java/com/chwl/app/avroom/view/IAvRoomView.java
View File

@@ -83,7 +83,4 @@ public interface IAvRoomView extends IMvpBaseView {
void recoverRoomMinWhenPmLimit(Throwable throwable);
void showNewUserDialog(GiftInfo giftInfo);
void showFirstChargeDialog(FirstChargeInfo firstChargeInfo);
}

6
app/src/main/java/com/chwl/app/base/BaseActivity.java
View File

@@ -67,7 +67,6 @@ import com.chwl.app.application.IReportConstants;
import com.chwl.app.application.ReportManager;
import com.chwl.app.application.App;
import com.chwl.app.avroom.activity.AVRoomActivity;
import com.chwl.app.avroom.firstcharge.FirstChargeDialog;
import com.chwl.app.common.LoadingFragment;
import com.chwl.app.common.NetworkErrorFragment;
import com.chwl.app.common.NoDataFragment;
@@ -1274,10 +1273,6 @@ public abstract class BaseActivity extends RxAppCompatActivity
.doOnError(throwable -> isShowingChargeDialog = false)
.subscribe(
userInfo -> {
if (userInfo.isFirstCharge()) {
isShowingChargeDialog = false;
FirstChargeDialog.start(context);
} else {
new DialogManager(context).showOkCancelDialog(getString(R.string.tips_need_charge),
new DialogManager.OkCancelDialogListener() {
@Override
@@ -1309,7 +1304,6 @@ public abstract class BaseActivity extends RxAppCompatActivity
isShowingChargeDialog = false;
}
});
}
}
);

91
app/src/main/java/com/chwl/app/base/BaseBindingDialog.java Normal file
View File

@@ -0,0 +1,91 @@
package com.chwl.app.base;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import androidx.appcompat.app.AppCompatDialog;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import com.chwl.library.annatation.ActLayoutRes;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
/**
* Created by huangmeng1 on 2018/4/12.
*/
public abstract class BaseBindingDialog<T extends ViewDataBinding> extends AppCompatDialog {
protected int width, height;
protected Context context;
protected int gravity;
public BaseBindingDialog(Context context) {
this(context, 0);
}
public BaseBindingDialog(Context context, int theme) {
super(context, theme);
this.context = context;
width = ScreenUtil.getDialogWidth();
height = WindowManager.LayoutParams.WRAP_CONTENT;
gravity = Gravity.CENTER;
}
protected T binding;
@Override
protected void onStart() {
super.onStart();
Window window = getWindow();
if (window != null) {
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
WindowManager.LayoutParams windowParams = window.getAttributes();
windowParams.width = width;
windowParams.height = height;
windowParams.dimAmount = 0.5f;
windowParams.gravity = gravity;
windowParams.x = 0;
windowParams.y = 0;
// window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
window.setAttributes(windowParams);
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
View inflate = LayoutInflater.from(getContext()).inflate(getClass().getAnnotation(ActLayoutRes.class).value(), null);
setContentView(inflate.getRootView());
setCancelable(true);
setCanceledOnTouchOutside(true);
binding = DataBindingUtil.bind(inflate);
init();
}
protected abstract void init();
public void openDialog() {
try {
show();
} catch (Exception e) {
e.printStackTrace();
}
}
public void closeDialog() {
try {
dismiss();
} catch (Exception e) {
e.printStackTrace();
}
}
}

19
app/src/main/java/com/chwl/app/home/adapter/RoomActAdapter.kt
View File

@@ -6,7 +6,6 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import com.chwl.app.R
import com.chwl.app.avroom.firstcharge.FirstChargeDialog
import com.chwl.app.ui.utils.ImageLoadUtils
import com.chwl.app.ui.webview.room_banner.RoomBannerWebDialogActivity
import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapter
@@ -23,30 +22,13 @@ class RoomActAdapter(private val mContext: Context, private val data: List<Banne
val bannerInfo = data[position]
val actId = bannerInfo.bannerId.toString()
ivCover.scaleType = ImageView.ScaleType.CENTER_CROP
// if (bannerInfo.isFairy) {
// ivCover.setImageResource(R.drawable.ic_fairy_entrance)
// } else
if (bannerInfo.isFirstCharge) {
ivCover.setImageResource(R.drawable.ic_first_charge_enter)
// } else if (bannerInfo.isBox) {
// GlideApp.with(BasicConfig.INSTANCE.appContext)
// .load(GoldBoxHelper.getBoxIcon())
// .error(R.drawable.icon_room_treasure_box)
// .into(ivCover)
} else if (bannerInfo.isRadish) {
ivCover.setImageResource(R.drawable.ic_radish_entrance)
} else {
ImageLoadUtils.loadImage(
mContext,
bannerInfo.bannerPic,
ivCover,
R.drawable.default_cover
)
}
ivCover.setOnClickListener { v: View? ->
if (bannerInfo.isFirstCharge) {
FirstChargeDialog.start(mContext)
} else {
AvRoomModel.get().activityClickLog("2", actId).subscribe()
if (bannerInfo.skipType == 3) {
val list = data.filterList {
@@ -59,7 +41,6 @@ class RoomActAdapter(private val mContext: Context, private val data: List<Banne
} else {
CommonJumpHelper.bannerJump(mContext, bannerInfo)
}
}
}
return view
}

2
app/src/main/java/com/chwl/app/radish/signin/view/RuleDialog.java
View File

@@ -7,7 +7,7 @@ import android.webkit.WebViewClient;
import com.chwl.app.R;
import com.chwl.app.databinding.DialogRuleBinding;
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog;
import com.chwl.app.base.BaseBindingDialog;
import com.chwl.core.UriProvider;
import com.chwl.library.annatation.ActLayoutRes;

2
app/src/main/java/com/chwl/app/relation/cp/dialog/CpGlobalDialog.kt
View File

@@ -9,7 +9,7 @@ import com.chwl.app.R
import com.chwl.app.databinding.DialogCpGlobalBinding
import com.chwl.app.relation.cp.CpDataManager
import com.chwl.app.relation.cp.activity.CpInviteRecordActivity
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.app.ui.utils.ImageLoadUtilsV2
import com.chwl.core.relation.cp.bean.CpInviteInfo
import com.chwl.library.annatation.ActLayoutRes

2
app/src/main/java/com/chwl/app/relation/cp/dialog/CpInvitePageDialog.kt
View File

@@ -9,7 +9,7 @@ import com.chwl.app.R
import com.chwl.app.databinding.DialogCpInviteBinding
import com.chwl.app.relation.cp.CpViewHelper
import com.chwl.app.relation.cp.adapter.DeclarationRecommendAdapter
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.app.ui.utils.ImageLoadUtilsV2
import com.chwl.app.ui.widget.LinearLayoutManagerWrapper
import com.chwl.core.relation.cp.bean.CpInvitePageEntity

2
app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyConfirmDialog.kt
View File

@@ -6,7 +6,7 @@ import android.view.View
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.chwl.app.R
import com.chwl.app.databinding.DialogCpInviteReplyConfirmBinding
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.app.ui.widget.dialog.CommonTipDialog
import com.chwl.library.annatation.ActLayoutRes

2
app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyDialog.kt
View File

@@ -9,7 +9,7 @@ import com.chwl.app.databinding.DialogCpInviteReplyBinding
import com.chwl.app.relation.cp.CpViewHelper
import com.chwl.app.relation.cp.CpViewHelper.getColorSpan
import com.chwl.app.relation.extention.toTimeString
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.app.ui.utils.ImageLoadUtilsV2
import com.chwl.core.relation.cp.bean.CpInviteDetailEntity
import com.chwl.library.annatation.ActLayoutRes

2
app/src/main/java/com/chwl/app/relation/cp/dialog/CpMpDialog.kt
View File

@@ -6,7 +6,7 @@ import android.view.View
import androidx.core.view.isVisible
import com.chwl.app.R
import com.chwl.app.databinding.DialogCpMpBinding
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.library.annatation.ActLayoutRes
import com.chwl.library.utils.TextWatcherWrapper

2
app/src/main/java/com/chwl/app/skill/dialog/AddSkillCardDialog.kt
View File

@@ -8,7 +8,7 @@ import com.chwl.app.R
import com.chwl.app.databinding.DialogAddSkillItemBinding
import com.chwl.app.skill.adapter.AddSkillCardAdapter
import com.chwl.app.skill.decoration.SkillGridDecoration
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil
import com.chwl.core.skill.entity.SkillTypeEntity
import com.chwl.library.annatation.ActLayoutRes

2
app/src/main/java/com/chwl/app/skill/dialog/SkillSelectionDialog.kt
View File

@@ -8,7 +8,7 @@ import com.chwl.app.R
import com.chwl.app.databinding.DialogAddSkillItemBinding
import com.chwl.app.skill.adapter.SkillSelectionAdapter
import com.chwl.app.skill.decoration.SkillGridDecoration
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil
import com.chwl.core.skill.entity.PropDictVo
import com.chwl.core.skill.entity.PropsEntity

25
app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java
View File

@@ -42,7 +42,6 @@ import com.chwl.app.BR;
import com.chwl.app.R;
import com.chwl.app.application.IReportConstants;
import com.chwl.app.application.ReportManager;
import com.chwl.app.avroom.firstcharge.FirstChargeDialog;
import com.chwl.app.base.BaseActivity;
import com.chwl.app.common.widget.CircleImageView;
import com.chwl.app.radish.task.activity.TaskCenterActivity;
@@ -160,7 +159,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
private TextView giftNumberText;
private ImageView giftNumberOptions;
private ImageView ivOpenNoble;
private View ivFirstRecharge;
private TextView tvGiftValue;
private EditText etSendMessage;
private Button sendGiftButton;
@@ -455,11 +453,9 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
ivOpenNoble.setOnClickListener(this);
sendContainer = root.findViewById(R.id.send_container);
layoutEmpty.setVisibility(View.GONE);
ivFirstRecharge = root.findViewById(R.id.iv_first_recharge);
tvGiftValue = root.findViewById(R.id.tv_gift_value);
mStarWeekBanner = findViewById(R.id.star_week_list);
ivFirstRecharge.setOnClickListener(this);
if (giftId == 0) {
// 更新所有礼物
giftIndicator.setPosition(GiftIndicator.TYPE_NORMAL);
@@ -529,16 +525,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
});
compositeDisposable.add(GiftModel.get().requestKnapGiftInfos().subscribe());
if (isInRoom) {
UserModel.get().getCurrentUserInfo()
.compose(RxHelper.bindContext(context))
.subscribe(userInfo -> {
if (userInfo.isFirstCharge()) {
ivFirstRecharge.setVisibility(View.VISIBLE);
}
});
}
}
private void showLoadingAnimation() {
@@ -1294,10 +1280,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
map.put(IReportConstants.MODULE, IReportConstants.PEKO_PAY);
ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map);
break;
case R.id.iv_first_recharge:
FirstChargeDialog.start(context);
break;
case R.id.tv_reload:
reloadData(true);
break;
@@ -1434,13 +1416,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onFirstRechargeEvent(FirstChargeEvent event) {
if (ivFirstRecharge != null) {
ivFirstRecharge.setVisibility(View.GONE);
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onWalletInfoUpdate(UpdateWalletInfoEvent event) {
goldWalletInfo = PayModel.get().getCurrentWalletInfo();

2
app/src/main/java/com/chwl/app/ui/widget/dialog/CommonMessageDialog.kt
View File

@@ -3,7 +3,7 @@ package com.chwl.app.ui.widget.dialog
import android.content.Context
import com.chwl.app.R
import com.chwl.app.databinding.DialogCommonMessageBinding
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog
import com.chwl.app.base.BaseBindingDialog
import com.chwl.library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.dialog_common_message)

BIN
app/src/main/res/drawable-xhdpi/ic_charm_level_max.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_charm_level_min.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

78
app/src/main/res/layout/box_ranking_list_item.xml
View File

@@ -1,78 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="@dimen/dp_60"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_0"
android:paddingEnd="@dimen/dp_15">
<FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="0.3"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_0">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_position"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_position"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_18"
android:textStyle="bold"
tools:text="100" />
</FrameLayout>
<com.chwl.app.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center_vertical" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_14"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_userName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_14"
app:layout_flexShrink="1"
tools:text="@string/layout_box_ranking_list_item_01" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_amount"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="0.7"
android:drawablePadding="5dp"
android:gravity="end"
android:textColor="@color/color_F8FF7B"
android:textSize="@dimen/sp_15"
tools:text="1236843"
app:drawableEndCompat="@drawable/treasure_box_diamond" />
</LinearLayout>

11
app/src/main/res/layout/dialog_bottom_gift.xml
View File

@@ -450,17 +450,6 @@
android:textSize="@dimen/sp_13"
app:drawableEndCompat="@drawable/ic_arrow_recharge" />
<ImageView
android:id="@+id/iv_first_recharge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/tv_recharge"
android:scaleType="fitCenter"
android:src="@drawable/ic_first_charge_gift_dialog_enter"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_text_gold"
android:layout_width="wrap_content"

196
app/src/main/res/layout/dialog_first_charge.xml
View File

@@ -1,196 +0,0 @@
<?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="match_parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/view_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginEnd="@dimen/dp_35"
android:adjustViewBounds="true"
android:src="@drawable/bg_first_charge"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@+id/view_bg"
app:layout_constraintEnd_toEndOf="@+id/view_bg"
app:layout_constraintBottom_toTopOf="@+id/csGift">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivArrow1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="40dp"
android:src="@drawable/ic_first_charge_arrow"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ivArrow2"
app:layout_constraintStart_toStartOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivArrow2"
android:src="@drawable/ic_first_charge_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_40"
android:visibility="invisible"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ivArrow3"
app:layout_constraintStart_toEndOf="@+id/ivArrow1"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivArrow3"
android:src="@drawable/ic_first_charge_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_10"
android:visibility="invisible"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@+id/ivArrow2"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/csGift"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_8"
android:background="@drawable/bg_first_charge_list"
app:layout_constraintBottom_toTopOf="@+id/tv_charge"
app:layout_constraintEnd_toEndOf="@+id/view_bg"
app:layout_constraintStart_toStartOf="@+id/view_bg"
app:layout_constraintTop_toBottomOf="@+id/ll_plan">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_title"
android:layout_width="0dp"
android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_14"
android:gravity="center"
android:textColor="@color/color_BE5AF6"
android:textSize="@dimen/sp_12"
android:background="@drawable/bg_first_charge_tip"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/layout_dialog_first_charge_01" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title" >
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_plan"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="center_horizontal"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@+id/view_bg"
app:layout_constraintStart_toStartOf="@+id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:layout_constraintVertical_bias="0.33">
<CheckBox
android:id="@+id/rb_plan_a"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_weight="1"
android:background="@drawable/bg_first_charge_selector_rb_plan_a"
android:button="@null"
android:checked="true"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/color_white"
android:textSize="14sp"
tools:text="@string/layout_dialog_first_charge_02" />
<CheckBox
android:id="@+id/rb_plan_b"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_marginStart="@dimen/dp_12"
android:layout_weight="1"
android:background="@drawable/bg_first_charge_selector_rb_plan_a"
android:button="@null"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/color_white"
android:textSize="14sp"
tools:text="@string/layout_dialog_first_charge_03" />
<CheckBox
android:id="@+id/rb_plan_c"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_marginStart="@dimen/dp_12"
android:layout_weight="1"
android:background="@drawable/bg_first_charge_selector_rb_plan_a"
android:button="@null"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/color_white"
android:textSize="14sp"
tools:text="@string/layout_dialog_first_charge_04" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_10"
android:src="@drawable/ic_first_charge_help"
app:layout_constraintEnd_toEndOf="@+id/view_bg"
app:layout_constraintBottom_toTopOf="@+id/ll_plan" />
<TextView
android:id="@+id/tv_charge"
android:layout_width="wrap_content"
android:layout_height="54dp"
android:background="@drawable/bg_first_charge_charge_btn"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:text="@string/layout_dialog_first_charge_05"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_18"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@+id/view_bg"
app:layout_constraintStart_toStartOf="@+id/view_bg"
app:layout_constraintTop_toBottomOf="@+id/view_bg" />
</androidx.constraintlayout.widget.ConstraintLayout>

72
app/src/main/res/layout/dialog_first_charge_prize.xml
View File

@@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<data>
</data>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">
<LinearLayout
android:layout_width="290dp"
android:layout_height="375dp"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="21.5dp"
android:background="@drawable/bg_first_charge_prize"
android:gravity="center_horizontal"
android:orientation="vertical">
<FrameLayout
android:layout_width="250dp"
android:layout_height="232dp"
android:layout_marginTop="70dp"
android:background="@drawable/bg_first_charge_prize_list">
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="13dp"
android:text="@string/layout_dialog_first_charge_prize_01"
android:textColor="#FFFFDB49"
android:textSize="13sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="wrap_content"
android:layout_gravity="center"
tools:listitem="@layout/item_first_charge_reward"
tools:itemCount="1"
android:layout_height="wrap_content"
android:layout_marginTop="15dp" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="40dp"
android:layout_marginTop="22dp"
android:layout_marginEnd="40dp"
android:text="@string/layout_dialog_first_charge_prize_02"
android:textColor="@color/white"
android:textSize="10sp" />
</LinearLayout>
<ImageView
android:id="@+id/iv_know"
android:layout_width="185dp"
android:layout_height="45dp"
android:layout_gravity="center_horizontal|bottom"
android:gravity="center"
android:src="@drawable/bg_first_charge_prize_ok" />
</FrameLayout>
</layout>

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

@@ -183,20 +183,6 @@
android:layout_marginEnd="16dp"
app:rollviewpager_hint_gravity="center" />
<ImageView
android:id="@+id/iv_first_charge_enter"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_above="@id/iv_queuing_micro"
android:layout_alignParentEnd="true"
android:layout_marginEnd="15dp"
android:layout_marginBottom="6dp"
android:onClick="@{click}"
android:src="@drawable/ic_first_charge_enter"
android:visibility="gone"
tools:contentDescription="@string/layout_fragment_av_room_game_02"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_queuing_micro"
android:layout_width="65dp"

57
app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml
View File

@@ -1,57 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="viewmodel"
type="com.chwl.app.base.BaseMsListViewModel" />
</data>
<com.chwl.app.common.widget.StatusLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:refreshing="@{viewmodel.loading}">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
date="@{viewmodel.data}"
error="@{viewmodel.throwable}"
isLode="@{viewmodel.isLode}"
newData="@{viewmodel.loadData}"
pageSize="@{viewmodel.pageSize}"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.recyclerview.widget.RecyclerView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/ll_empty_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_prize_box_empty"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:text="@string/bills_bottom_tips_most_three_month"
android:textColor="@color/color_D9FEFEFE"
android:textSize="13dp" />
</LinearLayout>
</com.chwl.app.common.widget.StatusLayout>
</layout>

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

@@ -155,33 +155,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:id="@+id/iv_first_charge_enter"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="6dp"
android:onClick="@{click}"
android:src="@drawable/ic_first_charge_enter"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/bottom_view"
app:layout_constraintEnd_toEndOf="parent"
tools:contentDescription="@string/layout_fragment_single_room_05" />
<!-- <ImageView-->
<!-- android:id="@+id/iv_treasure_box"-->
<!-- android:layout_width="65dp"-->
<!-- android:layout_height="65dp"-->
<!-- android:layout_marginEnd="15dp"-->
<!-- android:layout_marginBottom="6dp"-->
<!-- android:onClick="@{click}"-->
<!-- android:src="@drawable/icon_room_treasure_box"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- tools:contentDescription="@string/layout_fragment_single_room_07"-->
<!-- tools:visibility="visible" />-->
<com.chwl.app.avroom.widget.MessageView
android:id="@+id/message_view"
android:layout_width="0dp"

71
app/src/main/res/layout/item_first_charge_reward.xml
View File

@@ -1,71 +0,0 @@
<?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="60dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
tools:layout_width="80dp">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:background="@drawable/bg_first_charge_reward_item_10"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
tools:src="@drawable/ic_first_charge_default" />
<com.coorchice.library.SuperTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text="@string/layout_item_first_charge_reward_01"
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
app:corner="4dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="2dp"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:left_bottom_corner="false"
app:left_top_corner="true"
app:right_bottom_corner="true"
app:right_top_corner="false"
app:shaderEnable="true"
app:shaderEndColor="#E98EF4"
app:shaderMode="leftToRight"
app:shaderStartColor="#E669F7" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:lines="1"
android:textColor="#7E26B0"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_bg"
tools:text="@string/layout_item_first_charge_reward_02" />
</androidx.constraintlayout.widget.ConstraintLayout>

85
app/src/main/res/layout/item_first_charge_reward_one.xml
View File

@@ -1,85 +0,0 @@
<?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"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="78dp"
android:layout_marginEnd="78dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:background="@drawable/bg_first_charge_reward_item_10"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:scaleType="fitCenter"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
tools:src="@drawable/ic_first_charge_default" />
<com.coorchice.library.SuperTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_12"
android:paddingEnd="@dimen/dp_12"
android:text="@string/layout_item_first_charge_reward_01"
android:textColor="@color/white"
android:textSize="@dimen/text_size_9"
app:corner="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="2dp"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:left_bottom_corner="false"
app:left_top_corner="true"
app:right_bottom_corner="true"
app:right_top_corner="false"
app:shaderEnable="true"
app:shaderEndColor="#E98EF4"
app:shaderMode="leftToRight"
app:shaderStartColor="#E669F7" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:lines="1"
android:textColor="#7E26B0"
android:textSize="@dimen/sp_13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_bg"
tools:text="@string/layout_item_first_charge_reward_02" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

85
app/src/main/res/layout/item_first_charge_reward_three.xml
View File

@@ -1,85 +0,0 @@
<?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"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_6"
android:background="@drawable/bg_first_charge_reward_item_6"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:scaleType="fitCenter"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
tools:src="@drawable/ic_first_charge_default" />
<com.coorchice.library.SuperTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_7"
android:paddingEnd="@dimen/dp_7"
android:text="@string/layout_item_first_charge_reward_01"
android:textColor="@color/white"
android:textSize="@dimen/text_size_9"
app:corner="4dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_2"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:left_bottom_corner="false"
app:left_top_corner="true"
app:right_bottom_corner="true"
app:right_top_corner="false"
app:shaderEnable="true"
app:shaderEndColor="#E98EF4"
app:shaderMode="leftToRight"
app:shaderStartColor="#E669F7" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:lines="1"
android:textColor="#7E26B0"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_bg"
tools:text="@string/layout_item_first_charge_reward_02" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

85
app/src/main/res/layout/item_first_charge_reward_two_left.xml
View File

@@ -1,85 +0,0 @@
<?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"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_40"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_6"
android:background="@drawable/bg_first_charge_reward_item_6"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:scaleType="fitCenter"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
tools:src="@drawable/ic_first_charge_default" />
<com.coorchice.library.SuperTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_7"
android:paddingEnd="@dimen/dp_7"
android:text="@string/layout_item_first_charge_reward_01"
android:textColor="@color/white"
android:textSize="@dimen/text_size_9"
app:corner="@dimen/dp_4"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="2dp"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:left_bottom_corner="false"
app:left_top_corner="true"
app:right_bottom_corner="true"
app:right_top_corner="false"
app:shaderEnable="true"
app:shaderEndColor="#E98EF4"
app:shaderMode="leftToRight"
app:shaderStartColor="#E669F7" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:lines="1"
android:textColor="#7E26B0"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_bg"
tools:text="@string/layout_item_first_charge_reward_02" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

85
app/src/main/res/layout/item_first_charge_reward_two_left_small.xml
View File

@@ -1,85 +0,0 @@
<?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"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:layout_marginStart="@dimen/dp_50"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_6"
android:background="@drawable/bg_first_charge_reward_item_6"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:scaleType="fitCenter"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
tools:src="@drawable/ic_first_charge_default" />
<com.coorchice.library.SuperTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_7"
android:paddingEnd="@dimen/dp_7"
android:text="@string/layout_item_first_charge_reward_01"
android:textColor="@color/white"
android:textSize="@dimen/text_size_9"
app:corner="4dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="2dp"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:left_bottom_corner="false"
app:left_top_corner="true"
app:right_bottom_corner="true"
app:right_top_corner="false"
app:shaderEnable="true"
app:shaderEndColor="#E98EF4"
app:shaderMode="leftToRight"
app:shaderStartColor="#E669F7" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:lines="1"
android:textColor="#7E26B0"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_bg"
tools:text="@string/layout_item_first_charge_reward_02" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

85
app/src/main/res/layout/item_first_charge_reward_two_right.xml
View File

@@ -1,85 +0,0 @@
<?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"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_6"
android:background="@drawable/bg_first_charge_reward_item_6"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:scaleType="fitCenter"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
tools:src="@drawable/ic_first_charge_default" />
<com.coorchice.library.SuperTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_7"
android:paddingEnd="@dimen/dp_7"
android:text="@string/layout_item_first_charge_reward_01"
android:textColor="@color/white"
android:textSize="@dimen/text_size_9"
app:corner="@dimen/dp_4"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_2"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:left_bottom_corner="false"
app:left_top_corner="true"
app:right_bottom_corner="true"
app:right_top_corner="false"
app:shaderEnable="true"
app:shaderEndColor="#E98EF4"
app:shaderMode="leftToRight"
app:shaderStartColor="#E669F7" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:lines="1"
android:textColor="#7E26B0"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_bg"
tools:text="@string/layout_item_first_charge_reward_02" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

85
app/src/main/res/layout/item_first_charge_reward_two_right_small.xml
View File

@@ -1,85 +0,0 @@
<?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"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="@dimen/dp_50"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_6"
android:background="@drawable/bg_first_charge_reward_item_6"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:scaleType="fitCenter"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
tools:src="@drawable/ic_first_charge_default" />
<com.coorchice.library.SuperTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_7"
android:paddingEnd="@dimen/dp_7"
android:text="@string/layout_item_first_charge_reward_01"
android:textColor="@color/white"
android:textSize="@dimen/text_size_9"
app:corner="4dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_2"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg"
app:left_bottom_corner="false"
app:left_top_corner="true"
app:right_bottom_corner="true"
app:right_top_corner="false"
app:shaderEnable="true"
app:shaderEndColor="#E98EF4"
app:shaderMode="leftToRight"
app:shaderStartColor="#E669F7" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:lines="1"
android:textColor="#7E26B0"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_bg"
tools:text="@string/layout_item_first_charge_reward_02" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/widget/ShutUpDialog.java
View File

@@ -6,7 +6,7 @@ import android.text.TextUtils;
import android.view.View;
import com.chwl.app.R;
import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog;
import com.chwl.app.base.BaseBindingDialog;
import com.chwl.app.databinding.DialogPubRoomShutupBinding;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;

52
app/src/module_room_chat/res/layout/activity_room_box_ranking.xml
View File

@@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="@color/color_666666">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="360dp"
android:layout_gravity="bottom"
android:background="@drawable/bg_treasure_box_20"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.flyco.tablayout.SlidingTabLayout
android:id="@+id/view_indicator"
android:layout_width="match_parent"
android:layout_height="46dp"
app:tl_indicator_color="@color/color_white"
app:tl_indicator_corner_radius="2dp"
app:tl_indicator_height="@dimen/dp_4"
app:tl_indicator_width="@dimen/dp_13"
app:tl_tab_space_equal="true"
app:tl_textSelectColor="@color/color_white"
app:tl_textUnselectColor="@color/white_transparent_50"
app:tl_textsize="@dimen/sp_16" />
<ImageView
android:id="@+id/iv_refresh"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:src="@drawable/ic_refresh" />
</FrameLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</FrameLayout>