From 99dd0ea226772ab84d3b4748ecbbaed547698c59 Mon Sep 17 00:00:00 2001 From: hexleo Date: Thu, 20 May 2021 11:24:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug:=20=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=B2=A1=E6=9C=89=E5=9B=9E=E8=B0=83onVideoCo?= =?UTF-8?q?mplete=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/tencent/qgame/animplayer/AnimPlayer.kt | 6 ++++-- .../src/main/java/com/tencent/qgame/animplayer/AnimView.kt | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimPlayer.kt b/Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimPlayer.kt index bcc484c3..b21458f5 100644 --- a/Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimPlayer.kt +++ b/Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimPlayer.kt @@ -76,16 +76,18 @@ class AnimPlayer(val animView: IAnimView) { isStartRunning = true prepareDecoder() if (decoder?.prepareThread() == false) { - decoder?.onFailed(Constant.REPORT_ERROR_TYPE_CREATE_THREAD, Constant.ERROR_MSG_CREATE_THREAD) isStartRunning = false + decoder?.onFailed(Constant.REPORT_ERROR_TYPE_CREATE_THREAD, Constant.ERROR_MSG_CREATE_THREAD) + decoder?.onVideoComplete() return } // 在线程中解析配置 decoder?.renderThread?.handler?.post { val result = configManager.parseConfig(fileContainer, enableVersion1, videoMode, fps) if (result != Constant.OK) { - decoder?.onFailed(result, Constant.getErrorMsg(result)) isStartRunning = false + decoder?.onFailed(result, Constant.getErrorMsg(result)) + decoder?.onVideoComplete() return@post } ALog.i(TAG, "parse ${configManager.config}") diff --git a/Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimView.kt b/Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimView.kt index e35a595e..adbcebdc 100644 --- a/Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimView.kt +++ b/Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/AnimView.kt @@ -232,6 +232,7 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute startPlay(fileContainer) } catch (e: Throwable) { animProxyListener.onFailed(Constant.REPORT_ERROR_TYPE_FILE_ERROR, Constant.ERROR_MSG_FILE_ERROR) + animProxyListener.onVideoComplete() } } @@ -241,6 +242,7 @@ open class AnimView @JvmOverloads constructor(context: Context, attrs: Attribute startPlay(fileContainer) } catch (e: Throwable) { animProxyListener.onFailed(Constant.REPORT_ERROR_TYPE_FILE_ERROR, Constant.ERROR_MSG_FILE_ERROR) + animProxyListener.onVideoComplete() } } From e4042dedcc57077c59d4612db23723f4e444ced6 Mon Sep 17 00:00:00 2001 From: hexleo Date: Thu, 20 May 2021 11:31:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=20=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/PlayerProj/animplayer/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android/PlayerProj/animplayer/build.gradle b/Android/PlayerProj/animplayer/build.gradle index 012fddec..ae62d52e 100644 --- a/Android/PlayerProj/animplayer/build.gradle +++ b/Android/PlayerProj/animplayer/build.gradle @@ -34,4 +34,6 @@ dependencies { // maven central // 上传指令./gradlew uploadArchives +// https://s01.oss.sonatype.org/ +// Staging Repositories -> close -> release // apply from: "../publish-mavencentral.gradle"