Release v1.7

qyxxjd · Nov 7, 2019 · 351d40e · 351d40e
1 parent fd07b2b
commit 351d40e
Show file tree

Hide file tree

Showing 16 changed files with 183 additions and 42 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.6-brightgreen.svg" alt="Library version" /></a>
-  <a href="http://www.methodscount.com/?lib=com.classic.common%3Amultiple-status-view%3A1.6"><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.6"><img src="https://img.shields.io/badge/Size-7 KB-e91e63.svg"/></a>
+  <a href="http://www.methodscount.com/?lib=com.classic.common%3Amultiple-status-view%3A1.7"><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.7"><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>
 
@@ -13,15 +13,15 @@
 - 网络异常视图
 - 内容视图
 
-[apk下载](https://github.com/qyxxjd/MultipleStatusView/blob/master/apk/MultipleStatusView.apk?raw=true)
+[apk下载](https://github.com/qyxxjd/MultipleStatusView/blob/master/apk/MultipleStatusView_1.7_9.apk?raw=true)
 
 ![](https://github.com/qyxxjd/MultipleStatusView/blob/master/screenshots/demo.gif)
 
 ## 使用
 
 ```gradle
 dependencies {
-    implementation 'com.classic.common:multiple-status-view:1.6'
+    implementation 'com.classic.common:multiple-status-view:1.7'
 }
 ```
 
@@ -44,21 +44,29 @@ MultipleStatusView multipleStatusView = (MultipleStatusView) findViewById(R.id.m
 
 //显示加载中视图
 multipleStatusView.showLoading();
+// mMultipleStatusView.showLoading("自定义提示内容");
+// mMultipleStatusView.showLoading(R.string.custom_hint_content, "占位符1", "占位符2", "...");
 // multipleStatusView.showLoading(R.layout.xxx, layoutParams);
 // multipleStatusView.showLoading(customView, layoutParams);
 
 //显示空视图
 multipleStatusView.showEmpty();
+// mMultipleStatusView.showEmpty("自定义提示内容");
+// mMultipleStatusView.showEmpty(R.string.custom_hint_content, "占位符1", "占位符2", "...");
 // multipleStatusView.showEmpty(R.layout.xxx, layoutParams);
 // multipleStatusView.showEmpty(customView, layoutParams);
 
 //显示错误视图
 multipleStatusView.showError();
+// mMultipleStatusView.showError("自定义提示内容");
+// mMultipleStatusView.showError(R.string.custom_hint_content, "占位符1", "占位符2", "...");
 // multipleStatusView.showError(R.layout.xxx, layoutParams);
 // multipleStatusView.showError(customView, layoutParams);
 
 //显示无网络视图
 multipleStatusView.showNoNetwork();
+// mMultipleStatusView.showNoNetwork("自定义提示内容");
+// mMultipleStatusView.showNoNetwork(R.string.custom_hint_content, "占位符1", "占位符2", "...");
 // multipleStatusView.showNoNetwork(R.layout.xxx, layoutParams);
 // multipleStatusView.showNoNetwork(customView, layoutParams);
 
@@ -138,6 +146,7 @@ app:noNetworkView="@layout/..."
 - 空视图的id必须为：`empty_view`
 - 错误视图的id必须为：`error_view`
 - 无网络视图的id必须为：`no_network_view`
+- 自定义提示文本的id必须为：`status_hint_content`
 
 
 #### 2. 如果需要点击某个 `view` 进行重试, 需要设置:
@@ -168,6 +177,7 @@ tv.setText(text);
 
 感谢以下人员贡献的代码
 - [Lindroy](https://github.com/Lindroy)
+- [GaoXiaoHui](https://github.com/gao746700783)
 
 
 ## 关于

diff --git a/apk/MultipleStatusView.apk b/apk/MultipleStatusView.apk
diff --git a/apk/MultipleStatusView_1.7_9.apk b/apk/MultipleStatusView_1.7_9.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,9 +19,19 @@ android {
     }
 }
 
+android.applicationVariants.all { variant ->
+    variant.outputs.all {
+        outputFileName = new StringBuilder().append("MultipleStatusView")
+            .append("_").append(variant.versionName)
+            .append("_").append(variant.versionCode)
+            .append(".apk")
+            .toString()
+    }
+}
+
 dependencies {
-     implementation project(':multiple-status-view')
-//    implementation rootProject.ext.multipleStatusView
+    // implementation project(':multiple-status-view')
+    implementation rootProject.ext.multipleStatusView
     implementation rootProject.ext.supportAppcompatV7
     implementation rootProject.ext.supportRecyclerView
     implementation rootProject.ext.supportDesign

diff --git a/app/src/main/java/com/classic/common/simple/AbsActivity.java b/app/src/main/java/com/classic/common/simple/AbsActivity.java
@@ -15,7 +15,7 @@
 
 public abstract class AbsActivity extends AppCompatActivity implements View.OnClickListener {
 
-    static final int DELAY = 5000;
+    static final int DELAY = 2000;
 
     MultipleStatusView   mMultipleStatusView;
     FloatingActionMenu   mFloatingActionMenu;
@@ -25,6 +25,14 @@ public abstract class AbsActivity extends AppCompatActivity implements View.OnCl
     FloatingActionButton mNoNetworkFab;
     FloatingActionButton mContentFab;
 
+    private final Runnable callback = new Runnable() {
+        @Override public void run() {
+            if (!isFinishing() && null != mMultipleStatusView) {
+                mMultipleStatusView.showContent();
+            }
+        }
+    };
+
     abstract void initView();
 
     @Override protected void onCreate(Bundle savedInstanceState) {
@@ -50,13 +58,15 @@ public abstract class AbsActivity extends AppCompatActivity implements View.OnCl
         mMultipleStatusView.setOnViewStatusChangeListener(mViewStatusChangeListener);
     }
 
+    @Override
+    protected void onDestroy() {
+        if (null != mMultipleStatusView) mMultipleStatusView.removeCallbacks(callback);
+        super.onDestroy();
+    }
+
     void loading() {
         mMultipleStatusView.showLoading();
-        mMultipleStatusView.postDelayed(new Runnable() {
-            @Override public void run() {
-                mMultipleStatusView.showContent();
-            }
-        }, DELAY);
+        mMultipleStatusView.postDelayed(callback, DELAY);
     }
 
     final View.OnClickListener mRetryClickListener = new View.OnClickListener() {
@@ -88,13 +98,16 @@ public void onChange(int oldViewStatus, int newViewStatus) {
                 loading();
                 break;
             case R.id.fab_empty:
-                mMultipleStatusView.showEmpty();
+                // mMultipleStatusView.showEmpty();
+                mMultipleStatusView.showEmpty(R.string.test_hint_content, "aa", "bb");
                 break;
             case R.id.fab_error:
-                mMultipleStatusView.showError();
+                // mMultipleStatusView.showError();
+                mMultipleStatusView.showError("自定义错误文本");
                 break;
             case R.id.fab_no_network:
-                mMultipleStatusView.showNoNetwork();
+                // mMultipleStatusView.showNoNetwork();
+                mMultipleStatusView.showNoNetwork("自定义无网络文本");
                 break;
             case R.id.fab_content:
                 mMultipleStatusView.showContent();

diff --git a/app/src/main/java/com/classic/common/simple/Simple3Activity.java b/app/src/main/java/com/classic/common/simple/Simple3Activity.java
@@ -1,5 +1,6 @@
 package com.classic.common.simple;
 
+import android.view.View;
 import android.view.ViewGroup;
 
 import com.classic.common.MultipleStatusView;
@@ -10,11 +11,28 @@ public class Simple3Activity extends AbsActivity {
     void initView() {
         setContentView(R.layout.activity_simple3);
         setTitle("Simple3Activity");
-
         ViewGroup ll_content = findViewById(R.id.ll_content);
         mMultipleStatusView = MultipleStatusView.attach(ll_content);
-        if (null != mMultipleStatusView) {
-            mMultipleStatusView.setOnRetryClickListener(mRetryClickListener);
+    }
+
+    @Override public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.fab_loading:
+                loading();
+                break;
+            case R.id.fab_empty:
+                mMultipleStatusView.showEmpty();
+                break;
+            case R.id.fab_error:
+                mMultipleStatusView.showError();
+                break;
+            case R.id.fab_no_network:
+                mMultipleStatusView.showNoNetwork();
+                break;
+            case R.id.fab_content:
+                mMultipleStatusView.showContent();
+                break;
         }
+        mFloatingActionMenu.toggle(false);
     }
 }
diff --git a/app/src/main/res/layout/activity_simple3.xml b/app/src/main/res/layout/activity_simple3.xml
@@ -24,22 +24,20 @@
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:gravity="center"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/tv_content"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
                 android:text="内容视图"
-                android:textSize="20sp"
-            />
+                android:textSize="20sp"/>
 
         </LinearLayout>
 
         <include layout="@layout/fab_menu"/>
 
     </FrameLayout>
 
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/custom_empty_view.xml b/app/src/main/res/layout/custom_empty_view.xml
@@ -14,7 +14,7 @@
 
     <TextView
         style="@style/MultipleStatusView.Content"
-        android:id="@+id/empty_view_tv"
+        android:id="@+id/status_hint_content"
         android:layout_below="@id/empty_retry_view"
         android:text="@string/empty_view_hint"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/custom_error_view.xml b/app/src/main/res/layout/custom_error_view.xml
@@ -14,7 +14,7 @@
 
     <TextView
         style="@style/MultipleStatusView.Content"
-        android:id="@+id/error_view_tv"
+        android:id="@+id/status_hint_content"
         android:layout_below="@id/error_retry_view"
         android:text="@string/error_view_hint"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/custom_no_network_view.xml b/app/src/main/res/layout/custom_no_network_view.xml
@@ -14,7 +14,7 @@
 
     <TextView
         style="@style/MultipleStatusView.Content"
-        android:id="@+id/no_network_view_tv"
+        android:id="@+id/status_hint_content"
         android:layout_below="@id/no_network_retry_view"
         android:text="@string/no_network_view_hint"/>
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">MultipleStatusView</string>
     <string name="title_activity_list">ListActivity</string>
+    <string name="test_hint_content">自定义提示内容，%s占位符测试%s</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }

diff --git a/config.gradle b/config.gradle
@@ -8,8 +8,8 @@ ext {
             applicationId       : "com.classic.common.simple",
             minSdkVersion       : 14,
             targetSdkVersion    : 28,
-            versionCode         : 8,
-            versionName         : "1.6"
+            versionCode         : 9,
+            versionName         : "1.7"
     ]
 
     resourcePrefix = "MultipleStatusView"
@@ -23,7 +23,7 @@ ext {
 
     junit = "junit:junit:4.12"
 
-    multipleStatusView = "com.classic.common:multiple-status-view:1.6"
+    multipleStatusView = "com.classic.common:multiple-status-view:1.7"
     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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip