修复RecyclerView列表中全屏有可能崩溃的Bug

The-WindRises · Jul 13, 2017 · e55a124 · e55a124
1 parent 44881de
commit e55a124
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ allprojects {
 }
 
 dependencies {
-    compile 'com.github.xiaoyanger0825:NiceVieoPlayer:v1.8'
+    compile 'com.github.xiaoyanger0825:NiceVieoPlayer:v1.9'
 }
 ```
 **在对应视频界面所在的Activity的Manifest.xml中需要添加如下配置：**
@@ -122,15 +122,10 @@ public List<Clarity> getClarites() {
 #### 4.在RecyclerView列表中使用
 在ReclerView列表中使用时需要监听itemView的detach，以此释放掉对应的播放器
 ```
-mRecyclerView.addOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {
+mRecyclerView.setRecyclerListener(new RecyclerView.RecyclerListener() {
     @Override
-    public void onChildViewAttachedToWindow(View view) {
-
-    }
-
-    @Override
-    public void onChildViewDetachedFromWindow(View view) {
-        NiceVideoPlayer niceVideoPlayer = (NiceVideoPlayer) view.findViewById(R.id.nice_video_player);
+    public void onViewRecycled(RecyclerView.ViewHolder holder) {
+        NiceVideoPlayer niceVideoPlayer = ((VideoViewHolder) holder).mVideoPlayer;
         if (niceVideoPlayer == NiceVideoPlayerManager.instance().getCurrentNiceVideoPlayer()) {
             NiceVideoPlayerManager.instance().releaseNiceVideoPlayer();
         }

diff --git a/app/build.gradle b/app/build.gradle
@@ -41,4 +41,5 @@ dependencies {
     testCompile rootProject.ext.dependencies.junit
     compile rootProject.ext.dependencies.recyclerview
     compile rootProject.ext.dependencies.glide
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -48,12 +48,6 @@
             android:label="Activity中时处理播放时按下Home键"
             android:screenOrientation="portrait">
         </activity>
-        <activity
-            android:name=".example.ProcessHome2Activity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Fragment中时处理播放时按下Home键"
-            android:screenOrientation="portrait">
-        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/xiao/nicevieoplayer/example/DemoFragenment.java b/app/src/main/java/com/xiao/nicevieoplayer/example/DemoFragenment.java
@@ -13,6 +13,7 @@
 import com.xiao.nicevideoplayer.NiceVideoPlayerManager;
 import com.xiao.nicevieoplayer.R;
 import com.xiao.nicevieoplayer.example.adapter.VideoAdapter;
+import com.xiao.nicevieoplayer.example.adapter.holder.VideoViewHolder;
 import com.xiao.nicevieoplayer.example.util.DataUtil;
 
 /**
@@ -40,15 +41,10 @@ private void init() {
         mRecyclerView.setHasFixedSize(true);
         VideoAdapter adapter = new VideoAdapter(getActivity(), DataUtil.getVideoListData());
         mRecyclerView.setAdapter(adapter);
-        mRecyclerView.addOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {
+        mRecyclerView.setRecyclerListener(new RecyclerView.RecyclerListener() {
             @Override
-            public void onChildViewAttachedToWindow(View view) {
-
-            }
-
-            @Override
-            public void onChildViewDetachedFromWindow(View view) {
-                NiceVideoPlayer niceVideoPlayer = (NiceVideoPlayer) view.findViewById(R.id.nice_video_player);
+            public void onViewRecycled(RecyclerView.ViewHolder holder) {
+                NiceVideoPlayer niceVideoPlayer = ((VideoViewHolder) holder).mVideoPlayer;
                 if (niceVideoPlayer == NiceVideoPlayerManager.instance().getCurrentNiceVideoPlayer()) {
                     NiceVideoPlayerManager.instance().releaseNiceVideoPlayer();
                 }

diff --git a/app/src/main/java/com/xiao/nicevieoplayer/example/DemoProcessHomeKeyFragenment.java b/app/src/main/java/com/xiao/nicevieoplayer/example/DemoProcessHomeKeyFragenment.java
@@ -12,6 +12,7 @@
 import com.xiao.nicevideoplayer.NiceVideoPlayerManager;
 import com.xiao.nicevieoplayer.R;
 import com.xiao.nicevieoplayer.example.adapter.VideoAdapter;
+import com.xiao.nicevieoplayer.example.adapter.holder.VideoViewHolder;
 import com.xiao.nicevieoplayer.example.base.CompatHomeKeyFragment;
 import com.xiao.nicevieoplayer.example.util.DataUtil;
 
@@ -40,15 +41,10 @@ private void init() {
         mRecyclerView.setHasFixedSize(true);
         VideoAdapter adapter = new VideoAdapter(getActivity(), DataUtil.getVideoListData());
         mRecyclerView.setAdapter(adapter);
-        mRecyclerView.addOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {
+        mRecyclerView.setRecyclerListener(new RecyclerView.RecyclerListener() {
             @Override
-            public void onChildViewAttachedToWindow(View view) {
-
-            }
-
-            @Override
-            public void onChildViewDetachedFromWindow(View view) {
-                NiceVideoPlayer niceVideoPlayer = (NiceVideoPlayer) view.findViewById(R.id.nice_video_player);
+            public void onViewRecycled(RecyclerView.ViewHolder holder) {
+                NiceVideoPlayer niceVideoPlayer = ((VideoViewHolder) holder).mVideoPlayer;
                 if (niceVideoPlayer == NiceVideoPlayerManager.instance().getCurrentNiceVideoPlayer()) {
                     NiceVideoPlayerManager.instance().releaseNiceVideoPlayer();
                 }

diff --git a/app/src/main/java/com/xiao/nicevieoplayer/example/ProcessHome1Activity.java b/app/src/main/java/com/xiao/nicevieoplayer/example/ProcessHome1Activity.java
@@ -3,12 +3,12 @@
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.View;
 
 import com.xiao.nicevideoplayer.NiceVideoPlayer;
 import com.xiao.nicevideoplayer.NiceVideoPlayerManager;
 import com.xiao.nicevieoplayer.R;
 import com.xiao.nicevieoplayer.example.adapter.VideoAdapter;
+import com.xiao.nicevieoplayer.example.adapter.holder.VideoViewHolder;
 import com.xiao.nicevieoplayer.example.base.CompatHomeKeyActivity;
 import com.xiao.nicevieoplayer.example.util.DataUtil;
 
@@ -33,15 +33,10 @@ private void init() {
         mRecyclerView.setHasFixedSize(true);
         VideoAdapter adapter = new VideoAdapter(this, DataUtil.getVideoListData());
         mRecyclerView.setAdapter(adapter);
-        mRecyclerView.addOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {
+        mRecyclerView.setRecyclerListener(new RecyclerView.RecyclerListener() {
             @Override
-            public void onChildViewAttachedToWindow(View view) {
-
-            }
-
-            @Override
-            public void onChildViewDetachedFromWindow(View view) {
-                NiceVideoPlayer niceVideoPlayer = (NiceVideoPlayer) view.findViewById(R.id.nice_video_player);
+            public void onViewRecycled(RecyclerView.ViewHolder holder) {
+                NiceVideoPlayer niceVideoPlayer = ((VideoViewHolder) holder).mVideoPlayer;
                 if (niceVideoPlayer == NiceVideoPlayerManager.instance().getCurrentNiceVideoPlayer()) {
                     NiceVideoPlayerManager.instance().releaseNiceVideoPlayer();
                 }

diff --git a/app/src/main/java/com/xiao/nicevieoplayer/example/RecyclerViewActivity.java b/app/src/main/java/com/xiao/nicevieoplayer/example/RecyclerViewActivity.java
@@ -4,12 +4,12 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.View;
 
 import com.xiao.nicevideoplayer.NiceVideoPlayer;
 import com.xiao.nicevideoplayer.NiceVideoPlayerManager;
 import com.xiao.nicevieoplayer.R;
 import com.xiao.nicevieoplayer.example.adapter.VideoAdapter;
+import com.xiao.nicevieoplayer.example.adapter.holder.VideoViewHolder;
 import com.xiao.nicevieoplayer.example.util.DataUtil;
 
 public class RecyclerViewActivity extends AppCompatActivity {
@@ -29,15 +29,10 @@ private void init() {
         mRecyclerView.setHasFixedSize(true);
         VideoAdapter adapter = new VideoAdapter(this, DataUtil.getVideoListData());
         mRecyclerView.setAdapter(adapter);
-        mRecyclerView.addOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {
+        mRecyclerView.setRecyclerListener(new RecyclerView.RecyclerListener() {
             @Override
-            public void onChildViewAttachedToWindow(View view) {
-
-            }
-
-            @Override
-            public void onChildViewDetachedFromWindow(View view) {
-                NiceVideoPlayer niceVideoPlayer = (NiceVideoPlayer) view.findViewById(R.id.nice_video_player);
+            public void onViewRecycled(RecyclerView.ViewHolder holder) {
+                NiceVideoPlayer niceVideoPlayer = ((VideoViewHolder) holder).mVideoPlayer;
                 if (niceVideoPlayer == NiceVideoPlayerManager.instance().getCurrentNiceVideoPlayer()) {
                     NiceVideoPlayerManager.instance().releaseNiceVideoPlayer();
                 }

diff --git a/app/src/main/java/com/xiao/nicevieoplayer/example/adapter/holder/VideoViewHolder.java b/app/src/main/java/com/xiao/nicevieoplayer/example/adapter/holder/VideoViewHolder.java
@@ -2,6 +2,7 @@
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.view.ViewGroup;
 
 import com.bumptech.glide.Glide;
 import com.xiao.nicevideoplayer.NiceVideoPlayer;
@@ -15,16 +16,22 @@
 
 public class VideoViewHolder extends RecyclerView.ViewHolder {
 
-    private TxVideoPlayerController mController;
-    private NiceVideoPlayer mVideoPlayer;
+    public TxVideoPlayerController mController;
+    public NiceVideoPlayer mVideoPlayer;
 
     public VideoViewHolder(View itemView) {
         super(itemView);
         mVideoPlayer = (NiceVideoPlayer) itemView.findViewById(R.id.nice_video_player);
+        // 将列表中的每个视频设置为默认16:9的比例
+        ViewGroup.LayoutParams params = mVideoPlayer.getLayoutParams();
+        params.width = itemView.getResources().getDisplayMetrics().widthPixels; // 宽度为屏幕宽度
+        params.height = (int) (params.width * 9f / 16f);    // 高度为宽度的9/16
+        mVideoPlayer.setLayoutParams(params);
     }
 
     public void setController(TxVideoPlayerController controller) {
         mController = controller;
+        mVideoPlayer.setController(mController);
     }
 
     public void bindData(Video video) {
@@ -35,7 +42,6 @@ public void bindData(Video video) {
                 .placeholder(R.drawable.img_default)
                 .crossFade()
                 .into(mController.imageView());
-        mVideoPlayer.setController(mController);
         mVideoPlayer.setUp(video.getVideoUrl(), null);
     }
 }
diff --git a/app/src/main/res/layout/item_video.xml b/app/src/main/res/layout/item_video.xml
@@ -12,5 +12,5 @@
     <com.xiao.nicevideoplayer.NiceVideoPlayer
         android:id="@+id/nice_video_player"
         android:layout_width="match_parent"
-        android:layout_height="180dp"/>
+        android:layout_height="200dp"/>
 </LinearLayout>
diff --git a/config.gradle b/config.gradle
@@ -5,8 +5,8 @@ ext {
             buildToolsVersion: "25.0.2",
             minSdkVersion    : 16,
             targetSdkVersion : 25,
-            versionCode      : 18,
-            versionName      : "1.8"
+            versionCode      : 19,
+            versionName      : "1.9"
     ]
 
     dependVersion = [

diff --git a/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/NiceVideoPlayer.java b/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/NiceVideoPlayer.java
@@ -130,10 +130,10 @@ public void setUp(String url, Map<String, String> headers) {
     }
 
     public void setController(NiceVideoPlayerController controller) {
+        mContainer.removeView(mController);
         mController = controller;
         mController.reset();
         mController.setNiceVideoPlayer(this);
-        mContainer.removeView(mController);
         LayoutParams params = new LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT);