diff --git a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java b/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java index 571d057a1..64dc82691 100644 --- a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java +++ b/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java @@ -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 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java b/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java index c488d321e..b89d89002 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java index d4a63487d..950b8da65 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java index 7dbac923b..88cbb83c4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java +++ b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java index 3af609bbb..97c80a8c6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java index ecc1b0794..21f8edb1e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java index 691560971..c8d76447f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java index 533642b1d..6b5930670 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java index 59b672fbf..b567e2253 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java index 1755bed57..bf8c57068 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceAdapter.java index 6270f5ad7..3fd0c0bb8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceAdapter.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt index 0b5c814c7..c8823769b 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt @@ -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(), } }) + binding.ivRankList.setOnClickListener { + + } + binding.ivTimeHelp.setOnClickListener { VipRemainTimeDialog.newInstance().show(this) } @@ -191,7 +200,6 @@ class VipMainActivity : BaseViewBindingActivity(), } vipViewModel.currVipInfoLiveData.observe(this) { - it?.let { if (it.comingSoon == 2) { binding.llNotOpen.isVisible = true @@ -225,28 +233,29 @@ class VipMainActivity : BaseViewBindingActivity(), } binding.tvOpenVip.setOnClickListener { - if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { - bean?.let { charge -> - //点击充值 - val map = java.util.HashMap(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(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(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(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(), 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 diff --git a/app/src/main/java/com/yizhuan/erban/vip/adapter/PayAdapter.kt b/app/src/main/java/com/yizhuan/erban/vip/adapter/PayAdapter.kt new file mode 100644 index 000000000..fe087148a --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/vip/adapter/PayAdapter.kt @@ -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(R.layout.item_pay) { + + override fun convert(helper: BaseViewHolder, item: PayInfo) { + helper.getView(R.id.ivIcon).setImageResource(item.url) + helper.getView(R.id.tvPayType).text = item.name + helper.getView(R.id.cbPay).isChecked = item.isSelect + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipAuthAdapter.kt b/app/src/main/java/com/yizhuan/erban/vip/adapter/VipAuthAdapter.kt similarity index 95% rename from app/src/main/java/com/yizhuan/erban/vip/VipAuthAdapter.kt rename to app/src/main/java/com/yizhuan/erban/vip/adapter/VipAuthAdapter.kt index 1c388562b..2acbb5b5c 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipAuthAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/adapter/VipAuthAdapter.kt @@ -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 diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/vip/adapter/VipMagicIndicatorAdapter.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/vip/VipMagicIndicatorAdapter.java rename to app/src/main/java/com/yizhuan/erban/vip/adapter/VipMagicIndicatorAdapter.java index 9705e2466..6a1b400c3 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMagicIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/vip/adapter/VipMagicIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.vip; +package com.yizhuan.erban.vip.adapter; import android.content.Context; import android.graphics.Color; diff --git a/app/src/main/java/com/yizhuan/erban/vip/bean/PayInfo.kt b/app/src/main/java/com/yizhuan/erban/vip/bean/PayInfo.kt new file mode 100644 index 000000000..3e2f59e97 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/vip/bean/PayInfo.kt @@ -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 +) \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/vip/dialog/PaymentDialog.kt b/app/src/main/java/com/yizhuan/erban/vip/dialog/PaymentDialog.kt new file mode 100644 index 000000000..dc2b90484 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/vip/dialog/PaymentDialog.kt @@ -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() { + + private lateinit var rvDelegate: RVDelegate + + 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() + .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 { + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipAuthDetailsDialog.kt b/app/src/main/java/com/yizhuan/erban/vip/dialog/VipAuthDetailsDialog.kt similarity index 96% rename from app/src/main/java/com/yizhuan/erban/vip/VipAuthDetailsDialog.kt rename to app/src/main/java/com/yizhuan/erban/vip/dialog/VipAuthDetailsDialog.kt index 41bb19dfc..8ebe0b8d5 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipAuthDetailsDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/dialog/VipAuthDetailsDialog.kt @@ -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 diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt b/app/src/main/java/com/yizhuan/erban/vip/dialog/VipBroadcastDialog.kt similarity index 97% rename from app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt rename to app/src/main/java/com/yizhuan/erban/vip/dialog/VipBroadcastDialog.kt index 687460092..e1ba29671 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/dialog/VipBroadcastDialog.kt @@ -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 diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipRemainTimeDialog.kt b/app/src/main/java/com/yizhuan/erban/vip/dialog/VipRemainTimeDialog.kt similarity index 93% rename from app/src/main/java/com/yizhuan/erban/vip/VipRemainTimeDialog.kt rename to app/src/main/java/com/yizhuan/erban/vip/dialog/VipRemainTimeDialog.kt index 4d4a19df7..69ce11813 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipRemainTimeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/dialog/VipRemainTimeDialog.kt @@ -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 diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt b/app/src/main/java/com/yizhuan/erban/vip/dialog/VipUpgradeDialog.kt similarity index 97% rename from app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt rename to app/src/main/java/com/yizhuan/erban/vip/dialog/VipUpgradeDialog.kt index c0b3b2919..166088437 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/dialog/VipUpgradeDialog.kt @@ -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 diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipHelper.java b/app/src/main/java/com/yizhuan/erban/vip/util/VipHelper.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/vip/VipHelper.java rename to app/src/main/java/com/yizhuan/erban/vip/util/VipHelper.java index 4ac58253e..1a48535b5 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipHelper.java +++ b/app/src/main/java/com/yizhuan/erban/vip/util/VipHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.vip; +package com.yizhuan.erban.vip.util; import android.graphics.Color; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastView.kt b/app/src/main/java/com/yizhuan/erban/vip/view/VipBroadcastView.kt similarity index 99% rename from app/src/main/java/com/yizhuan/erban/vip/VipBroadcastView.kt rename to app/src/main/java/com/yizhuan/erban/vip/view/VipBroadcastView.kt index 668c6817a..04393ce02 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastView.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/view/VipBroadcastView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.vip +package com.yizhuan.erban.vip.view import android.animation.ObjectAnimator import android.annotation.SuppressLint diff --git a/app/src/main/res/drawable-xhdpi/ic_diamond.webp b/app/src/main/res/drawable-xhdpi/ic_diamond.webp new file mode 100644 index 000000000..9d48dc214 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_diamond.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_google.webp b/app/src/main/res/drawable-xhdpi/ic_google.webp new file mode 100644 index 000000000..e22919b3c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_google.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_pay_selected.webp b/app/src/main/res/drawable-xhdpi/ic_pay_selected.webp new file mode 100644 index 000000000..5d5870395 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pay_selected.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_pay_unselected.webp b/app/src/main/res/drawable-xhdpi/ic_pay_unselected.webp new file mode 100644 index 000000000..8b0d8f790 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pay_unselected.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_payermax.webp b/app/src/main/res/drawable-xhdpi/ic_payermax.webp new file mode 100644 index 000000000..9b83b1d72 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_payermax.webp differ diff --git a/app/src/main/res/drawable/selector_select_pay.xml b/app/src/main/res/drawable/selector_select_pay.xml new file mode 100644 index 000000000..ab56de9d3 --- /dev/null +++ b/app/src/main/res/drawable/selector_select_pay.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_payment.xml b/app/src/main/res/layout/dialog_payment.xml new file mode 100644 index 000000000..867438f7c --- /dev/null +++ b/app/src/main/res/layout/dialog_payment.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_pay.xml b/app/src/main/res/layout/item_pay.xml new file mode 100644 index 000000000..181259d13 --- /dev/null +++ b/app/src/main/res/layout/item_pay.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 58d0db7c5..d0d6df7f1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -663,5 +663,6 @@ #F8FF7B #DF7604 #7B3700 + #8A8CAB diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e773c5e62..4b49d6082 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5079,5 +5079,10 @@ 通過尋愛之旅 請給予應用存儲權限,以正常保存圖片。 充值失敗,請先登錄Google Play + 支付 + 確認支付 + 鉆石支付 + 谷歌支付 + Payermax \ No newline at end of file diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java index 3899117ce..a3b6c1e17 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java @@ -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; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java index ea52f39e3..83497851a 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java @@ -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; /** diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java index 262d07da8..600a9cf0e 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java @@ -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; diff --git a/app/src/module_labour_union/res/drawable-xhdpi/ic_rank_list.webp b/app/src/module_labour_union/res/drawable-xhdpi/ic_rank_list.webp new file mode 100644 index 000000000..2e7836e17 Binary files /dev/null and b/app/src/module_labour_union/res/drawable-xhdpi/ic_rank_list.webp differ diff --git a/app/src/module_labour_union/res/layout/activity_vip_main.xml b/app/src/module_labour_union/res/layout/activity_vip_main.xml index 848c42576..08e2cbf5a 100644 --- a/app/src/module_labour_union/res/layout/activity_vip_main.xml +++ b/app/src/module_labour_union/res/layout/activity_vip_main.xml @@ -34,7 +34,7 @@ android:layout_width="260dp" android:layout_height="155dp" /> - - + + - - - - + android:textSize="@dimen/sp_10" /> - - + android:textSize="@dimen/sp_10" /> - - + android:textSize="@dimen/sp_10" /> - - + android:textSize="@dimen/sp_10" /> - + android:textSize="@dimen/sp_10" /> - - - - - - - - -