Merge pull request #90 from Tencent/bugfix/android_oncomplete

bug: 修复某些错误没有回调onVideoComplete问题
Tencent · May 20, 2021 · ae7b0ea · ae7b0ea
2 parents 6e78109 + e4042de
commit ae7b0ea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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"
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
@@ -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
@@ -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()
         }
     }