Skip to content

Commit bdce74f

Browse files
github2136github2136
committed
调整打印日志
1 parent 87d2122 commit bdce74f

File tree

2 files changed

+37
-19
lines changed

2 files changed

+37
-19
lines changed

‎basemvvm/src/main/java/com/github2136/basemvvm/download/DownloadMultipleTask.kt‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,17 @@ class DownloadMultipleTask(
7474
//已下载
7575
callback?.invoke(DownloadUtil.STATE_BLOCK_SUCCESS, p, successCount.get(), fileCount, entry.key, path, null)
7676
if (successCount.get() + failCount.get() == fileCount) {
77-
if (DownloadUtil.LOG_ENABLE) {
78-
Log.d(DownloadUtil.TAG, "多文件全部已存在")
77+
if (failCount.get() == 0) {
78+
if (DownloadUtil.LOG_ENABLE) {
79+
Log.d(DownloadUtil.TAG, "多文件下载结束")
80+
}
81+
callback?.invoke(DownloadUtil.STATE_SUCCESS, p, successCount.get(), fileCount, entry.key, path, null)
82+
} else {
83+
if (DownloadUtil.LOG_ENABLE) {
84+
Log.d(DownloadUtil.TAG, "多文件下载结束，部分失败")
85+
}
86+
callback?.invoke(DownloadUtil.STATE_FAIL, p, successCount.get(), fileCount, entry.key, path, null)
7987
}
80-
callback?.invoke(DownloadUtil.STATE_SUCCESS, p, successCount.get(), fileCount, entry.key, path, null)
8188
}
8289
}
8390
}
@@ -89,7 +96,9 @@ class DownloadMultipleTask(
8996
stop = true
9097
downloadChannel.close()
9198
for (downloadTask in progressTask) {
92-
Log.d(DownloadUtil.TAG, "文件停止 ${downloadTask?.url}")
99+
if (DownloadUtil.LOG_ENABLE) {
100+
Log.d(DownloadUtil.TAG, "多文件下载停止 ${downloadTask?.url}")
101+
}
93102
downloadTask?.stop()
94103
}
95104
callback?.invoke(DownloadUtil.STATE_STOP, getProgress(), successCount.get(), fileCount, "", "", null)
@@ -125,20 +134,17 @@ class DownloadMultipleTask(
125134
val p = getProgress()
126135
callback?.invoke(DownloadUtil.STATE_BLOCK_SUCCESS, p, successCount.get(), fileCount, url, path, error)
127136
callback?.invoke(DownloadUtil.STATE_BLOCK_PROGRESS, p, successCount.get(), fileCount, url, path, error)
128-
if (DownloadUtil.LOG_ENABLE) {
129-
Log.d(DownloadUtil.TAG, "多文件下载完成:${url}")
130-
}
131137
if (successCount.get() + failCount.get() == fileCount) {
132138
if (failCount.get() == 0) {
133139
//全部下载完成
134140
if (DownloadUtil.LOG_ENABLE) {
135-
Log.d(DownloadUtil.TAG, "全部下载完成")
141+
Log.d(DownloadUtil.TAG, "多文件下载结束")
136142
}
137143
callback?.invoke(DownloadUtil.STATE_SUCCESS, p, successCount.get(), fileCount, "", "", "")
138144
} else {
139145
//全部下载完成，部分失败
140146
if (DownloadUtil.LOG_ENABLE) {
141-
Log.d(DownloadUtil.TAG, "部分下载完成")
147+
Log.d(DownloadUtil.TAG, "多文件下载结束，部分失败")
142148
}
143149
callback?.invoke(DownloadUtil.STATE_FAIL, p, successCount.get(), fileCount, "", "", "")
144150
}
@@ -148,13 +154,10 @@ class DownloadMultipleTask(
148154
failCount.incrementAndGet()
149155
val p = getProgress()
150156
callback?.invoke(DownloadUtil.STATE_BLOCK_FAIL, p, successCount.get(), fileCount, url, path, error)
151-
if (DownloadUtil.LOG_ENABLE) {
152-
Log.d(DownloadUtil.TAG, "多文件下载失败:${url} ${error}")
153-
}
154157
if (successCount.get() + failCount.get() == fileCount) {
155158
//全部下载完成，部分失败
156159
if (DownloadUtil.LOG_ENABLE) {
157-
Log.d(DownloadUtil.TAG, "部分下载完成")
160+
Log.d(DownloadUtil.TAG, "多文件下载结束，部分失败")
158161
}
159162
callback?.invoke(DownloadUtil.STATE_FAIL, p, successCount.get(), fileCount, "", "", "")
160163
}

‎basemvvm/src/main/java/com/github2136/basemvvm/download/DownloadTask.kt‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,19 @@ class DownloadTask(
125125
else -> 5
126126
}
127127
if (DownloadUtil.LOG_ENABLE) {
128-
Log.d(DownloadUtil.TAG, "URL:$url Size:$length BlockSize:${threadSize}")
128+
Log.d(DownloadUtil.TAG, "URL:$url 大小:$length 块数:${threadSize}")
129129
}
130130
download(downloadFile!!.id, threadSize, url, length)
131131
} else {
132132
if (DownloadUtil.LOG_ENABLE) {
133-
Log.d(DownloadUtil.TAG, "URL:$url Size:$length")
133+
Log.d(DownloadUtil.TAG, "URL:$url 大小:$length")
134134
}
135135
download(downloadFile!!.id, 1, url, length)
136136
}
137137
} else {
138+
if (DownloadUtil.LOG_ENABLE) {
139+
Log.d(DownloadUtil.TAG, "URL:$url request code ${response.code}")
140+
}
138141
fail("request code ${response.code}")
139142
//下载失败
140143
response.body?.apply {
@@ -143,15 +146,21 @@ class DownloadTask(
143146
}
144147
} catch (e: Exception) {
145148
//下载失败
149+
if (DownloadUtil.LOG_ENABLE) {
150+
Log.e(DownloadUtil.TAG, "URL:$url $e")
151+
}
146152
val sw = StringWriter()
147153
e.printStackTrace(PrintWriter(sw))
148154
fail(sw.toString())
149155
}
150156
} catch (e: Exception) {
151157
//下载失败
158+
if (DownloadUtil.LOG_ENABLE) {
159+
Log.e(DownloadUtil.TAG, "URL:$url $e")
160+
}
152161
val sw = StringWriter()
153162
e.printStackTrace(PrintWriter(sw))
154-
fail("start onFailure $sw")
163+
fail(sw.toString())
155164
}
156165
}
157166

@@ -299,22 +308,28 @@ class DownloadTask(
299308
}
300309
} else {
301310
if (DownloadUtil.LOG_ENABLE) {
302-
Log.d(DownloadUtil.TAG, "URL:$url 文件被删除")
311+
Log.e(DownloadUtil.TAG, "URL:$url 文件被删除")
303312
}
304-
fail("File miss")
313+
fail("文件被删除")
305314
}
306315
}
307316
}
308317
}
309318
} else {
310319
//下载失败
320+
if (DownloadUtil.LOG_ENABLE) {
321+
Log.e(DownloadUtil.TAG, "URL:$url request code ${response.code}")
322+
}
311323
fail("request code ${response.code}")
312324
}
313325
} catch (e: Exception) {
314326
//下载失败
327+
if (DownloadUtil.LOG_ENABLE) {
328+
Log.e(DownloadUtil.TAG, "URL:$url $e")
329+
}
315330
val sw = StringWriter()
316331
e.printStackTrace(PrintWriter(sw))
317-
fail("download onFailure $sw")
332+
fail(sw.toString())
318333
} finally {
319334
inputStream?.close()
320335
randomFile?.close()

0 commit comments

Comments
 (0)