Commit c9e5f7f5 authored by mengcuiguang2's avatar mengcuiguang2

代码优化

parent ac13c021
...@@ -10,8 +10,8 @@ android { ...@@ -10,8 +10,8 @@ android {
applicationId "com.duben.infinitefunjia" applicationId "com.duben.infinitefunjia"
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 729 versionCode 730
versionName "7.2.9" versionName "7.3.0"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
...@@ -136,6 +136,7 @@ ...@@ -136,6 +136,7 @@
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/TransparentTheme" android:theme="@style/TransparentTheme"
android:launchMode="singleTask"
tools:node="merge"> tools:node="merge">
<intent-filter tools:node="replace"> <intent-filter tools:node="replace">
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
......
...@@ -133,6 +133,14 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView, ...@@ -133,6 +133,14 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
super_short_video_view.setOnCustomChildClickListener(this) super_short_video_view.setOnCustomChildClickListener(this)
super_short_video_view.setOnPageChangeListener { super_short_video_view.setOnPageChangeListener {
if (super_short_video_view.isAdPosition(it) || super_short_video_view.isLuckPosition(it)) { if (super_short_video_view.isAdPosition(it) || super_short_video_view.isLuckPosition(it)) {
Handler(Looper.getMainLooper()).postDelayed({
val bundle = Bundle()
bundle.putString(VipForDialogActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
bundle.putString(VipForDialogActivity.THIRD_ID, mVedioBean!!.thirdId)
bundle.putBoolean(VipForDialogActivity.IS_DETAIL, true)
readyGo(VipForDialogActivity::class.java, bundle)
}, 100)
fm_bottom.visibility = View.GONE fm_bottom.visibility = View.GONE
ll_lucky.visibility = View.GONE ll_lucky.visibility = View.GONE
super_short_video_view.pause() super_short_video_view.pause()
...@@ -283,8 +291,16 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView, ...@@ -283,8 +291,16 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
override fun onEpisodeClick(position: Int) { override fun onEpisodeClick(position: Int) {
dialog?.dismiss() dialog?.dismiss()
val data = super_short_video_view.data val data = super_short_video_view.data
if (position >= mVedioBean!!.unlockIndex) { if (position >= mVedioBean!!.unlockIndex) {
Handler(Looper.getMainLooper()).postDelayed({
val bundle = Bundle()
bundle.putString(VipForDialogActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
bundle.putString(VipForDialogActivity.THIRD_ID, mVedioBean!!.thirdId)
bundle.putBoolean(VipForDialogActivity.IS_DETAIL, true)
readyGo(VipForDialogActivity::class.java, bundle)
}, 100)
super_short_video_view.onItemClick(data.size - 1) super_short_video_view.onItemClick(data.size - 1)
// super_short_video_view.onItemClick(mVedioBean!!.unlockIndex) // super_short_video_view.onItemClick(mVedioBean!!.unlockIndex)
return return
......
...@@ -127,6 +127,13 @@ class NewTxVideoActivity : BaseActivity(), View.OnClickListener, VideoView, ...@@ -127,6 +127,13 @@ class NewTxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
it it
) )
) { ) {
Handler(Looper.getMainLooper()).postDelayed({
val bundle = Bundle()
bundle.putString(VipForDialogActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
bundle.putString(VipForDialogActivity.THIRD_ID, mVedioBean!!.thirdId)
bundle.putBoolean(VipForDialogActivity.IS_DETAIL, true)
readyGo(VipForDialogActivity::class.java, bundle)
}, 100)
// fm_bottom.visibility = View.GONE // fm_bottom.visibility = View.GONE
new_super_short_video_view.pause() new_super_short_video_view.pause()
return@setOnPageChangeListener return@setOnPageChangeListener
...@@ -259,7 +266,15 @@ class NewTxVideoActivity : BaseActivity(), View.OnClickListener, VideoView, ...@@ -259,7 +266,15 @@ class NewTxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
dialog?.dismiss() dialog?.dismiss()
val data = new_super_short_video_view.data val data = new_super_short_video_view.data
if (position >= mVedioBean!!.unlockIndex) { if (position >= mVedioBean!!.unlockIndex) {
Handler(Looper.getMainLooper()).postDelayed({
val bundle = Bundle()
bundle.putString(VipForDialogActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
bundle.putString(VipForDialogActivity.THIRD_ID, mVedioBean!!.thirdId)
bundle.putBoolean(VipForDialogActivity.IS_DETAIL, true)
readyGo(VipForDialogActivity::class.java, bundle)
}, 100)
new_super_short_video_view.onItemClick(data.size - 1) new_super_short_video_view.onItemClick(data.size - 1)
return return
} }
......
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