Merge pull request CarGuo#3372 from SmartVive/master

修复设置了超时，重试后失效的问题
SmartVive · Sep 6, 2021 · 4e6f144 · 4e6f144
2 parents d4c47e0 + f9e8d49
commit 4e6f144
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/app/src/main/java/com/example/gsyvideoplayer/exo/GSYExoVideoManager.java b/app/src/main/java/com/example/gsyvideoplayer/exo/GSYExoVideoManager.java
@@ -59,9 +59,6 @@ public void prepare(List<String> urls, Map<String, String> mapHeadData, int inde
         msg.what = HANDLER_PREPARE;
         msg.obj = new GSYExoModel(urls, mapHeadData, index, loop, speed, cache, cachePath, overrideExtension);
         sendMessage(msg);
-        if (needTimeOutOther) {
-            startTimeOutBuffer();
-        }
     }
 
 

diff --git a/app/src/main/java/com/example/gsyvideoplayer/exosubtitle/GSYExoSubTitleVideoManager.java b/app/src/main/java/com/example/gsyvideoplayer/exosubtitle/GSYExoSubTitleVideoManager.java
@@ -56,9 +56,6 @@ public void prepare(String url, String subTitle, TextOutput textOutput, Map<Stri
         msg.what = HANDLER_PREPARE;
         msg.obj = new GSYExoSubTitleModel(url, subTitle, textOutput, mapHeadData, loop, speed, cache, cachePath, overrideExtension);
         sendMessage(msg);
-        if (needTimeOutOther) {
-            startTimeOutBuffer();
-        }
     }
 
 

diff --git a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoBaseManager.java b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoBaseManager.java
@@ -210,9 +210,6 @@ public void prepare(final String url, final Map<String, String> mapHeadData, boo
         GSYModel fb = new GSYModel(url, mapHeadData, loop, speed, cache, cachePath, overrideExtension);
         msg.obj = fb;
         sendMessage(msg);
-        if (needTimeOutOther) {
-            startTimeOutBuffer();
-        }
     }
 
     @Override
@@ -565,6 +562,9 @@ public void handleMessage(Message msg) {
             switch (msg.what) {
                 case HANDLER_PREPARE:
                     initVideo(msg);
+                    if (needTimeOutOther) {
+                        startTimeOutBuffer();
+                    }
                     break;
                 case HANDLER_SETDISPLAY:
                     break;