Commit 59c7fe10 authored by mengcuiguang's avatar mengcuiguang

vip用户进入绑定手机号页面强制退出应用,每次看剧时只弹一次非强制绑定手机号界面

parent 9dcde6d4
...@@ -25,4 +25,7 @@ public class AppConfig { ...@@ -25,4 +25,7 @@ public class AppConfig {
// 启动页时间戳 // 启动页时间戳
public static long splashTime = 0; public static long splashTime = 0;
// vip用户未绑定手机号
public static boolean vipNoBindMobile = false;
} }
...@@ -343,7 +343,7 @@ class MainActivity : BaseActivity(), View.OnClickListener { ...@@ -343,7 +343,7 @@ class MainActivity : BaseActivity(), View.OnClickListener {
// 设置吸附方式,共15种模式,详情参考SidePattern // 设置吸附方式,共15种模式,详情参考SidePattern
.setSidePattern(SidePattern.RESULT_RIGHT) .setSidePattern(SidePattern.RESULT_RIGHT)
// 设置浮窗的对齐方式和坐标偏移量 // 设置浮窗的对齐方式和坐标偏移量
.setGravity(Gravity.END or Gravity.CENTER_VERTICAL, 0, 500) .setGravity(Gravity.END or Gravity.CENTER_VERTICAL, 0, 400)
.show() .show()
} }
...@@ -362,7 +362,7 @@ class MainActivity : BaseActivity(), View.OnClickListener { ...@@ -362,7 +362,7 @@ class MainActivity : BaseActivity(), View.OnClickListener {
// 系统浮窗是否包含EditText,仅针对系统浮窗,默认不包含 // 系统浮窗是否包含EditText,仅针对系统浮窗,默认不包含
.hasEditText(false) .hasEditText(false)
// 设置浮窗的对齐方式和坐标偏移量 // 设置浮窗的对齐方式和坐标偏移量
.setGravity(Gravity.CENTER_VERTICAL or Gravity.START, 0, 500) .setGravity(Gravity.CENTER_VERTICAL or Gravity.START, 0, 400)
// 设置宽高是否充满父布局,直接在xml设置match_parent属性无效 // 设置宽高是否充满父布局,直接在xml设置match_parent属性无效
.setMatchParent(widthMatch = false, heightMatch = false) .setMatchParent(widthMatch = false, heightMatch = false)
// 设置Activity浮窗的出入动画,可自定义,实现相应接口即可(策略模式),无需动画直接设置为null // 设置Activity浮窗的出入动画,可自定义,实现相应接口即可(策略模式),无需动画直接设置为null
......
...@@ -40,6 +40,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener { ...@@ -40,6 +40,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
companion object { companion object {
val TYPE = "type" val TYPE = "type"
val BACK = "back"
} }
private var enterType = ""//【vip】表示挽留用户 private var enterType = ""//【vip】表示挽留用户
...@@ -48,11 +49,13 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener { ...@@ -48,11 +49,13 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
private var mobile: String? = null private var mobile: String? = null
private var isCheckAgree = false private var isCheckAgree = false
private var isBack = false
override fun getBundleExtras(extras: Bundle?) { override fun getBundleExtras(extras: Bundle?) {
super.getBundleExtras(extras) super.getBundleExtras(extras)
extras?.let { extras?.let {
enterType = it.getString(TYPE, "") enterType = it.getString(TYPE, "")
isBack = it.getBoolean(BACK, false)
} }
} }
...@@ -260,6 +263,9 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener { ...@@ -260,6 +263,9 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
dialog?.dismiss() dialog?.dismiss()
when (v?.id) { when (v?.id) {
R.id.dialog_btn_left -> { R.id.dialog_btn_left -> {
if(isBack){
finish()
}
// readyGo(MainActivity::class.java) // readyGo(MainActivity::class.java)
// val activity = // val activity =
// ActivityPageManager.getInstance().getActivity(MainActivity::class.java) // ActivityPageManager.getInstance().getActivity(MainActivity::class.java)
......
...@@ -2,6 +2,7 @@ package com.duben.happyplaylet.video.csj ...@@ -2,6 +2,7 @@ package com.duben.happyplaylet.video.csj
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.widget.Button import android.widget.Button
...@@ -20,6 +21,7 @@ import com.duben.happyplaylet.ad.AdStatusListener ...@@ -20,6 +21,7 @@ import com.duben.happyplaylet.ad.AdStatusListener
import com.duben.happyplaylet.ad.NoPreAdManager import com.duben.happyplaylet.ad.NoPreAdManager
import com.duben.happyplaylet.ad.express.ExpressAdCallback import com.duben.happyplaylet.ad.express.ExpressAdCallback
import com.duben.happyplaylet.ad.express.ExpressManager import com.duben.happyplaylet.ad.express.ExpressManager
import com.duben.happyplaylet.common.AppConfig
import com.duben.happyplaylet.common.Constant import com.duben.happyplaylet.common.Constant
import com.duben.happyplaylet.manager.LocalVedioManager import com.duben.happyplaylet.manager.LocalVedioManager
import com.duben.happyplaylet.manager.UserManager import com.duben.happyplaylet.manager.UserManager
...@@ -28,6 +30,7 @@ import com.duben.happyplaylet.mvp.model.NineShowBean ...@@ -28,6 +30,7 @@ import com.duben.happyplaylet.mvp.model.NineShowBean
import com.duben.happyplaylet.mvp.model.VedioBean import com.duben.happyplaylet.mvp.model.VedioBean
import com.duben.happyplaylet.mvp.presenters.VideoPresenter import com.duben.happyplaylet.mvp.presenters.VideoPresenter
import com.duben.happyplaylet.mvp.views.VideoView import com.duben.happyplaylet.mvp.views.VideoView
import com.duben.happyplaylet.ui.activitys.MobileLoginActivity
import com.duben.happyplaylet.ui.activitys.NineActivity import com.duben.happyplaylet.ui.activitys.NineActivity
import com.duben.happyplaylet.ui.activitys.VipActivity import com.duben.happyplaylet.ui.activitys.VipActivity
import com.duben.happyplaylet.ui.activitys.base.BaseActivity import com.duben.happyplaylet.ui.activitys.base.BaseActivity
...@@ -196,6 +199,16 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -196,6 +199,16 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
if (DPSdk.isStartSuccess()) { if (DPSdk.isStartSuccess()) {
init() init()
} }
if (UserManager.getInstance().vipFlag &&
TextUtils.isEmpty(UserManager.getInstance().mobile) &&
!AppConfig.vipNoBindMobile
) {
AppConfig.vipNoBindMobile = true
val bundle = Bundle()
bundle.putBoolean(MobileLoginActivity.BACK, true)
readyGo(MobileLoginActivity::class.java, bundle)
}
} }
override fun isApplyKitKatTranslucency() = true override fun isApplyKitKatTranslucency() = true
......
...@@ -2,6 +2,7 @@ package com.duben.happyplaylet.video.tx ...@@ -2,6 +2,7 @@ package com.duben.happyplaylet.video.tx
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils
import android.view.View import android.view.View
import com.google.gson.Gson import com.google.gson.Gson
import com.duben.happyplaylet.R import com.duben.happyplaylet.R
...@@ -10,6 +11,7 @@ import com.duben.happyplaylet.ad.AdStatusListener ...@@ -10,6 +11,7 @@ import com.duben.happyplaylet.ad.AdStatusListener
import com.duben.happyplaylet.ad.NoPreAdManager import com.duben.happyplaylet.ad.NoPreAdManager
import com.duben.happyplaylet.ad.draw.DrawExpressManager import com.duben.happyplaylet.ad.draw.DrawExpressManager
import com.duben.happyplaylet.ad.express.ExpressManager import com.duben.happyplaylet.ad.express.ExpressManager
import com.duben.happyplaylet.common.AppConfig
import com.duben.happyplaylet.common.Constant import com.duben.happyplaylet.common.Constant
import com.duben.happyplaylet.manager.LocalVedioManager import com.duben.happyplaylet.manager.LocalVedioManager
import com.duben.happyplaylet.manager.UserManager import com.duben.happyplaylet.manager.UserManager
...@@ -17,6 +19,7 @@ import com.duben.happyplaylet.mvp.model.* ...@@ -17,6 +19,7 @@ import com.duben.happyplaylet.mvp.model.*
import com.duben.happyplaylet.mvp.model.IndexList.VedioEpisodeBean import com.duben.happyplaylet.mvp.model.IndexList.VedioEpisodeBean
import com.duben.happyplaylet.mvp.presenters.VideoPresenter import com.duben.happyplaylet.mvp.presenters.VideoPresenter
import com.duben.happyplaylet.mvp.views.VideoView import com.duben.happyplaylet.mvp.views.VideoView
import com.duben.happyplaylet.ui.activitys.MobileLoginActivity
import com.duben.happyplaylet.ui.activitys.NineActivity import com.duben.happyplaylet.ui.activitys.NineActivity
import com.duben.happyplaylet.ui.activitys.VipActivity import com.duben.happyplaylet.ui.activitys.VipActivity
import com.duben.happyplaylet.ui.activitys.base.BaseActivity import com.duben.happyplaylet.ui.activitys.base.BaseActivity
...@@ -61,6 +64,16 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView, ...@@ -61,6 +64,16 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
videoPresenter.attachView(this) videoPresenter.attachView(this)
mVedioBean?.let { videoPresenter.getIndexList("" + it.vedioId) } mVedioBean?.let { videoPresenter.getIndexList("" + it.vedioId) }
initView() initView()
if (UserManager.getInstance().vipFlag &&
TextUtils.isEmpty(UserManager.getInstance().mobile) &&
!AppConfig.vipNoBindMobile
) {
AppConfig.vipNoBindMobile = true
val bundle = Bundle()
bundle.putBoolean(MobileLoginActivity.BACK, true)
readyGo(MobileLoginActivity::class.java, bundle)
}
} }
override fun getBundleExtras(extras: Bundle?) { override fun getBundleExtras(extras: Bundle?) {
...@@ -394,7 +407,7 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView, ...@@ -394,7 +407,7 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
if (isLuckyShow || localLucky) { if (isLuckyShow || localLucky) {
ll_lucky.visibility = View.VISIBLE ll_lucky.visibility = View.VISIBLE
context?.let { GlideUtils.loadRoundImageViewGif(it,R.drawable.ic_nine,iv_lucky_gif) } context?.let { GlideUtils.loadRoundImageViewGif(it, R.drawable.ic_nine, iv_lucky_gif) }
} else { } else {
ll_lucky.visibility = View.GONE ll_lucky.visibility = View.GONE
......
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