优化更新方法

xiaomsh · Jun 5, 2019 · faf7062 · faf7062
1 parent d4abfea
commit faf7062
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 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.14'
+    publishVersion = '2.3.15'
     desc = 'A simple banner lib'
     website = 'https://github.com/wenchaosong/Banner'
 }
diff --git a/LibBanner/src/main/java/com/ms/banner/Banner.java b/LibBanner/src/main/java/com/ms/banner/Banner.java
@@ -259,6 +259,10 @@ public Banner setPages(List<?> datas, BannerViewHolder creator) {
     }
 
     public void update(List<?> imageUrls, List<String> titles) {
+        if (imageUrls == null || titles == null || imageUrls.size() != titles.size()) {
+            update(null);
+            return;
+        }
         this.titles.clear();
         this.titles.addAll(titles);
         update(imageUrls);

diff --git a/LibBanner/src/main/java/com/ms/banner/BannerNew.java b/LibBanner/src/main/java/com/ms/banner/BannerNew.java
@@ -258,6 +258,10 @@ public BannerNew setPages(List<?> datas, BannerViewHolder creator) {
     }
 
     public void update(List<?> imageUrls, List<String> titles) {
+        if (imageUrls == null || titles == null || imageUrls.size() != titles.size()) {
+            update(null);
+            return;
+        }
         this.titles.clear();
         this.titles.addAll(titles);
         update(imageUrls);

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.14'
+    publishVersion = '2.3.15'
     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
@@ -262,6 +262,10 @@ public Banner setPages(List<?> datas, BannerViewHolder creator) {
     }
 
     public void update(List<?> imageUrls, List<String> titles) {
+        if (imageUrls == null || titles == null || imageUrls.size() != titles.size()) {
+            update(null);
+            return;
+        }
         this.titles.clear();
         this.titles.addAll(titles);
         update(imageUrls);

diff --git a/README.md b/README.md
@@ -42,8 +42,8 @@
 #### Step 1.依赖banner
 ```
 dependencies{
-    implementation 'com.ms:Banner:2.3.14'
-    implementation 'com.ms:Banner-androidx:2.3.14'
+    implementation 'com.ms:Banner:2.3.15'
+    implementation 'com.ms:Banner-androidx:2.3.15'
 }
 ```
 或者引用本地lib

diff --git a/demo/src/main/res/layout/activity_fragment.xml b/demo/src/main/res/layout/activity_fragment.xml
@@ -10,7 +10,7 @@
         android:layout_height="0dp"
         android:layout_weight="1" />
 
-    <com.bottom.PageNavigationView
+    <com.ms.bottombar.PageNavigationView
         android:id="@+id/tab"
         android:layout_width="match_parent"
         android:layout_height="50dp"