Commit version 1.5.1

qyxxjd · Jun 29, 2018 · 1cb9f67 · 1cb9f67
1 parent 65c7912
commit 1cb9f67
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 <p>
   <a href="https://developer.android.com/reference/android/os/Build.VERSION_CODES.html#ICE_CREAM_SANDWICH"><img src="https://img.shields.io/badge/API-14%2B-blue.svg?style=flat" alt="API" /></a>
-  <a href="javascript:void(0);"><img src="https://img.shields.io/badge/Version-v1.5-brightgreen.svg" alt="Library version" /></a>
-  <a href="http://www.methodscount.com/?lib=com.classic.common%3Amultiple-status-view%3A1.5"><img src="https://img.shields.io/badge/Methods count-52-e91e63.svg"/></a>
-  <a href="http://www.methodscount.com/?lib=com.classic.common%3Amultiple-status-view%3A1.5"><img src="https://img.shields.io/badge/Size-7 KB-e91e63.svg"/></a>
+  <a href="javascript:void(0);"><img src="https://img.shields.io/badge/Version-v1.5.1-brightgreen.svg" alt="Library version" /></a>
+  <a href="http://www.methodscount.com/?lib=com.classic.common%3Amultiple-status-view%3A1.5.1"><img src="https://img.shields.io/badge/Methods count-52-e91e63.svg"/></a>
+  <a href="http://www.methodscount.com/?lib=com.classic.common%3Amultiple-status-view%3A1.5.1"><img src="https://img.shields.io/badge/Size-7 KB-e91e63.svg"/></a>
   <a href="LICENSE.txt"><img src="https://img.shields.io/npm/l/express.svg?maxAge=2592000" alt="License" /></a>
 </p>
 
@@ -21,7 +21,7 @@
 
 ```gradle
 dependencies {
-    implementation 'com.classic.common:multiple-status-view:1.5'
+    implementation 'com.classic.common:multiple-status-view:1.5.1'
 }
 ```
 

diff --git a/config.gradle b/config.gradle
@@ -8,8 +8,8 @@ ext {
             applicationId       : "com.classic.common.simple",
             minSdkVersion       : 14,
             targetSdkVersion    : 25,
-            versionCode         : 6,
-            versionName         : "1.5"
+            versionCode         : 7,
+            versionName         : "1.5.1"
     ]
 
     resourcePrefix = "MultipleStatusView"
@@ -23,7 +23,7 @@ ext {
 
     junit = "junit:junit:4.12"
 
-    multipleStatusView = "com.classic.common:multiple-status-view:1.5"
+    multipleStatusView = "com.classic.common:multiple-status-view:1.5.1"
     loadingView = "com.wang.avi:library:2.1.3" // https://github.com/81813780/AVLoadingIndicatorView
     fab = "com.github.clans:fab:1.6.4" // https://github.com/Clans/FloatingActionButton
     adapter = "com.classic.adapter:commonadapter:2.0"

diff --git a/multiple-status-view/src/main/java/com/classic/common/MultipleStatusView.java b/multiple-status-view/src/main/java/com/classic/common/MultipleStatusView.java
@@ -114,7 +114,7 @@ public final void showEmpty() {
      * @param layoutParams 布局参数
      */
     public final void showEmpty(int layoutId, ViewGroup.LayoutParams layoutParams) {
-        showEmpty(inflateView(layoutId), layoutParams);
+        showEmpty(null == mEmptyView ? inflateView(layoutId) : mEmptyView, layoutParams);
     }
 
     /**
@@ -153,7 +153,7 @@ public final void showError() {
      * @param layoutParams 布局参数
      */
     public final void showError(int layoutId, ViewGroup.LayoutParams layoutParams) {
-        showError(inflateView(layoutId), layoutParams);
+        showError(null == mErrorView ? inflateView(layoutId) : mErrorView, layoutParams);
     }
 
     /**
@@ -192,7 +192,7 @@ public final void showLoading() {
      * @param layoutParams 布局参数
      */
     public final void showLoading(int layoutId, ViewGroup.LayoutParams layoutParams) {
-        showLoading(inflateView(layoutId), layoutParams);
+        showLoading(null == mLoadingView ? inflateView(layoutId) : mLoadingView, layoutParams);
     }
 
     /**
@@ -227,7 +227,7 @@ public final void showNoNetwork() {
      * @param layoutParams 布局参数
      */
     public final void showNoNetwork(int layoutId, ViewGroup.LayoutParams layoutParams) {
-        showNoNetwork(inflateView(layoutId), layoutParams);
+        showNoNetwork(null == mNoNetworkView ? inflateView(layoutId) : mNoNetworkView, layoutParams);
     }
 
     /**