Skip to content

修复detach以后立即attach导致的异常 #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rejigtian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复detach以后立即attach导致的异常 #312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 38 additions & 7 deletions Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute
companion object {
private const val TAG = "${Constant.TAG}.AnimView"
}

//标记正在销毁的状态
private var isDetaching: Boolean = false

//标记detach后立即attach的状态
private var delayAttach: Boolean = false
private lateinit var player: AnimPlayer

private val uiHandler by lazy { Handler(Looper.getMainLooper()) }
Expand Down Expand Up @@ -74,12 +80,12 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute
}

override fun onVideoComplete() {
hide()
hide(false)
animListener?.onVideoComplete()
}

override fun onVideoDestroy() {
hide()
hide(true)
animListener?.onVideoDestroy()
}

Expand All @@ -106,7 +112,7 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute


init {
hide()
hide(false)
player = AnimPlayer(this)
player.animListener = animProxyListener
}
Expand Down Expand Up @@ -137,9 +143,9 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute
ALog.i(TAG, "onSurfaceTextureDestroyed")
this.surface = null
player.onSurfaceTextureDestroyed()
innerTextureView?.surfaceTextureListener = null
innerTextureView = null
uiHandler.post {
innerTextureView?.surfaceTextureListener = null
innerTextureView = null
removeAllViews()
}
return true
Expand All @@ -166,8 +172,16 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute
override fun onAttachedToWindow() {
ALog.i(TAG, "onAttachedToWindow")
super.onAttachedToWindow()
if (isDetaching) {
delayAttach = true
return
}
restart()
}

private fun restart() {
player.isDetachedFromWindow = false
// 自动恢复播放
/* 自动恢复播放 */
if (player.playLoop > 0) {
lastFile?.apply {
startPlay(this)
Expand All @@ -176,12 +190,22 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute
}

override fun onDetachedFromWindow() {
isDetaching = true
ALog.i(TAG, "onDetachedFromWindow")
super.onDetachedFromWindow()
player.isDetachedFromWindow = true
player.onSurfaceTextureDestroyed()
}

private fun checkDetaching() {
if (isDetaching) {
isDetaching = false
if (delayAttach) {
restart()
}
}
}


override fun setAnimListener(animListener: IAnimListener?) {
this.animListener = animListener
Expand Down Expand Up @@ -275,6 +299,10 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute
ALog.e(TAG, "AnimView is GONE, can't play")
return@ui
}
if (isDetaching) {
ALog.e(TAG, "AnimView is detaching, can't play")
return@ui
}
if (!player.isRunning()) {
lastFile = fileContainer
player.startPlay(fileContainer)
Expand All @@ -297,10 +325,13 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute
return scaleTypeUtil.getRealSize()
}

private fun hide() {
private fun hide(isDestroy: Boolean) {
lastFile?.close()
ui {
removeAllViews()
if (isDestroy) {
checkDetaching()
}
}
}

Expand Down