Skip to content

A
android_vediosocial
Commit d45e8790 authored by mengcuiguang2's avatar mengcuiguang2
Browse files
Options

1、穿山甲短剧解锁时去除第二个解锁提示弹窗

parent f611f776
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 61 deletions
video/app/build.gradle
View file @ d45e8790
......@@ -16,8 +16,8 @@ android {
applicationId "com.duben.loveplayletd"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 1
versionName "1.0.0"
versionCode 800
versionName "8.0.0"
flavorDimensions "default"
// dex突破65535的限制
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/BindAliPayActivity.kt
View file @ d45e8790
......@@ -52,7 +52,8 @@ class BindAliPayActivity : BaseActivity(), View.OnClickListener, DrawCashView {
&& !it.idcardName.isNullOrEmpty()
) {
et_name.hint = maskName(it.idcardName)
et_account.hint = maskPhoneNumber(it.alipayAccount)
// et_account.hint = maskPhoneNumber(it.alipayAccount)
et_account.hint = it.alipayAccount
et_idcard_no.hint = maskIdCard(it.idcard)
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/CsjDetailActivity.kt
View file @ d45e8790
......@@ -139,19 +139,30 @@ class CsjDetailActivity : BaseActivity(), View.OnClickListener {
callback.onConfirm(info)
},
close = {
hide()
val info = DJXDramaUnlockInfo(
drama.id,
lockSet,
DJXDramaUnlockMethod.METHOD_AD,
cancelUnlock = true
)
callback.onConfirm(info)
// hide()
// val info = DJXDramaUnlockInfo(
// drama.id,
// lockSet,
// DJXDramaUnlockMethod.METHOD_AD,
// cancelUnlock = true
// )
// callback.onConfirm(info)
finish()
}
)
show()
}
}
// val unlockType = DJXUnlockModeType.UNLOCKTYPE_DEFAULT
// //点击激励视频解锁
// val info = DJXDramaUnlockInfo(
// drama.id,
// lockSet,
// DJXDramaUnlockMethod.METHOD_AD,
// false,
// unlockType = unlockType
// )
// callback.onConfirm(info)
}
override fun unlockFlowEnd(
......@@ -183,11 +194,11 @@ class CsjDetailActivity : BaseActivity(), View.OnClickListener {
setRewardAdInteractionListener(object :
TTRewardVideoAd.RewardAdInteractionListener {
override fun onAdShow() {
Toast.makeText(
this@CsjDetailActivity,
"自定义广告展示",
Toast.LENGTH_LONG
).show()
// Toast.makeText(
// this@CsjDetailActivity,
// "自定义广告展示",
// Toast.LENGTH_LONG
// ).show()
callback.onShow("") // CSJ cpm 不对外，可以参考 GroMore getShowEcpm 方法获取
}
......@@ -253,7 +264,7 @@ class CsjDetailActivity : BaseActivity(), View.OnClickListener {
})
// hideLikeButton(intent.getBooleanExtra(DramaDetailConfigActivity.KEY_DRAMA_HIDE_LIKE_BUTTON, false))
// hideFavorButton(intent.getBooleanExtra(DramaDetailConfigActivity.KEY_DRAMA_HIDE_FAVOR_BUTTON, false))
// hideRewardDialog(intent.getBooleanExtra(DramaDetailConfigActivity.KEY_DRAMA_HIDE_REWARD_DIALOG, false))
hideRewardDialog(true)
// hideBack(intent.getBooleanExtra(DramaDetailConfigActivity.KEY_DRAMA_HIDE_BACK, false), null)
// hideTopInfo(intent.getBooleanExtra(DramaDetailConfigActivity.KEY_DRAMA_HIDE_TOP_INFO, false))
// hideBottomInfo(intent.getBooleanExtra(DramaDetailConfigActivity.KEY_DRAMA_HIDE_BOTTOM_INFO, false))
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/VipActivity.kt
View file @ d45e8790
......@@ -681,7 +681,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
// payYesDialog!!.dismiss()
}
R.id.tv_dialog_vip_next -> {
R.id.rl_dialog_vip_bg -> {
cbVipAgreement.isChecked = true
if (vipList.size > 0) {
......
video/app/src/main/java/com/duben/loveplayletd/ui/widgets/PayYesDialog.kt
View file @ d45e8790
......@@ -24,11 +24,9 @@ class PayYesDialog(
context, R.style.dialog
) {
private val lp: WindowManager.LayoutParams
private val tv_dialog_vip_next: TextView
private val tv_dialog_vip_count: TextView
private val iv_dialog_vip_quit: ImageView
private val iv_dialog_vip_top: ImageView
private val rl_dialog_vip_bg: RelativeLayout
private val rl_dialog_vip_bg: FrameLayout
init {
setContentView(R.layout.dialog_payyes)
......@@ -49,13 +47,10 @@ class PayYesDialog(
// 查找View
iv_dialog_vip_quit = findViewById<View>(R.id.iv_dialog_vip_quit) as ImageView
iv_dialog_vip_top = findViewById<View>(R.id.iv_dialog_vip_top) as ImageView
tv_dialog_vip_next = findViewById<View>(R.id.tv_dialog_vip_next) as TextView
tv_dialog_vip_count = findViewById<View>(R.id.tv_dialog_vip_count) as TextView
rl_dialog_vip_bg = findViewById<View>(R.id.rl_dialog_vip_bg) as RelativeLayout
rl_dialog_vip_bg = findViewById<View>(R.id.rl_dialog_vip_bg) as FrameLayout
iv_dialog_vip_quit.setOnClickListener(listener)
tv_dialog_vip_next.setOnClickListener(listener)
iv_dialog_vip_top.setImageResource(R.mipmap.ic_vip_pay_top2)
rl_dialog_vip_bg.setOnClickListener(listener)
if (vipBean.payToModel == 2) {
// 跳转小程序领券
......
video/app/src/main/res/layout/activity_bind_alipay.xml
View file @ d45e8790
......@@ -64,7 +64,6 @@
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:hint="请填写支付宝账号"
android:inputType="number"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="16sp" />
......
video/app/src/main/res/layout/dialog_payyes.xml
View file @ d45e8790
......@@ -3,51 +3,32 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
<FrameLayout
android:id="@+id/rl_dialog_vip_bg"
android:layout_width="match_parent"
android:layout_height="420dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="36dp"
android:layout_marginTop="-20dp"
android:layout_marginEnd="36dp"
android:layout_width="329dp"
android:layout_height="364dp"
android:layout_gravity="center"
android:background="@mipmap/bg_pay_yes"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_dialog_vip_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:src="@mipmap/ic_vip_pay_top1" />
<ImageView
android:id="@+id/iv_dialog_vip_quit"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="124dp"
android:layout_marginEnd="15dp"
android:layout_marginRight="20dp"
android:src="@mipmap/ic_vip_back" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="20dp"
android:layout_gravity="right"
android:src="@mipmap/bg_pay_calcel" />
<TextView
android:id="@+id/tv_dialog_vip_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="12312"
android:layout_marginTop="21dp"
android:layout_gravity="center"
android:textSize="16sp"
android:lineSpacingExtra="-6dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="134dp"
android:textColor="@color/color_FFF0D4" />
<TextView
android:id="@+id/tv_dialog_vip_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="30dp"
android:background="@mipmap/ic_vip_pay_btn" />
</RelativeLayout>
</FrameLayout>
</FrameLayout>
video/app/src/main/res/layout/dialog_unlock.xml
View file @ d45e8790
......@@ -69,7 +69,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="看广告解锁"
android:text="看广告解锁3集"
android:textColor="#161823"
android:textSize="16sp"
tools:ignore="HardcodedText" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment