Skip to content

Commit 399164c

Browse files
ichtjichtj
committed
优化下载工具的进度反馈
1 parent 0283e8d commit 399164c

File tree

6 files changed

+225
-217
lines changed

6 files changed

+225
-217
lines changed

‎README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ public class App extends Application {
165165
DownloadUtils downloadSupport=new DownloadUtils();
166166

167167
//---------------------------任务1--------------------------------
168-
FileCacheData fileCacheData = new FileCacheData();
169-
fileCacheData.setUrl(downloadUrl);
170-
fileCacheData.setFileName(fileName1);
171-
fileCacheData.setRequestTag(downloadUrl);
172-
fileCacheData.setFilePath("/sdcard/" + fileName1);
168+
FileCacheData fileData = new FileCacheData();
169+
fileData.setUrl(downloadUrl);
170+
fileData.setFileName(fileName1);
171+
fileData.setRequestTag(downloadUrl);
172+
fileData.setFilePath("/sdcard/" + fileName1);
173173

174174
//---------------------------任务2--------------------------------
175175
FileCacheData fileCacheData2 = new FileCacheData();
@@ -181,18 +181,18 @@ public class App extends Application {
181181

182182

183183
//开启任务下载 下载文件信息1
184-
downloadSupport.addStartTask(fileCacheData, downloadCallBack);
184+
downloadSupport.addStartTask(fileData, downloadCallBack);
185185
//开启任务下载 下载文件信息2
186186
downloadSupport.addStartTask(fileCacheData2, downloadCallBack);
187187
//-----------------------------------------------------------
188188

189189
//下载进度
190-
//多个任务使用同一个DownloadCallBack 可根据设置的requestTag来区分属于哪个下载进度 fileCacheData.getRequestTag()
190+
//多个任务使用同一个DownloadCallBack 可根据设置的requestTag来区分属于哪个下载进度 fileData.getRequestTag()
191191
IDownloadCallback downloadCallBack = new IDownloadCallback() {
192192
@Override
193-
public void download(FileCacheData fileCacheData, int percent, boolean isComplete) {
193+
public void download(FileCacheData fileData, int percent, boolean isComplete) {
194194
Message message1 = handler.obtainMessage();
195-
message1.obj = fileCacheData;
195+
message1.obj = fileData;
196196
message1.arg1 = percent;
197197
handler.sendMessage(message1);
198198
}

‎app/src/main/java/com/ichtj/basetools/download/FileDownLoadAty.java

+51-51
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.face_chtj.base_iotutils.ToastUtils;
1616
import com.face_chtj.base_iotutils.callback.IDownloadCallback;
1717
import com.face_chtj.base_iotutils.DownloadUtils;
18-
import com.face_chtj.base_iotutils.entity.FileCacheData;
18+
import com.face_chtj.base_iotutils.entity.FileData;
1919
import com.face_chtj.base_iotutils.NetUtils;
2020
import com.ichtj.basetools.R;
2121
import com.ichtj.basetools.base.BaseActivity;
@@ -132,8 +132,8 @@ public void getdown_status(View view) {
132132
* @param view
133133
*/
134134
public void downTaskPause1(View view) {
135-
if (fileCacheData != null) {
136-
DownloadUtils.pause(fileCacheData.getRequestTag());
135+
if (fileData != null) {
136+
DownloadUtils.pause(fileData.getRequestTag());
137137
}
138138
}
139139

@@ -143,8 +143,8 @@ public void downTaskPause1(View view) {
143143
* @param view
144144
*/
145145
public void downTaskPause2(View view) {
146-
if (fileCacheData2 != null) {
147-
DownloadUtils.pause(fileCacheData2.getRequestTag());
146+
if (fileData2 != null) {
147+
DownloadUtils.pause(fileData2.getRequestTag());
148148
}
149149
}
150150

@@ -154,8 +154,8 @@ public void downTaskPause2(View view) {
154154
* @param view
155155
*/
156156
public void downTaskPause3(View view) {
157-
if (fileCacheData3 != null) {
158-
DownloadUtils.pause(fileCacheData3.getRequestTag());
157+
if (fileData3 != null) {
158+
DownloadUtils.pause(fileData3.getRequestTag());
159159
}
160160
}
161161

@@ -165,8 +165,8 @@ public void downTaskPause3(View view) {
165165
* @param view
166166
*/
167167
public void downTaskPause4(View view) {
168-
if (fileCacheData4 != null) {
169-
DownloadUtils.pause(fileCacheData4.getRequestTag());
168+
if (fileData4 != null) {
169+
DownloadUtils.pause(fileData4.getRequestTag());
170170
}
171171
}
172172

@@ -188,7 +188,7 @@ public void downloadStop(View view) {
188188
DownloadUtils.cancelAll();
189189
}
190190

191-
FileCacheData fileCacheData = null;
191+
FileData fileData = null;
192192

193193
//文件下载
194194
public void downloadFile1(View view) {
@@ -197,69 +197,69 @@ public void downloadFile1(View view) {
197197
return;
198198
}
199199
//开启任务下载----------------------这里可执行多个任务 重复执行即可---------
200-
fileCacheData = new FileCacheData();
201-
fileCacheData.setUrl(downloadUrl1);
202-
fileCacheData.setFileName(fileName1);
203-
fileCacheData.setRequestTag(downloadUrl1);
204-
fileCacheData.setFilePath(saveRootPath + fileName1);
205-
addDownloadTask(fileCacheData);
200+
fileData = new FileData();
201+
fileData.setUrl(downloadUrl1);
202+
fileData.setFileName(fileName1);
203+
fileData.setRequestTag(downloadUrl1);
204+
fileData.setFilePath(saveRootPath + fileName1);
205+
addDownloadTask(fileData);
206206
FileUtils.writeFileData(saveCachePath, "_" + saveRootPath + fileName1, false);
207207
tvTime1.setText(TimeUtils.getTodayDateHms("yyyy-MM-dd HH:mm:ss"));
208208
//-----------------------------------------------------------
209209
}
210210

211-
FileCacheData fileCacheData2 = null;
211+
FileData fileData2 = null;
212212

213213
//文件下载
214214
public void downloadFile2(View view) {
215215
if (NetUtils.getNetWorkType() == NetUtils.NETWORK_NO) {
216216
ToastUtils.error("当前无网络连接！");
217217
return;
218218
}
219-
fileCacheData2 = new FileCacheData();
220-
fileCacheData2.setUrl(downloadUrl2);
221-
fileCacheData2.setFileName(fileName2);
222-
fileCacheData2.setRequestTag(downloadUrl2);
223-
fileCacheData2.setFilePath(saveRootPath + fileName2);
224-
addDownloadTask(fileCacheData2);
219+
fileData2 = new FileData();
220+
fileData2.setUrl(downloadUrl2);
221+
fileData2.setFileName(fileName2);
222+
fileData2.setRequestTag(downloadUrl2);
223+
fileData2.setFilePath(saveRootPath + fileName2);
224+
addDownloadTask(fileData2);
225225
FileUtils.writeFileData(saveCachePath, "_" + saveRootPath + fileName2, false);
226226
tvTime2.setText(TimeUtils.getTodayDateHms("yyyy-MM-dd HH:mm:ss"));
227227
//-----------------------------------------------------------
228228
}
229229

230-
FileCacheData fileCacheData3 = null;
230+
FileData fileData3 = null;
231231

232232
//文件下载
233233
public void downloadFile3(View view) {
234234
if (NetUtils.getNetWorkType() == NetUtils.NETWORK_NO) {
235235
ToastUtils.error("当前无网络连接！");
236236
return;
237237
}
238-
fileCacheData3 = new FileCacheData();
239-
fileCacheData3.setUrl(downloadUrl3);
240-
fileCacheData3.setFileName(fileName3);
241-
fileCacheData3.setRequestTag(downloadUrl3);
242-
fileCacheData3.setFilePath(saveRootPath + fileName3);
243-
addDownloadTask(fileCacheData3);
238+
fileData3 = new FileData();
239+
fileData3.setUrl(downloadUrl3);
240+
fileData3.setFileName(fileName3);
241+
fileData3.setRequestTag(downloadUrl3);
242+
fileData3.setFilePath(saveRootPath + fileName3);
243+
addDownloadTask(fileData3);
244244
FileUtils.writeFileData(saveCachePath, "_" + saveRootPath + fileName3, false);
245245
tvTime3.setText(TimeUtils.getTodayDateHms("yyyy-MM-dd HH:mm:ss"));
246246
//-----------------------------------------------------------
247247
}
248248

249-
FileCacheData fileCacheData4 = null;
249+
FileData fileData4 = null;
250250

251251
//文件下载
252252
public void downloadFile4(View view) {
253253
if (NetUtils.getNetWorkType() == NetUtils.NETWORK_NO) {
254254
ToastUtils.error("当前无网络连接！");
255255
return;
256256
}
257-
fileCacheData4 = new FileCacheData();
258-
fileCacheData4.setUrl(downloadUrl4);
259-
fileCacheData4.setFileName(fileName4);
260-
fileCacheData4.setRequestTag(downloadUrl4);
261-
fileCacheData4.setFilePath(saveRootPath + fileName4);
262-
addDownloadTask(fileCacheData4);
257+
fileData4 = new FileData();
258+
fileData4.setUrl(downloadUrl4);
259+
fileData4.setFileName(fileName4);
260+
fileData4.setRequestTag(downloadUrl4);
261+
fileData4.setFilePath(saveRootPath + fileName4);
262+
addDownloadTask(fileData4);
263263
FileUtils.writeFileData(saveCachePath, "_" + saveRootPath + fileName4, false);
264264
tvTime4.setText(TimeUtils.getTodayDateHms("yyyy-MM-dd HH:mm:ss"));
265265
//-----------------------------------------------------------
@@ -268,19 +268,19 @@ public void downloadFile4(View view) {
268268
/**
269269
* 添加下载任务
270270
*
271-
* @param fileCacheData
271+
* @param fileData
272272
*/
273-
public void addDownloadTask(FileCacheData fileCacheData) {
274-
DownloadUtils.addStartTask(fileCacheData);
273+
public void addDownloadTask(FileData fileData) {
274+
DownloadUtils.addStartTask(fileData);
275275
}
276276

277277
//下载进度 可根据设置的requestTag来区分属于哪个下载进度 fileCacheData.getRequestTag()
278278
IDownloadCallback downloadCallBack = new IDownloadCallback() {
279279
@Override
280-
public void downloadProgress(FileCacheData fileCacheData, int percent) {
281-
KLog.d(TAG, "download:>filename=" + fileCacheData.getFileName() + ",percent=" + percent + ",current=" + fileCacheData.getCurrent());
280+
public void downloadProgress(FileData fileData, int percent) {
281+
KLog.d(TAG, "download:>filename=" + fileData.getFileName() + ",percent=" + percent + ",current=" + fileData.getCurrent());
282282
Message message1 = handler.obtainMessage();
283-
message1.obj = fileCacheData;
283+
message1.obj = fileData;
284284
message1.arg1 = percent;
285285
handler.sendMessage(message1);
286286
}
@@ -292,28 +292,28 @@ public void error(Throwable e) {
292292
}
293293

294294
@Override
295-
public void taskExist(FileCacheData fileCacheData) {
295+
public void taskExist(FileData fileData) {
296296
ToastUtils.warning("任务存在");
297297
}
298298

299299
@Override
300-
public void allDownloadComplete(List<FileCacheData> fileCacheDataList) {
301-
for (int i = 0; i < fileCacheDataList.size(); i++) {
302-
KLog.d(TAG, "allDownloadComplete:>requestTag=" + fileCacheDataList.get(i).getRequestTag() + "" + fileCacheDataList.get(i).getFileName() + "," + fileCacheDataList.get(i).getCurrent() + "," + fileCacheDataList.get(i).getTotal());
300+
public void allDownloadComplete(List<FileData> fileDataList) {
301+
for (int i = 0; i < fileDataList.size(); i++) {
302+
KLog.d(TAG, "allDownloadComplete:>requestTag=" + fileDataList.get(i).getRequestTag() + "" + fileDataList.get(i).getFileName() + "," + fileDataList.get(i).getCurrent() + "," + fileDataList.get(i).getTotal());
303303
}
304304
}
305305

306306
@Override
307-
public void downloadStatus(FileCacheData fileCacheData, int downloadStatus) {
308-
KLog.d(TAG, "downloadStatus:>requestTag =" + fileCacheData.getRequestTag() + ",status=" + downloadStatus);
307+
public void downloadStatus(FileData fileData, int downloadStatus) {
308+
KLog.d(TAG, "downloadStatus:>requestTag =" + fileData.getRequestTag() + ",status=" + downloadStatus);
309309
}
310310
};
311311
Handler handler = new Handler() {
312312
@Override
313313
public void handleMessage(Message msg) {
314314
super.handleMessage(msg);
315-
FileCacheData fileCacheData = (FileCacheData) msg.obj;
316-
switch (fileCacheData.getRequestTag()) {
315+
FileData fileData = (FileData) msg.obj;
316+
switch (fileData.getRequestTag()) {
317317
case downloadUrl1:
318318
pbProgressbar1.setProgress(msg.arg1);
319319
tvResult1.setText("update1.zip >>> " + msg.arg1 + "%");

‎base_iotutils/proguardMapping.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ com.face_chtj.base_iotutils.entity.ComEntity -> com.face_chtj.base_iotutils.enti
132132
1:1:void setHeartBeatEntity(com.face_chtj.base_iotutils.entity.HeartBeatEntity):50:50 -> setHeartBeatEntity
133133
1:1:void setRetriesCount(int):60:60 -> setRetriesCount
134134
1:1:void setTimeOut(int):42:42 -> setTimeOut
135-
com.face_chtj.base_iotutils.entity.FileCacheData -> com.face_chtj.base_iotutils.entity.FileCacheData:
135+
com.face_chtj.base_iotutils.entity.FileData -> com.face_chtj.base_iotutils.entity.FileData:
136136
1:1:void <init>():3:3 -> <init>
137137
1:1:long getCurrent():80:80 -> getCurrent
138138
1:1:java.lang.String getFileName():48:48 -> getFileName

0 commit comments

Comments
 (0)