优化某些可能闪退的代码

Doikki · Doikki · commit 4b5d728217d0 · 2019-12-25T18:31:32.000+08:00
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/AndroidMediaPlayer.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/AndroidMediaPlayer.java
@@ -149,12 +149,20 @@ public int getBufferedPercentage() {
 
     @Override
     public void setSurface(Surface surface) {
-        mMediaPlayer.setSurface(surface);
+        try {
+            mMediaPlayer.setSurface(surface);
+        } catch (Exception e) {
+            mPlayerEventListener.onError();
+        }
     }
 
     @Override
     public void setDisplay(SurfaceHolder holder) {
-        mMediaPlayer.setDisplay(holder);
+        try {
+            mMediaPlayer.setDisplay(holder);
+        } catch (Exception e) {
+            mPlayerEventListener.onError();
+        }
     }
 
     @Override
@@ -175,7 +183,11 @@ public void setOptions() {
     public void setSpeed(float speed) {
         // only support above Android M
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            mMediaPlayer.setPlaybackParams(mMediaPlayer.getPlaybackParams().setSpeed(speed));
+            try {
+                mMediaPlayer.setPlaybackParams(mMediaPlayer.getPlaybackParams().setSpeed(speed));
+            } catch (Exception e) {
+                mPlayerEventListener.onError();
+            }
         }
     }
 
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/VideoView.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/VideoView.java
@@ -720,7 +720,7 @@ public void startFullScreen() {
         mIsFullScreen = true;
 
         //隐藏NavigationBar和StatusBar
-        hideSysBar();
+        hideSysBar(decorView);
 
         //从当前FrameLayout中移除播放器视图
         this.removeView(mPlayerContainer);
@@ -730,11 +730,7 @@ public void startFullScreen() {
         setPlayerState(PLAYER_FULL_SCREEN);
     }
 
-    private void hideSysBar() {
-        ViewGroup decorView = getDecorView();
-        if (decorView == null) {
-            return;
-        }
+    private void hideSysBar(ViewGroup decorView) {
         int uiOptions = decorView.getSystemUiVisibility();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             uiOptions |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
@@ -753,7 +749,7 @@ public void onWindowFocusChanged(boolean hasWindowFocus) {
         super.onWindowFocusChanged(hasWindowFocus);
         if (hasWindowFocus && mIsFullScreen) {
             //重新获得焦点时保持全屏状态
-            hideSysBar();
+            hideSysBar(getDecorView());
         }
     }
 
@@ -772,7 +768,7 @@ public void stopFullScreen() {
         mIsFullScreen = false;
 
         //显示NavigationBar和StatusBar
-        showSysBar();
+        showSysBar(decorView);
 
         //把播放器视图从DecorView中移除并添加到当前FrameLayout中即退出了全屏
         decorView.removeView(mPlayerContainer);
@@ -781,11 +777,7 @@ public void stopFullScreen() {
         setPlayerState(PLAYER_NORMAL);
     }
 
-    private void showSysBar() {
-        ViewGroup decorView = getDecorView();
-        if (decorView == null) {
-            return;
-        }
+    private void showSysBar(ViewGroup decorView) {
         int uiOptions = decorView.getSystemUiVisibility();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             uiOptions &= ~View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
@@ -978,13 +970,13 @@ public void setTinyScreenSize(int[] tinyScreenSize) {
      */
     protected void setPlayState(int playState) {
         mCurrentPlayState = playState;
-        if (mVideoController != null)
+        if (mVideoController != null) {
             mVideoController.setPlayState(playState);
+        }
         if (mOnStateChangeListeners != null) {
-            for (int i = 0, z = mOnStateChangeListeners.size(); i < z; i++) {
-                OnStateChangeListener listener = mOnStateChangeListeners.get(i);
-                if (listener != null) {
-                    listener.onPlayStateChanged(playState);
+            for (OnStateChangeListener l : PlayerUtils.getSnapshot(mOnStateChangeListeners)) {
+                if (l != null) {
+                    l.onPlayStateChanged(playState);
                 }
             }
         }
@@ -995,13 +987,13 @@ protected void setPlayState(int playState) {
      */
     protected void setPlayerState(int playerState) {
         mCurrentPlayerState = playerState;
-        if (mVideoController != null)
+        if (mVideoController != null) {
             mVideoController.setPlayerState(playerState);
+        }
         if (mOnStateChangeListeners != null) {
-            for (int i = 0, z = mOnStateChangeListeners.size(); i < z; i++) {
-                OnStateChangeListener listener = mOnStateChangeListeners.get(i);
-                if (listener != null) {
-                    listener.onPlayerStateChanged(playerState);
+            for (OnStateChangeListener l : PlayerUtils.getSnapshot(mOnStateChangeListeners)) {
+                if (l != null) {
+                    l.onPlayerStateChanged(playerState);
                 }
             }
         }
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/util/PlayerUtils.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/util/PlayerUtils.java
@@ -19,8 +19,13 @@
 import android.view.ViewConfiguration;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 
 /**
@@ -267,4 +272,18 @@ public static String stringForTime(int timeMs) {
             return String.format(Locale.getDefault(), "%02d:%02d", minutes, seconds);
         }
     }
+
+    /**
+     * 获取集合的快照
+     */
+    @NonNull
+    public static <T> List<T> getSnapshot(@NonNull Collection<T> other) {
+        List<T> result = new ArrayList<>(other.size());
+        for (T item : other) {
+            if (item != null) {
+                result.add(item);
+            }
+        }
+        return result;
+    }
 }
