发布新版本

xiaomsh · Sep 26, 2019 · fa0bdae · fa0bdae
1 parent 460a3af
commit fa0bdae
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 32 deletions.
diff --git a/LibBanner/build.gradle b/LibBanner/build.gradle
@@ -31,7 +31,7 @@ publish {
     userOrg = 'songwenchao0714'
     groupId = 'com.ms'
     artifactId = 'Banner'
-    publishVersion = '2.3.16'
+    publishVersion = '2.3.17'
     desc = 'A simple banner lib'
     website = 'https://github.com/wenchaosong/Banner'
 }
diff --git a/LibBannerAndroidx/build.gradle b/LibBannerAndroidx/build.gradle
@@ -31,7 +31,7 @@ publish {
     userOrg = 'songwenchao0714'
     groupId = 'com.ms'
     artifactId = 'Banner-androidx'
-    publishVersion = '2.3.16'
+    publishVersion = '2.3.17'
     desc = 'A simple banner lib'
     website = 'https://github.com/wenchaosong/Banner'
 }
diff --git a/LibBannerAndroidx/src/main/java/com/ms/banner/Banner.java b/LibBannerAndroidx/src/main/java/com/ms/banner/Banner.java
@@ -59,6 +59,7 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
     private int titleTextSize;
     private int count = 0;
     private int currentItem = -1;
+    private int mCurrentPage = 0;
     private int gravity = -1;
     private int lastPosition;
     private List<String> titles;
@@ -170,7 +171,7 @@ private void initViewPagerScroll() {
             scroller.setDuration(scrollTime);
             mField.set(viewPager, scroller);
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
     }
 
@@ -208,7 +209,7 @@ public Banner setBannerAnimation(Class<? extends PageTransformer> transformer) {
         try {
             viewPager.setPageTransformer(true, transformer.newInstance());
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
         return this;
     }
@@ -241,21 +242,13 @@ public Banner setViewPagerIsScroll(boolean isScroll) {
     }
 
     public Banner setCurrentPage(@IntRange(from = 0) int page) {
-        if (count == 0)
-            return this;
-        if (page > count) {
-            throw new RuntimeException("[Banner] --> The current page is out of range");
-        }
-        if (isLoop) {
-            this.currentItem = NUM / 2 - ((NUM / 2) % count) + 1 + page;
-        } else {
-            this.currentItem = page;
-        }
+        mCurrentPage = page;
         return this;
     }
 
     public Banner setPages(List<?> datas, BannerViewHolder creator) {
-        this.mDatas = datas;
+        this.mDatas.clear();
+        this.mDatas.addAll(datas);
         this.creator = creator;
         this.count = datas.size();
         return this;
@@ -275,19 +268,18 @@ public void update(List<?> imageUrls) {
         if (imageUrls == null) {
             imageUrls = new ArrayList<>();
         }
+        this.mDatas.clear();
+        this.indicatorImages.clear();
         if (imageUrls.size() == 0) {
             bannerDefaultImage.setVisibility(VISIBLE);
-            this.mDatas.clear();
-            this.indicatorImages.clear();
             this.count = 0;
             if (adapter != null) {
                 adapter.notifyDataSetChanged();
             }
         } else {
-            this.mDatas.clear();
-            this.indicatorImages.clear();
             this.mDatas.addAll(imageUrls);
             this.count = this.mDatas.size();
+            setOffscreenPageLimit(imageUrls.size());
             start();
         }
     }
@@ -450,13 +442,16 @@ else if (bannerStyle == BannerConfig.CUSTOM_INDICATOR)
 
     private void setData() {
         if (isLoop) {
-            //currentItem = 1;
-            if (currentItem == -1) {
+            if (mCurrentPage > 0 && mCurrentPage < count) {
+                currentItem = NUM / 2 - ((NUM / 2) % count) + 1 + mCurrentPage;
+            } else {
                 currentItem = NUM / 2 - ((NUM / 2) % count) + 1;
             }
             lastPosition = 1;
         } else {
-            if (currentItem == -1) {
+            if (mCurrentPage > 0 && mCurrentPage < count) {
+                currentItem = mCurrentPage;
+            } else {
                 currentItem = 0;
             }
             lastPosition = 0;
@@ -467,7 +462,6 @@ private void setData() {
         }
         viewPager.setAdapter(adapter);
         viewPager.setCurrentItem(currentItem);
-        viewPager.setOffscreenPageLimit(count);
         if (isScroll && count > 1) {
             viewPager.setScrollable(true);
         } else {
@@ -581,12 +575,9 @@ public Object instantiateItem(ViewGroup container, final int position) {
             if (creator == null) {
                 throw new RuntimeException("[Banner] --> The layout is not specified,please set holder");
             }
-            View view = creator.createView(container.getContext());
+            View view = creator.createView(container.getContext(), toRealPosition(position), mDatas.get(toRealPosition(position)));
             container.addView(view);
 
-            if (mDatas != null && mDatas.size() > 0) {
-                creator.onBind(container.getContext(), toRealPosition(position), mDatas.get(toRealPosition(position)));
-            }
             if (listener != null) {
                 view.setOnClickListener(new OnClickListener() {
                     @Override

diff --git a/LibBannerAndroidx/src/main/java/com/ms/banner/holder/BannerViewHolder.java b/LibBannerAndroidx/src/main/java/com/ms/banner/holder/BannerViewHolder.java
@@ -5,7 +5,6 @@
 
 public interface BannerViewHolder<T> {
 
-    View createView(Context context);
+    View createView(Context context, int position, T data);
 
-    void onBind(Context context, int position, T data);
 }
diff --git a/README.md b/README.md
@@ -42,8 +42,8 @@
 #### Step 1.依赖banner
 ```
 dependencies{
-    implementation 'com.ms:Banner:2.3.16'
-    implementation 'com.ms:Banner-androidx:2.3.16'
+    implementation 'com.ms:Banner:2.3.17'
+    implementation 'com.ms:Banner-androidx:2.3.17'
 }
 ```
 或者引用本地lib

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':LibBanner', ':demo'
+include ':LibBanner', ':demo'/*, ':LibBannerAndroidx'*/
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':LibBanner', ':demo'
		include ':LibBanner', ':demo'/, ':LibBannerAndroidx'/