Merge pull request CarGuo#3352 from TestSmirk/fixIssue

增加针对某些dataBinding的场景，
SmartVive · Aug 6, 2021 · d4c47e0 · d4c47e0
2 parents 712aaa6 + fddaac5
commit d4c47e0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java b/...ideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java
@@ -896,7 +896,12 @@ public void setRotateWithSystem(boolean rotateWithSystem) {
      */
     @SuppressWarnings("ResourceType")
     public GSYVideoPlayer getFullWindowPlayer() {
-        ViewGroup vp = (ViewGroup) (CommonUtil.scanForActivity(getContext())).findViewById(Window.ID_ANDROID_CONTENT);
+        Activity activity = CommonUtil.scanForActivity(getContext());
+        if (activity == null) {
+            return null;
+        }
+        ViewGroup vp = (ViewGroup) activity.findViewById(Window.ID_ANDROID_CONTENT);
+
         final View full = vp.findViewById(getFullId());
         GSYVideoPlayer gsyVideoPlayer = null;
         if (full != null) {