Merge pull request bingoogolapple#74 from bingoogolapple/develop

「fix」v2.1.4：修复在 RecyclerView 中使用时，从对用户不可见变为可见时部分手机默认没有自动轮播

Author: bingoogolapple

README.md

@@ -9,7 +9,7 @@
 * [自定义属性说明](#自定义属性说明)
 * [关于我](#关于我)
 * [打赏支持](#打赏支持)
-* [License](#License)
+* [License](#license)
 
 ## 功能介绍
 

demo/build.gradle

@@ -16,7 +16,7 @@ dependencies {
 //    compile project(':library')
 
     // -------------------- 以下两个库是必须依赖的 ----------------------------
-    compile 'cn.bingoogolapple:bga-banner:2.1.3@aar'
+    compile 'cn.bingoogolapple:bga-banner:2.1.4@aar'
     compile 'com.android.support:support-v4:25.0.1'
     // -------------------- 以上两个库是必须依赖的 ----------------------------
 

demo/src/main/java/cn/bingoogolapple/bgabanner/demo/ui/activity/ListViewDemoActivity.java

@@ -59,16 +59,22 @@ private void initListView() {
         // 初始化HeaderView
         View headerView = View.inflate(this, R.layout.layout_header, null);
         mBanner = (BGABanner) headerView.findViewById(R.id.banner);
-        mBanner.setAdapter(new BGABanner.Adapter() {
+        mBanner.setAdapter(new BGABanner.Adapter<ImageView, String>() {
             @Override
-            public void fillBannerItem(BGABanner banner, View view, Object model, int position) {
-                Glide.with(banner.getContext()).load(model).placeholder(R.drawable.holder).error(R.drawable.holder).dontAnimate().thumbnail(0.1f).into((ImageView) view);
+            public void fillBannerItem(BGABanner banner, ImageView itemView, String model, int position) {
+                Glide.with(itemView.getContext())
+                        .load(model)
+                        .placeholder(R.drawable.holder)
+                        .error(R.drawable.holder)
+                        .dontAnimate()
+                        .centerCrop()
+                        .into(itemView);
             }
         });
-        mBanner.setDelegate(new BGABanner.Delegate() {
+        mBanner.setDelegate(new BGABanner.Delegate<ImageView, String>() {
             @Override
-            public void onBannerItemClick(BGABanner banner, View view, Object model, int position) {
-                Toast.makeText(App.getInstance(), "点击了第" + (position + 1) + "页", Toast.LENGTH_SHORT).show();
+            public void onBannerItemClick(BGABanner banner, ImageView imageView, String model, int position) {
+                Toast.makeText(banner.getContext(), "点击了第" + (position + 1) + "页", Toast.LENGTH_SHORT).show();
             }
         });
 

demo/src/main/java/cn/bingoogolapple/bgabanner/demo/ui/activity/MainActivity.java

@@ -110,12 +110,12 @@ public void onBannerItemClick(BGABanner banner, ImageView itemView, String model
 
     @Override
     public void fillBannerItem(BGABanner banner, ImageView itemView, String model, int position) {
-        Glide.with(MainActivity.this)
+        Glide.with(itemView.getContext())
                 .load(model)
                 .placeholder(R.drawable.holder)
                 .error(R.drawable.holder)
-                .centerCrop()
                 .dontAnimate()
+                .centerCrop()
                 .into(itemView);
     }
 

demo/src/main/java/cn/bingoogolapple/bgabanner/demo/ui/activity/RecyclerViewDemoActivity.java

@@ -56,24 +56,30 @@ protected void onCreate(Bundle savedInstanceState) {
      * 初始化RecyclerView
      */
     private void initRecyclerView() {
-        mContentAdapter = new ContentAdapter(mContentRv);
 
         // 初始化HeaderView
         View headerView = View.inflate(this, R.layout.layout_header, null);
         mBanner = (BGABanner) headerView.findViewById(R.id.banner);
-        mBanner.setAdapter(new BGABanner.Adapter() {
+        mBanner.setAdapter(new BGABanner.Adapter<ImageView, String>() {
             @Override
-            public void fillBannerItem(BGABanner banner, View view, Object model, int position) {
-                Glide.with(banner.getContext()).load(model).placeholder(R.drawable.holder).error(R.drawable.holder).dontAnimate().thumbnail(0.1f).into((ImageView) view);
+            public void fillBannerItem(BGABanner banner, ImageView itemView, String model, int position) {
+                Glide.with(itemView.getContext())
+                        .load(model)
+                        .placeholder(R.drawable.holder)
+                        .error(R.drawable.holder)
+                        .dontAnimate()
+                        .centerCrop()
+                        .into(itemView);
             }
         });
-        mBanner.setDelegate(new BGABanner.Delegate() {
+        mBanner.setDelegate(new BGABanner.Delegate<ImageView, String>() {
             @Override
-            public void onBannerItemClick(BGABanner banner, View view, Object model, int position) {
-                Toast.makeText(App.getInstance(), "点击了第" + (position + 1) + "页", Toast.LENGTH_SHORT).show();
+            public void onBannerItemClick(BGABanner banner, ImageView imageView, String model, int position) {
+                Toast.makeText(banner.getContext(), "点击了第" + (position + 1) + "页", Toast.LENGTH_SHORT).show();
             }
         });
 
+        mContentAdapter = new ContentAdapter(mContentRv);
         mContentAdapter.addHeaderView(headerView);
 
         mContentRv.setLayoutManager(new LinearLayoutManager(this));

demo/src/main/res/layout/layout_header.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="100dp"
         app:banner_indicatorGravity="bottom|right"
-        app:banner_pageChangeDuration="2000"
+        app:banner_pageChangeDuration="1500"
         app:banner_placeholderDrawable="@drawable/holder"
         app:banner_tipTextSize="12sp"
         app:banner_transitionEffect="accordion"/>

gradle.properties

@@ -3,5 +3,5 @@ ANDROID_BUILD_TARGET_SDK_VERSION=25
 ANDROID_BUILD_SDK_VERSION=25
 ANDROID_BUILD_TOOLS_VERSION=25.0.0
 
-VERSION_NAME=2.1.3
-VERSION_CODE=213
+VERSION_NAME=2.1.4
+VERSION_CODE=214

library/src/main/java/cn/bingoogolapple/bgabanner/BGABanner.java

@@ -663,6 +663,12 @@ protected void onDetachedFromWindow() {
         onInvisibleToUser();
     }
 
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        startAutoPlay();
+    }
+
     public void startAutoPlay() {
         stopAutoPlay();
         if (mAutoPlayAble) {