修改逻辑，在设置文字为null的时候隐藏TextView

ForgetAll · May 8, 2019 · 57d6092 · 57d6092
1 parent 346c2f2
commit 57d6092
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/LoadingDialog/build.gradle b/LoadingDialog/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion MINSDKVERSION as int
         targetSdkVersion TARGETSDKVERSION as int
-        versionCode VERSION_CODE as int
-        versionName VERSION_NAME as String
+        versionCode LIB_VERSION_CODE as int
+        versionName LIB_VERSION_NAME as String
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/LoadingDialog.java b/LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/LoadingDialog.java
@@ -234,8 +234,10 @@ public void close() {
      * @return 这个对象
      */
     public LoadingDialog setLoadingText(String msg) {
-        if (msg != null && msg.length() > 0)
+        if (msg != null) {
+            loadingText.setVisibility(View.VISIBLE);
             loadingText.setText(msg);
+        } else loadingText.setVisibility(View.GONE);
         return this;
     }
 
@@ -246,8 +248,7 @@ public LoadingDialog setLoadingText(String msg) {
      * @return 这个对象
      */
     public LoadingDialog setSuccessText(String msg) {
-        if (msg != null && msg.length() > 0)
-            loadSuccessStr = msg;
+        loadSuccessStr = msg;
         return this;
     }
 
@@ -258,7 +259,7 @@ public LoadingDialog setSuccessText(String msg) {
      * @return 这个对象
      */
     public LoadingDialog setFailedText(String msg) {
-        if (msg != null && msg.length() > 0) loadFailedStr = msg;
+        loadFailedStr = msg;
         return this;
     }
 
@@ -272,7 +273,12 @@ public void loadSuccess() {
         hideAll();
         mSuccessView.setDrawDynamic(openSuccessAnim);
         mSuccessView.setVisibility(View.VISIBLE);
-        loadingText.setText(loadSuccessStr);
+        if (loadSuccessStr == null) {
+            loadingText.setVisibility(View.GONE);
+        } else {
+            loadingText.setVisibility(View.VISIBLE);
+            loadingText.setText(loadSuccessStr);
+        }
     }
 
     /**
@@ -285,7 +291,12 @@ public void loadFailed() {
         hideAll();
         mFailedView.setDrawDynamic(openFailedAnim);
         mFailedView.setVisibility(View.VISIBLE);
-        loadingText.setText(loadFailedStr);
+        if (loadFailedStr == null) {
+            loadingText.setVisibility(View.GONE);
+        } else {
+            loadingText.setVisibility(View.VISIBLE);
+            loadingText.setText(loadFailedStr);
+        }
     }
 
     /**

diff --git a/LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/RightDiaView.java b/LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/RightDiaView.java
@@ -158,7 +158,7 @@ private void drawStatic(Canvas canvas) {
         int radius = mWidth / 2 - 8;
         canvas.drawLine(center1, center,
                 center1 + radius / 3, center + radius / 3, mPaint);
-        canvas.drawLine(center1 + radius / 3 - 1, center + radius / 3,
+        canvas.drawLine(center1 + radius / 3 - 1, center + radius / 3 - 4,
                 center1 + radius, center - radius / 3, mPaint);
     }
 

diff --git a/app/src/main/java/com/xiasuhuei321/sample/MainActivity.java b/app/src/main/java/com/xiasuhuei321/sample/MainActivity.java
@@ -82,6 +82,7 @@ protected void handleMessage(Message msg) {
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.btn1:
+                ld.setLoadingText(null);
                 showLoading();
                 h.sendEmptyMessageDelayed(SAVE_YOU, 5000);
                 break;
@@ -99,6 +100,7 @@ public void onFinish() {
                         .setInterceptBack(intercept_back_event)
                         .setLoadSpeed(speed)
                         .setRepeatCount(repeatTime)
+                        .setShowTime(1000)
 //                        .setDrawColor(color)
                         .setLoadStyle(style)
                         .show();
@@ -109,12 +111,12 @@ public void onFinish() {
             case R.id.btn3:
                 ld = new LoadingDialog(this);
                 ld.setLoadingText("加载中")
-                        .setFailedText("加载失败")
+                        .setFailedText(null)
                         .setInterceptBack(intercept_back_event)
                         .setLoadSpeed(speed)
                         .setRepeatCount(repeatTime)
 //                        .setDrawColor(color)
-                        .setShowTime(5000)//延时5秒自动关闭，默认1秒
+                        .setShowTime(2000)//延时5秒自动关闭，默认1秒
                         .setLoadStyle(style)
                         .show();
                 h.sendEmptyMessageDelayed(LOAD_FAILED, delayedTime);

diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,7 @@ MINSDKVERSION=14
 TARGETSDKVERSION=27
 VERSION_CODE=1
 SUPPORTVERSION=27.0.0
-VERSION_NAME=1.0.0
+VERSION_NAME=1.0.0
+
+LIB_VERSION_CODE=112
+LIB_VERSION_NAME=v1.1.2