From cbb88109494ffc7916f6639c20ce05c0cec941a9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 07 四月 2021 15:07:45 +0800
Subject: [PATCH] 3.9.1bug修复

---
 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
index 8e26c26..184ab21 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
@@ -895,6 +895,8 @@
                                 Log.i("mResult", "鏄惁鏄粠瑙傜湅璁板綍鐐瑰嚮杩涙潵鐨�:" + isFromWatchHistory);
                                 if (isFromWatchHistory || position > 0) {
                                     mPosition = getIntent().getIntExtra("playing_position", 0);
+                                    //闃叉鏁扮粍瓒婄晫
+                                    mPosition = mPosition >= VideoUtil.videoEpisodeList.size() ? VideoUtil.videoEpisodeList.size() - 1 : mPosition;
                                     EventBus.getDefault().post(videoInfo);
                                     getUrl(VideoUtil.videoEpisodeList.get(mPosition), isSetup);
                                     EventBus.getDefault().post(VideoUtil.videoEpisodeList.get(mPosition));
@@ -937,11 +939,16 @@
 
                                             @Override
                                             public void run() {
-                                                EventBus.getDefault().post(
-                                                        videoInfo);
-                                                EventBus.getDefault()
-                                                        .post(VideoUtil.videoEpisodeList
-                                                                .get(0));
+
+                                                try {
+                                                    EventBus.getDefault().post(
+                                                            videoInfo);
+                                                    EventBus.getDefault()
+                                                            .post(VideoUtil.videoEpisodeList
+                                                                    .get(0));
+                                                } catch (NullPointerException e) {
+                                                    //鍑虹幇杩囩┖鎸囬拡鐨勫紓甯�
+                                                }
                                             }
                                         }, 200);
                             }
@@ -1067,10 +1074,11 @@
                 @Override
                 public void run() {
                     EventBus.getDefault().post(videoInfo);
+                    int position = getIntent().getIntExtra("playing_position", 0) >=
+                            VideoUtil.videoEpisodeList.size() ? VideoUtil.videoEpisodeList.size() - 1 : getIntent().getIntExtra("playing_position",
+                            0);
                     EventBus.getDefault().post(
-                            VideoUtil.videoEpisodeList.get(
-                                    getIntent().getIntExtra("playing_position",
-                                            0)));
+                            VideoUtil.videoEpisodeList.get(position));
                 }
             }, 200);
         }

--
Gitblit v1.8.0