Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
优化AbsThreadTask代码, 新增文件长度处理功能 https://github.com/AriaLyy/Aria/issues/393
- Loading branch information
Showing
33 changed files
with
2,740 additions
and
2,663 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
257 changes: 135 additions & 122 deletions
257
Aria/src/main/java/com/arialyy/aria/core/common/AbsThreadTask.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
207 changes: 103 additions & 104 deletions
207
Aria/src/main/java/com/arialyy/aria/core/common/http/HttpDelegate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,104 +1,103 @@ | ||
| /* | ||
| * Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.arialyy.aria.core.common.http; | ||
|
|
||
| import android.text.TextUtils; | ||
| import com.arialyy.aria.core.download.DGTaskWrapper; | ||
| import com.arialyy.aria.core.download.DTaskWrapper; | ||
| import com.arialyy.aria.core.download.DownloadGroupTarget; | ||
| import com.arialyy.aria.core.inf.AbsTarget; | ||
| import com.arialyy.aria.core.inf.ITargetHandler; | ||
| import com.arialyy.aria.util.ALog; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * HTTP参数委托 | ||
| * @param <TARGET> | ||
| */ | ||
| class HttpDelegate<TARGET extends AbsTarget> implements ITargetHandler { | ||
| private static final String TAG = "PostDelegate"; | ||
| TARGET mTarget; | ||
|
|
||
| HttpDelegate(TARGET target) { | ||
| mTarget = target; | ||
| } | ||
|
|
||
| public TARGET setParams(Map<String, String> params) { | ||
| mTarget.getTaskWrapper().asHttp().setParams(params); | ||
| if (mTarget instanceof DownloadGroupTarget) { | ||
| for (DTaskWrapper subTask : ((DGTaskWrapper) mTarget.getTaskWrapper()).getSubTaskWrapper()) { | ||
| subTask.asHttp().setParams(params); | ||
| } | ||
| } | ||
| return mTarget; | ||
| } | ||
|
|
||
| public TARGET setParam(String key, String value) { | ||
| if (TextUtils.isEmpty(key) || TextUtils.isEmpty(value)) { | ||
| ALog.d(TAG, "key 或value 为空"); | ||
| return mTarget; | ||
| } | ||
| Map<String, String> params = mTarget.getTaskWrapper().asHttp().getParams(); | ||
| if (params == null) { | ||
| params = new HashMap<>(); | ||
| mTarget.getTaskWrapper().asHttp().setParams(params); | ||
| } | ||
| params.put(key, value); | ||
| if (mTarget instanceof DownloadGroupTarget) { | ||
| for (DTaskWrapper subTask : ((DGTaskWrapper) mTarget.getTaskWrapper()).getSubTaskWrapper()) { | ||
| subTask.asHttp().setParams(params); | ||
| } | ||
| } | ||
| return mTarget; | ||
| } | ||
|
|
||
| @Override public void add() { | ||
| mTarget.add(); | ||
| } | ||
|
|
||
| @Override public void start() { | ||
| mTarget.start(); | ||
| } | ||
|
|
||
| @Override public void stop() { | ||
| mTarget.stop(); | ||
| } | ||
|
|
||
| @Override public void resume() { | ||
| mTarget.resume(); | ||
| } | ||
|
|
||
| @Override public void cancel() { | ||
| mTarget.cancel(); | ||
| } | ||
|
|
||
| @Override public void save() { | ||
| mTarget.save(); | ||
| } | ||
|
|
||
| @Override public void cancel(boolean removeFile) { | ||
| mTarget.cancel(removeFile); | ||
| } | ||
|
|
||
| @Override public void reTry() { | ||
| mTarget.reTry(); | ||
| } | ||
|
|
||
| @Override public void reStart() { | ||
| mTarget.reStart(); | ||
| } | ||
| } | ||
| /* | ||
| * Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.arialyy.aria.core.common.http; | ||
|
|
||
| import android.text.TextUtils; | ||
| import com.arialyy.aria.core.download.DGTaskWrapper; | ||
| import com.arialyy.aria.core.download.DTaskWrapper; | ||
| import com.arialyy.aria.core.download.DownloadGroupTarget; | ||
| import com.arialyy.aria.core.inf.AbsTarget; | ||
| import com.arialyy.aria.core.inf.ITargetHandler; | ||
| import com.arialyy.aria.util.ALog; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * HTTP参数委托 | ||
| */ | ||
| class HttpDelegate<TARGET extends AbsTarget> implements ITargetHandler { | ||
| private static final String TAG = "PostDelegate"; | ||
| TARGET mTarget; | ||
|
|
||
| HttpDelegate(TARGET target) { | ||
| mTarget = target; | ||
| } | ||
|
|
||
| public TARGET setParams(Map<String, String> params) { | ||
| mTarget.getTaskWrapper().asHttp().setParams(params); | ||
| if (mTarget instanceof DownloadGroupTarget) { | ||
| for (DTaskWrapper subTask : ((DGTaskWrapper) mTarget.getTaskWrapper()).getSubTaskWrapper()) { | ||
| subTask.asHttp().setParams(params); | ||
| } | ||
| } | ||
| return mTarget; | ||
| } | ||
|
|
||
| public TARGET setParam(String key, String value) { | ||
| if (TextUtils.isEmpty(key) || TextUtils.isEmpty(value)) { | ||
| ALog.d(TAG, "key 或value 为空"); | ||
| return mTarget; | ||
| } | ||
| Map<String, String> params = mTarget.getTaskWrapper().asHttp().getParams(); | ||
| if (params == null) { | ||
| params = new HashMap<>(); | ||
| mTarget.getTaskWrapper().asHttp().setParams(params); | ||
| } | ||
| params.put(key, value); | ||
| if (mTarget instanceof DownloadGroupTarget) { | ||
| for (DTaskWrapper subTask : ((DGTaskWrapper) mTarget.getTaskWrapper()).getSubTaskWrapper()) { | ||
| subTask.asHttp().setParams(params); | ||
| } | ||
| } | ||
| return mTarget; | ||
| } | ||
|
|
||
| @Override public void add() { | ||
| mTarget.add(); | ||
| } | ||
|
|
||
| @Override public void start() { | ||
| mTarget.start(); | ||
| } | ||
|
|
||
| @Override public void stop() { | ||
| mTarget.stop(); | ||
| } | ||
|
|
||
| @Override public void resume() { | ||
| mTarget.resume(); | ||
| } | ||
|
|
||
| @Override public void cancel() { | ||
| mTarget.cancel(); | ||
| } | ||
|
|
||
| @Override public void save() { | ||
| mTarget.save(); | ||
| } | ||
|
|
||
| @Override public void cancel(boolean removeFile) { | ||
| mTarget.cancel(removeFile); | ||
| } | ||
|
|
||
| @Override public void reTry() { | ||
| mTarget.reTry(); | ||
| } | ||
|
|
||
| @Override public void reStart() { | ||
| mTarget.reStart(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.