From cd55e370cbf3c4e1e8430bdf78262d981b9623f5 Mon Sep 17 00:00:00 2001 From: AriaLyy <511455842@qq.com> Date: Mon, 2 Jan 2017 16:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E9=99=90=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=87=BA=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/scheduler/DownloadSchedulers.java | 28 +++++++++++-------- .../arialyy/aria/core/task/DownloadUtil.java | 11 ++++---- .../java/com/arialyy/aria/core/task/Task.java | 1 - .../simple/activity/SingleTaskActivity.java | 20 ++++++------- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadSchedulers.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadSchedulers.java index 33416706..e6d70851 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadSchedulers.java +++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadSchedulers.java @@ -199,19 +199,23 @@ public class DownloadSchedulers implements IDownloadSchedulers { * * @param entity 失败实体 */ - @Override public void handleFailTask(DownloadEntity entity) { - final Configuration config = Configuration.getInstance(); - if (entity.getFailNum() <= config.getReTryNum()) { - Task task = mQueue.getTask(entity); - mQueue.reTryStart(task); - try { - Thread.currentThread().sleep(config.getReTryInterval()); - } catch (InterruptedException e) { - e.printStackTrace(); + @Override public void handleFailTask(final DownloadEntity entity) { + new Thread(new Runnable() { + @Override public void run() { + final Configuration config = Configuration.getInstance(); + if (entity.getFailNum() <= config.getReTryNum()) { + Task task = mQueue.getTask(entity); + mQueue.reTryStart(task); + try { + Thread.sleep(config.getReTryInterval()); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } else { + startNextTask(entity); + } } - } else { - startNextTask(entity); - } + }).start(); } /** diff --git a/Aria/src/main/java/com/arialyy/aria/core/task/DownloadUtil.java b/Aria/src/main/java/com/arialyy/aria/core/task/DownloadUtil.java index 97c845c9..c69ee94a 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/task/DownloadUtil.java +++ b/Aria/src/main/java/com/arialyy/aria/core/task/DownloadUtil.java @@ -229,10 +229,10 @@ final class DownloadUtil implements IDownloadUtil, Runnable { conn.setConnectTimeout(mConnectTimeOut * 4); conn.connect(); int len = conn.getContentLength(); - if (len < 0) { //网络被劫持时会出现这个问题 - failDownload("下载失败，网络被劫持"); - return; - } + //if (len < 0) { //网络被劫持时会出现这个问题 + // failDownload("下载失败，网络被劫持"); + // return; + //} int code = conn.getResponseCode(); //https://zh.wikipedia.org/wiki/HTTP%E7%8A%B6%E6%80%81%E7%A0%81 //206支持断点 @@ -240,8 +240,9 @@ final class DownloadUtil implements IDownloadUtil, Runnable { isSupportBreakpoint = true; mListener.supportBreakpoint(true); handleBreakpoint(conn); - } else if (code == HttpURLConnection.HTTP_OK) { + } else if (code == HttpURLConnection.HTTP_OK || len < 0) { //在conn.setRequestProperty("Range", "bytes=" + 0 + "-");下，200为不支持断点状态 + isSupportBreakpoint = false; mListener.supportBreakpoint(false); Log.w(TAG, "该下载链接不支持断点下载"); handleBreakpoint(conn); diff --git a/Aria/src/main/java/com/arialyy/aria/core/task/Task.java b/Aria/src/main/java/com/arialyy/aria/core/task/Task.java index 6f7ec758..fdccc9d2 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/task/Task.java +++ b/Aria/src/main/java/com/arialyy/aria/core/task/Task.java @@ -257,7 +257,6 @@ public class Task { @Override public void onStart(long startLocation) { super.onStart(startLocation); downloadEntity.setState(DownloadEntity.STATE_DOWNLOAD_ING); - downloadEntity.setFailNum(0); sendInState2Target(DownloadSchedulers.START); sendIntent(Aria.ACTION_START, startLocation); } diff --git a/app/src/main/java/com/arialyy/simple/activity/SingleTaskActivity.java b/app/src/main/java/com/arialyy/simple/activity/SingleTaskActivity.java index 7c259352..8ea93fb8 100644 --- a/app/src/main/java/com/arialyy/simple/activity/SingleTaskActivity.java +++ b/app/src/main/java/com/arialyy/simple/activity/SingleTaskActivity.java @@ -54,10 +54,10 @@ public class SingleTaskActivity extends BaseActivity { public static final int DOWNLOAD_RESUME = 0x05; public static final int DOWNLOAD_COMPLETE = 0x06; public static final int DOWNLOAD_RUNNING = 0x07; - private static final String DOWNLOAD_URL = - "http://static.gaoshouyou.com/d/3a/93/573ae1db9493a801c24bf66128b11e39.apk"; //private static final String DOWNLOAD_URL = - // "http://img13.poco.cn/mypoco/myphoto/20120828/15/55689209201208281549023849547194135_001.jpg"; + // "http://static.gaoshouyou.com/d/3a/93/573ae1db9493a801c24bf66128b11e39.apk"; + private static final String DOWNLOAD_URL = + "http://o.aolcdn.com/hss/storage/midas/3679ed444c51eca8d17a82b7da021b01/204737495/fitbit-charge-2.jpeg"; @Bind(R.id.progressBar) HorizontalProgressBarWithNumber mPb; @Bind(R.id.start) Button mStart; @Bind(R.id.stop) Button mStop; @@ -124,9 +124,9 @@ public class SingleTaskActivity extends BaseActivity { mCancel.setEnabled(false); setBtState(true); - //String path = Environment.getExternalStorageDirectory().getPath() + "/test.jpg"; - //Bitmap bm = BitmapFactory.decodeFile(path); - //mImg.setImageBitmap(bm); + String path = Environment.getExternalStorageDirectory().getPath() + "/test.jpg"; + Bitmap bm = BitmapFactory.decodeFile(path); + mImg.setImageBitmap(bm); break; } @@ -203,10 +203,10 @@ public class SingleTaskActivity extends BaseActivity { private void start() { Aria.whit(this) .load(DOWNLOAD_URL) - .setDownloadPath(Environment.getExternalStorageDirectory().getPath() + "/test.apk") - .setDownloadName("test.apk") - //.setDownloadPath(Environment.getExternalStorageDirectory().getPath() + "/test.jpg") - //.setDownloadName("test.jpg") + //.setDownloadPath(Environment.getExternalStorageDirectory().getPath() + "/test.apk") + //.setDownloadName("test.apk") + .setDownloadPath(Environment.getExternalStorageDirectory().getPath() + "/test.jpg") + .setDownloadName("test.jpg") .start(); }