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

[Modify]贵族调起支付增加弹窗

Browse Source
This commit is contained in:
wushaocheng
2023-07-12 19:01:11 +08:00
parent 4999c6e955
commit 0dd0e131f2
40 changed files with 349 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java
View File

@@ -9,7 +9,7 @@ import com.yizhuan.erban.relation.cp.dialog.CpGlobalDialog;
import com.yizhuan.erban.ui.widget.LevelUpDialog;
import com.yizhuan.erban.ui.widget.RecallDialog;
import com.yizhuan.erban.ui.widget.lottery_dialog.LotteryDialogManager;
import com.yizhuan.erban.vip.VipUpgradeDialog;
import com.yizhuan.erban.vip.dialog.VipUpgradeDialog;
import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo;
import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent;
import com.yizhuan.xchat_android_core.level.event.LevelUpEvent;
@@ -27,8 +27,6 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.lang.ref.WeakReference;
/**
* 全局处理，比如App弹窗
* create by lvzebiao @2019/8/14

2
app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java
View File

@@ -18,7 +18,7 @@ import com.yizhuan.erban.ui.im.avtivity.NimFriendModel;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.erban.ui.widget.GiftDialog;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;

2
app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
View File

@@ -30,7 +30,7 @@ import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.erban.ui.widget.recyclerview.layoutmanager.FullyGridLayoutManager;
import com.yizhuan.erban.vip.VipBroadcastDialog;
import com.yizhuan.erban.vip.dialog.VipBroadcastDialog;
import com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.auth.AuthModel;

2
app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java
View File

@@ -7,7 +7,7 @@ import androidx.databinding.ObservableBoolean;
import androidx.databinding.ObservableField;
import com.yizhuan.erban.R;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo;
import com.yizhuan.xchat_android_library.bindinglist.BaseItem;

2
app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java
View File

@@ -16,7 +16,7 @@ import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;

2
app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java
View File

@@ -20,7 +20,7 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.level.UserLevelVo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.SystemUidUtil;

2
app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java
View File

@@ -11,7 +11,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.bean.AttentionInfo;

2
app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
View File

@@ -12,7 +12,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.im.friend.IMFriendModel;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.bean.FansInfo;

2
app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java
View File

@@ -66,7 +66,7 @@ import com.yizhuan.erban.ui.widget.rollviewpager.HintView;
import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView;
import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;

2
app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
View File

@@ -45,7 +45,7 @@ import com.yizhuan.erban.ui.user.adapter.SkillPicsAdapter;
import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;

2
app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceAdapter.java
View File

@@ -10,7 +10,7 @@ import android.widget.TextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo;
import com.yizhuan.xchat_android_core.room.face.FaceInfo;
import com.yizhuan.xchat_android_core.utils.TextUtils;

61
app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt
View File

@@ -38,6 +38,11 @@ import com.yizhuan.erban.ui.setting.ModifyPwdActivity
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
import com.yizhuan.erban.vip.adapter.VipAuthAdapter
import com.yizhuan.erban.vip.adapter.VipMagicIndicatorAdapter
import com.yizhuan.erban.vip.dialog.PaymentDialog
import com.yizhuan.erban.vip.dialog.VipAuthDetailsDialog
import com.yizhuan.erban.vip.dialog.VipRemainTimeDialog
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.auth.AuthModel
@@ -90,6 +95,10 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
}
})
binding.ivRankList.setOnClickListener {
}
binding.ivTimeHelp.setOnClickListener {
VipRemainTimeDialog.newInstance().show(this)
}
@@ -191,7 +200,6 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
}
vipViewModel.currVipInfoLiveData.observe(this) {
it?.let {
if (it.comingSoon == 2) {
binding.llNotOpen.isVisible = true
@@ -225,28 +233,29 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
}
binding.tvOpenVip.setOnClickListener {
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
bean?.let { charge ->
//点击充值
val map = java.util.HashMap<String, Any>(3)
map[IReportConstants.MONEY] = charge.money
map[IReportConstants.MODULE] = IReportConstants.PEKO_PAY
ReportManager.get().reportEvent(IReportConstants.PAY_CLICK, map)
buyProduct(charge.skuDetails)
}
} else {
chargeInfo?.let { charge ->
//点击充值
val map = java.util.HashMap<String, Any>(3)
map[IReportConstants.MONEY] = charge.money
map[IReportConstants.MODULE] = IReportConstants.PEKO_PAY
ReportManager.get().reportEvent(IReportConstants.PAY_CLICK, map)
CommonWebViewActivity.start(
context,
UriProvider.getOfficialPay(5, DeviceUtil.getDeviceId(context))
)
}
}
PaymentDialog().show(this)
// if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
// bean?.let { charge ->
// //点击充值
// val map = java.util.HashMap<String, Any>(3)
// map[IReportConstants.MONEY] = charge.money
// map[IReportConstants.MODULE] = IReportConstants.PEKO_PAY
// ReportManager.get().reportEvent(IReportConstants.PAY_CLICK, map)
// buyProduct(charge.skuDetails)
// }
// } else {
// chargeInfo?.let { charge ->
// //点击充值
// val map = java.util.HashMap<String, Any>(3)
// map[IReportConstants.MONEY] = charge.money
// map[IReportConstants.MODULE] = IReportConstants.PEKO_PAY
// ReportManager.get().reportEvent(IReportConstants.PAY_CLICK, map)
// CommonWebViewActivity.start(
// context,
// UriProvider.getOfficialPay(5, DeviceUtil.getDeviceId(context))
// )
// }
// }
}
}
@@ -296,7 +305,11 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
val commonNavigator = CommonNavigator(context)
commonNavigator.isEnablePivotScroll = true
commonNavigator.isFollowTouch = false
val magicIndicatorAdapter = VipMagicIndicatorAdapter(context, tagList)
val magicIndicatorAdapter =
VipMagicIndicatorAdapter(
context,
tagList
)
magicIndicatorAdapter.setOnItemSelectListener(this)
commonNavigator.adapter = magicIndicatorAdapter
binding.magicIndicator.navigator = commonNavigator

20
app/src/main/java/com/yizhuan/erban/vip/adapter/PayAdapter.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.yizhuan.erban.vip.adapter
import android.widget.CheckBox
import android.widget.ImageView
import androidx.appcompat.widget.AppCompatTextView
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.vip.bean.PayInfo
class PayAdapter :
BaseQuickAdapter<PayInfo, BaseViewHolder>(R.layout.item_pay) {
override fun convert(helper: BaseViewHolder, item: PayInfo) {
helper.getView<ImageView>(R.id.ivIcon).setImageResource(item.url)
helper.getView<AppCompatTextView>(R.id.tvPayType).text = item.name
helper.getView<CheckBox>(R.id.cbPay).isChecked = item.isSelect
}
}

2
app/src/main/java/com/yizhuan/erban/vip/VipAuthAdapter.kt → app/src/main/java/com/yizhuan/erban/vip/adapter/VipAuthAdapter.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.vip
package com.yizhuan.erban.vip.adapter
import android.widget.ImageView
import com.chad.library.adapter.base.BaseQuickAdapter

2
app/src/main/java/com/yizhuan/erban/vip/VipMagicIndicatorAdapter.java → app/src/main/java/com/yizhuan/erban/vip/adapter/VipMagicIndicatorAdapter.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.vip;
package com.yizhuan.erban.vip.adapter;
import android.content.Context;
import android.graphics.Color;

8
app/src/main/java/com/yizhuan/erban/vip/bean/PayInfo.kt Normal file
View File

@@ -0,0 +1,8 @@
package com.yizhuan.erban.vip.bean
data class PayInfo(
val url: Int = 0,
val name: String = "",
val diamondNum: Int = 0,
var isSelect: Boolean = false
)

76
app/src/main/java/com/yizhuan/erban/vip/dialog/PaymentDialog.kt Normal file
View File

@@ -0,0 +1,76 @@
package com.yizhuan.erban.vip.dialog
import android.annotation.SuppressLint
import android.view.Gravity
import android.view.WindowManager
import androidx.recyclerview.widget.LinearLayoutManager
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogPaymentBinding
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.erban.vip.adapter.PayAdapter
import com.yizhuan.erban.vip.bean.PayInfo
import com.yizhuan.xchat_android_library.utils.ResUtil
/**
* 支付选择弹窗
*/
class PaymentDialog : BaseDialog<DialogPaymentBinding>() {
private lateinit var rvDelegate: RVDelegate<PayInfo>
private val payAdapter by lazy { PayAdapter() }
private val payList = listOf(
PayInfo(
url = R.drawable.ic_diamond,
name = ResUtil.getString(R.string.diamond_pay),
isSelect = true
),
PayInfo(
url = R.drawable.ic_google,
name = ResUtil.getString(R.string.google_pay),
isSelect = false
),
PayInfo(
url = R.drawable.ic_payermax,
name = ResUtil.getString(R.string.payermax_pay),
isSelect = false
)
)
private var selectIndex = -1
override var width = WindowManager.LayoutParams.MATCH_PARENT
override var gravity = Gravity.BOTTOM
@SuppressLint("CheckResult")
override fun init() {
rvDelegate = RVDelegate.Builder<PayInfo>()
.setAdapter(payAdapter)
.setRecyclerView(binding.mRecyclerView)
.setLayoutManager(LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false))
.build()
payAdapter.setNewData(payList)
payAdapter.setOnItemClickListener { _, _, position ->
if (selectIndex != -1) {
payAdapter.data.getOrNull(selectIndex)?.isSelect = false
payAdapter.notifyItemChanged(selectIndex)
} else if (position != 0) {
payAdapter.data.getOrNull(0)?.isSelect = false
payAdapter.notifyItemChanged(0)
}
selectIndex = position
payAdapter.data.getOrNull(selectIndex)?.isSelect = true
payAdapter.notifyItemChanged(selectIndex)
}
binding.tvConfirmPay.setOnClickListener {
}
}
}

2
app/src/main/java/com/yizhuan/erban/vip/VipAuthDetailsDialog.kt → app/src/main/java/com/yizhuan/erban/vip/dialog/VipAuthDetailsDialog.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.vip
package com.yizhuan.erban.vip.dialog
import android.os.Bundle
import com.yizhuan.erban.base.BaseDialog

3
app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt → app/src/main/java/com/yizhuan/erban/vip/dialog/VipBroadcastDialog.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.vip
package com.yizhuan.erban.vip.dialog
import android.annotation.SuppressLint
import android.os.Bundle
@@ -8,6 +8,7 @@ import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseActivity
import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogVipBroadcastBinding
import com.yizhuan.erban.vip.VipViewModel
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_library.utils.ResUtil

2
app/src/main/java/com/yizhuan/erban/vip/VipRemainTimeDialog.kt → app/src/main/java/com/yizhuan/erban/vip/dialog/VipRemainTimeDialog.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.vip
package com.yizhuan.erban.vip.dialog
import android.os.Bundle
import com.yizhuan.erban.base.BaseDialog

3
app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt → app/src/main/java/com/yizhuan/erban/vip/dialog/VipUpgradeDialog.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.vip
package com.yizhuan.erban.vip.dialog
import android.annotation.SuppressLint
import android.os.Bundle
@@ -9,6 +9,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity
import com.yizhuan.erban.base.BaseActivity
import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogVipUpgradeBinding
import com.yizhuan.erban.vip.VipViewModel
import com.yizhuan.xchat_android_core.vip.VipInfo
import java.net.MalformedURLException
import java.net.URL

2
app/src/main/java/com/yizhuan/erban/vip/VipHelper.java → app/src/main/java/com/yizhuan/erban/vip/util/VipHelper.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.vip;
package com.yizhuan.erban.vip.util;
import android.graphics.Color;
import android.view.View;

2
app/src/main/java/com/yizhuan/erban/vip/VipBroadcastView.kt → app/src/main/java/com/yizhuan/erban/vip/view/VipBroadcastView.kt
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.vip
package com.yizhuan.erban.vip.view
import android.animation.ObjectAnimator
import android.annotation.SuppressLint

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 808 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

6
app/src/main/res/drawable/selector_select_pay.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_pay_selected" android:state_checked="true" />
<item android:drawable="@drawable/ic_pay_unselected" android:state_checked="false" />
<item android:drawable="@drawable/ic_pay_unselected" />
</selector>

73
app/src/main/res/layout/dialog_payment.xml Normal file
View File

@@ -0,0 +1,73 @@
<?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_gravity="bottom"
android:background="@drawable/shape_white_bottom_12dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvPay"
android:text="@string/pay"
android:textColor="@color/color_1F1B4F"
android:textSize="@dimen/sp_18"
android:includeFontPadding="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_24"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvDiamondNum"
android:text="0"
android:textSize="28sp"
android:textColor="@color/color_9168FA"
android:includeFontPadding="false"
android:layout_marginTop="@dimen/dp_30"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/tvPay"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvDiamond"
android:text="@string/diamond"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_8A8CAB"
android:layout_marginTop="@dimen/dp_6"
android:includeFontPadding="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/tvDiamondNum"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
android:scrollbars="none"
app:layout_constraintTop_toBottomOf="@+id/tvDiamond" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvConfirmPay"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginStart="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_36"
android:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/bg_common_confirm_30"
android:gravity="center"
android:text="@string/confirm_pay"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
app:layout_constraintTop_toBottomOf="@+id/mRecyclerView"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

54
app/src/main/res/layout/item_pay.xml Normal file
View File

@@ -0,0 +1,54 @@
<?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="@dimen/dp_60"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_40">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_diamond" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvPayType"
android:textSize="@dimen/sp_16"
android:textColor="@color/color_1F1B4F"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/ivIcon"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/diamond_pay"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvDiamondNum"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_8A8CAB"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:visibility="invisible"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvPayType"
tools:text="(2鉆石)"/>
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/cbPay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_select_pay"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/values/colors.xml
View File

@@ -663,5 +663,6 @@
<color name="color_F8FF7B">#F8FF7B</color>
<color name="color_DF7604">#DF7604</color>
<color name="color_7B3700">#7B3700</color>
<color name="color_8A8CAB">#8A8CAB</color>
</resources>

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

@@ -5079,5 +5079,10 @@
<string name="treasure_in_find_love">通過尋愛之旅</string>
<string name="give_application_storage_permission">請給予應用存儲權限，以正常保存圖片。</string>
<string name="Recharge_failure">充值失敗，請先登錄Google Play</string>
<string name="pay">支付</string>
<string name="confirm_pay">確認支付</string>
<string name="diamond_pay">鉆石支付</string>
<string name="google_pay">谷歌支付</string>
<string name="payermax_pay">Payermax</string>
</resources>

2
app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java
View File

@@ -14,7 +14,7 @@ import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.erban.utils.TimeUiUtils;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.community.bean.Comment;
import com.yizhuan.xchat_android_library.utils.ListUtils;

2
app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java
View File

@@ -12,7 +12,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.erban.utils.SpannableBuilder;
import com.yizhuan.erban.utils.TimeUiUtils;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.community.bean.comment.Reply;
/**

2
app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java
View File

@@ -16,7 +16,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.erban.utils.TimeUiUtils;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo;
import com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout;

BIN
app/src/module_labour_union/res/drawable-xhdpi/ic_rank_list.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

76
app/src/module_labour_union/res/layout/activity_vip_main.xml
View File

@@ -34,7 +34,7 @@
android:layout_width="260dp"
android:layout_height="155dp" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
@@ -68,7 +68,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivRankList"
android:src="@drawable/ic_rank_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_my_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -79,14 +89,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_vip_icon" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_not_open"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="@string/layout_activity_vip_main_02"
android:textColor="#ffb59862"
android:textSize="12dp"
android:textSize="@dimen/sp_12"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -104,7 +114,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_not_open" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_auth_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -132,7 +142,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
<com.yizhuan.xchat_android_library.widget.DrawableCenterTextView
@@ -192,24 +201,25 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center_vertical"
android:baselineAligned="true">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_vip_main_04"
android:textColor="#ffbc9e66"
android:textSize="10dp" />
android:textSize="@dimen/sp_10" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_curr_level_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:textColor="#ffffe3af"
android:textSize="12dp"
android:textSize="@dimen/sp_12"
tools:text="@string/layout_activity_vip_main_05" />
<LinearLayout
@@ -218,67 +228,67 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/layout_activity_vip_main_06"
android:textColor="#ffbc9e66"
android:textSize="10dp" />
android:textSize="@dimen/sp_10" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_upgrade_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffe3af"
android:textSize="13dp"
android:textSize="@dimen/sp_13"
tools:text="4562" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_activity_vip_main_07"
android:textColor="#ffbc9e66"
android:textSize="10dp" />
android:textSize="@dimen/sp_10" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_next_level_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffbc9e66"
android:textSize="10dp"
android:textSize="@dimen/sp_10"
tools:text="@string/layout_activity_vip_main_08" />
</LinearLayout>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_max_level_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_vip_main_09"
android:textColor="#ffbc9e66"
android:textSize="10dp" />
android:textSize="@dimen/sp_10" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/layout_activity_vip_main_010"
android:textColor="#ffbc9e66"
android:textSize="10dp" />
android:textSize="@dimen/sp_10" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_residue_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffe3af"
android:textSize="13dp"
android:textSize="@dimen/sp_13"
tools:text="@string/layout_activity_vip_main_011" />
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_time_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -294,7 +304,7 @@
android:layout_height="wrap_content"
android:background="#FF252014">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_auth_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -324,7 +334,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_auth_text" />
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_keep_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -335,35 +345,35 @@
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toStartOf="@id/seek_bar" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_keep_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffbc9e66"
android:textSize="10sp"
android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toTopOf="@id/iv_keep_indicator"
app:layout_constraintEnd_toEndOf="@id/iv_keep_indicator"
app:layout_constraintStart_toStartOf="@id/iv_keep_indicator"
tools:text="@string/layout_activity_vip_main_012" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_up_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:textColor="#ffbc9e66"
android:textSize="10sp"
android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toTopOf="@id/seek_bar"
app:layout_constraintEnd_toEndOf="@id/seek_bar"
tools:text="@string/layout_activity_vip_main_013" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_curr_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="#ffffe3af"
android:textSize="10sp"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="@id/seek_bar"
app:layout_constraintHorizontal_bias="0.3"
app:layout_constraintStart_toStartOf="@id/seek_bar"

2
app/src/module_mini_world/res/layout/fragment_av_room_game.xml
View File

@@ -395,7 +395,7 @@
android:layout_marginTop="@dimen/dp_8"
android:layout="@layout/avroom_music_player_layout" />
<com.yizhuan.erban.vip.VipBroadcastView
<com.yizhuan.erban.vip.view.VipBroadcastView
android:id="@+id/vip_broadcast_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/module_mini_world/res/layout/fragment_single_room.xml
View File

@@ -289,7 +289,7 @@
</RelativeLayout>
<com.yizhuan.erban.vip.VipBroadcastView
<com.yizhuan.erban.vip.view.VipBroadcastView
android:id="@+id/vip_broadcast_view"
android:layout_width="0dp"
android:layout_height="wrap_content"