Skip to content
This repository was archived by the owner on Jan 8, 2022. It is now read-only.

Commit 57d6092

Browse files
committed
修改逻辑,在设置文字为null的时候隐藏TextView
1 parent 346c2f2 commit 57d6092

File tree

5 files changed

+28
-12
lines changed

5 files changed

+28
-12
lines changed

LoadingDialog/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
defaultConfig {
77
minSdkVersion MINSDKVERSION as int
88
targetSdkVersion TARGETSDKVERSION as int
9-
versionCode VERSION_CODE as int
10-
versionName VERSION_NAME as String
9+
versionCode LIB_VERSION_CODE as int
10+
versionName LIB_VERSION_NAME as String
1111

1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313

LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/LoadingDialog.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,10 @@ public void close() {
234234
* @return 这个对象
235235
*/
236236
public LoadingDialog setLoadingText(String msg) {
237-
if (msg != null && msg.length() > 0)
237+
if (msg != null) {
238+
loadingText.setVisibility(View.VISIBLE);
238239
loadingText.setText(msg);
240+
} else loadingText.setVisibility(View.GONE);
239241
return this;
240242
}
241243

@@ -246,8 +248,7 @@ public LoadingDialog setLoadingText(String msg) {
246248
* @return 这个对象
247249
*/
248250
public LoadingDialog setSuccessText(String msg) {
249-
if (msg != null && msg.length() > 0)
250-
loadSuccessStr = msg;
251+
loadSuccessStr = msg;
251252
return this;
252253
}
253254

@@ -258,7 +259,7 @@ public LoadingDialog setSuccessText(String msg) {
258259
* @return 这个对象
259260
*/
260261
public LoadingDialog setFailedText(String msg) {
261-
if (msg != null && msg.length() > 0) loadFailedStr = msg;
262+
loadFailedStr = msg;
262263
return this;
263264
}
264265

@@ -272,7 +273,12 @@ public void loadSuccess() {
272273
hideAll();
273274
mSuccessView.setDrawDynamic(openSuccessAnim);
274275
mSuccessView.setVisibility(View.VISIBLE);
275-
loadingText.setText(loadSuccessStr);
276+
if (loadSuccessStr == null) {
277+
loadingText.setVisibility(View.GONE);
278+
} else {
279+
loadingText.setVisibility(View.VISIBLE);
280+
loadingText.setText(loadSuccessStr);
281+
}
276282
}
277283

278284
/**
@@ -285,7 +291,12 @@ public void loadFailed() {
285291
hideAll();
286292
mFailedView.setDrawDynamic(openFailedAnim);
287293
mFailedView.setVisibility(View.VISIBLE);
288-
loadingText.setText(loadFailedStr);
294+
if (loadFailedStr == null) {
295+
loadingText.setVisibility(View.GONE);
296+
} else {
297+
loadingText.setVisibility(View.VISIBLE);
298+
loadingText.setText(loadFailedStr);
299+
}
289300
}
290301

291302
/**

LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/RightDiaView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private void drawStatic(Canvas canvas) {
158158
int radius = mWidth / 2 - 8;
159159
canvas.drawLine(center1, center,
160160
center1 + radius / 3, center + radius / 3, mPaint);
161-
canvas.drawLine(center1 + radius / 3 - 1, center + radius / 3,
161+
canvas.drawLine(center1 + radius / 3 - 1, center + radius / 3 - 4,
162162
center1 + radius, center - radius / 3, mPaint);
163163
}
164164

app/src/main/java/com/xiasuhuei321/sample/MainActivity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ protected void handleMessage(Message msg) {
8282
public void onClick(View v) {
8383
switch (v.getId()) {
8484
case R.id.btn1:
85+
ld.setLoadingText(null);
8586
showLoading();
8687
h.sendEmptyMessageDelayed(SAVE_YOU, 5000);
8788
break;
@@ -99,6 +100,7 @@ public void onFinish() {
99100
.setInterceptBack(intercept_back_event)
100101
.setLoadSpeed(speed)
101102
.setRepeatCount(repeatTime)
103+
.setShowTime(1000)
102104
// .setDrawColor(color)
103105
.setLoadStyle(style)
104106
.show();
@@ -109,12 +111,12 @@ public void onFinish() {
109111
case R.id.btn3:
110112
ld = new LoadingDialog(this);
111113
ld.setLoadingText("加载中")
112-
.setFailedText("加载失败")
114+
.setFailedText(null)
113115
.setInterceptBack(intercept_back_event)
114116
.setLoadSpeed(speed)
115117
.setRepeatCount(repeatTime)
116118
// .setDrawColor(color)
117-
.setShowTime(5000)//延时5秒自动关闭,默认1秒
119+
.setShowTime(2000)//延时5秒自动关闭,默认1秒
118120
.setLoadStyle(style)
119121
.show();
120122
h.sendEmptyMessageDelayed(LOAD_FAILED, delayedTime);

gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,7 @@ MINSDKVERSION=14
1616
TARGETSDKVERSION=27
1717
VERSION_CODE=1
1818
SUPPORTVERSION=27.0.0
19-
VERSION_NAME=1.0.0
19+
VERSION_NAME=1.0.0
20+
21+
LIB_VERSION_CODE=112
22+
LIB_VERSION_NAME=v1.1.2

0 commit comments

Comments
 (0)