diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/BaseDelegate.java b/Aria/src/main/java/com/arialyy/aria/core/common/BaseOption.java similarity index 93% rename from Aria/src/main/java/com/arialyy/aria/core/common/BaseDelegate.java rename to Aria/src/main/java/com/arialyy/aria/core/common/BaseOption.java index 439f0a40..c3858bfa 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/common/BaseDelegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/common/BaseOption.java @@ -23,12 +23,12 @@ import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.wrapper.AbsTaskWrapper; import com.arialyy.aria.util.CommonUtil; -public abstract class BaseDelegate { +public abstract class BaseOption { protected final String TAG; protected TARGET mTarget; protected AbsTaskWrapper mWrapper; - public BaseDelegate(TARGET target, AbsTaskWrapper wrapper) { + public BaseOption(TARGET target, AbsTaskWrapper wrapper) { TAG = CommonUtil.getClassName(getClass()); mTarget = target; mWrapper = wrapper; diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/FTPSDelegate.java b/Aria/src/main/java/com/arialyy/aria/core/common/FTPSDelegate.java index 1197c370..6660f84c 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/common/FTPSDelegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/common/FTPSDelegate.java @@ -28,7 +28,7 @@ import com.arialyy.aria.util.ALog; /** * D_FTP SSL/TSL 参数委托 */ -public class FTPSDelegate extends BaseDelegate { +public class FTPSDelegate extends BaseOption { private FtpUrlEntity mUrlEntity; diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/FtpDelegate.java b/Aria/src/main/java/com/arialyy/aria/core/common/FtpDelegate.java index be681bd2..11c181ed 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/common/FtpDelegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/common/FtpDelegate.java @@ -28,7 +28,7 @@ import com.arialyy.aria.util.ALog; /** * Created by laoyuyu on 2018/3/9. */ -public class FtpDelegate extends BaseDelegate { +public class FtpDelegate extends BaseOption { private static final String TAG = "FtpDelegate"; public FtpDelegate(TARGET target, AbsTaskWrapper wrapper) { diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/HttpDelegate.java b/Aria/src/main/java/com/arialyy/aria/core/common/HttpDelegate.java index 8e0d2505..a9288aa0 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/common/HttpDelegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/common/HttpDelegate.java @@ -18,19 +18,19 @@ package com.arialyy.aria.core.common; import android.text.TextUtils; import androidx.annotation.CheckResult; import androidx.annotation.NonNull; -import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.inf.AbsTarget; -import com.arialyy.aria.core.wrapper.AbsTaskWrapper; import com.arialyy.aria.core.inf.IOptionConstant; +import com.arialyy.aria.core.inf.Suggest; +import com.arialyy.aria.core.wrapper.AbsTaskWrapper; import com.arialyy.aria.util.ALog; import java.net.Proxy; import java.util.HashMap; import java.util.Map; /** - * HTTP协议处理 + * HTTP任务设置 */ -public class HttpDelegate extends BaseDelegate { +public class HttpDelegate extends BaseOption { private Map params; private Map headers; diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8Delegate.java b/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8Delegate.java index 348cc805..7693ea16 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8Delegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8Delegate.java @@ -16,7 +16,7 @@ package com.arialyy.aria.core.download.m3u8; import androidx.annotation.CheckResult; -import com.arialyy.aria.core.common.BaseDelegate; +import com.arialyy.aria.core.common.BaseOption; import com.arialyy.aria.core.download.DTaskWrapper; import com.arialyy.aria.core.inf.AbsTarget; import com.arialyy.aria.core.inf.IOptionConstant; @@ -25,12 +25,13 @@ import com.arialyy.aria.core.processor.IBandWidthUrlConverter; import com.arialyy.aria.core.processor.ITsMergeHandler; import com.arialyy.aria.core.processor.IVodTsUrlConverter; import com.arialyy.aria.core.wrapper.AbsTaskWrapper; +import com.arialyy.aria.util.CheckUtil; import com.arialyy.aria.util.ComponentUtil; /** * m3u8 委托 */ -public class M3U8Delegate extends BaseDelegate { +public class M3U8Delegate extends BaseOption { private DTaskWrapper mTaskWrapper; public M3U8Delegate(TARGET target, AbsTaskWrapper wrapper) { @@ -67,6 +68,7 @@ public class M3U8Delegate extends BaseDelegate */ @CheckResult(suggest = Suggest.TO_CONTROLLER) public M3U8Delegate setMergeHandler(ITsMergeHandler handler) { + CheckUtil.checkMemberClass(handler.getClass()); mTaskWrapper.getM3U8Params().setObjs(IOptionConstant.mergeHandler, handler); return this; } @@ -79,6 +81,7 @@ public class M3U8Delegate extends BaseDelegate */ @CheckResult(suggest = Suggest.TO_CONTROLLER) public M3U8Delegate setTsUrlConvert(IVodTsUrlConverter converter) { + CheckUtil.checkMemberClass(converter.getClass()); mTaskWrapper.getM3U8Params().setObjs(IOptionConstant.vodUrlConverter, converter); return this; } @@ -102,6 +105,7 @@ public class M3U8Delegate extends BaseDelegate */ @CheckResult(suggest = Suggest.TO_CONTROLLER) public M3U8Delegate setBandWidthUrlConverter(IBandWidthUrlConverter converter) { + CheckUtil.checkMemberClass(converter.getClass()); mTaskWrapper.getM3U8Params().setObjs(IOptionConstant.bandWidthUrlConverter, converter); return this; } diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8LiveDelegate.java b/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8LiveDelegate.java index 70acc618..a8417898 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8LiveDelegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8LiveDelegate.java @@ -16,19 +16,20 @@ package com.arialyy.aria.core.download.m3u8; import androidx.annotation.CheckResult; -import com.arialyy.aria.core.common.BaseDelegate; -import com.arialyy.aria.core.processor.ILiveTsUrlConverter; -import com.arialyy.aria.core.inf.Suggest; +import com.arialyy.aria.core.common.BaseOption; import com.arialyy.aria.core.download.DTaskWrapper; import com.arialyy.aria.core.inf.AbsTarget; -import com.arialyy.aria.core.wrapper.AbsTaskWrapper; import com.arialyy.aria.core.inf.IOptionConstant; +import com.arialyy.aria.core.inf.Suggest; +import com.arialyy.aria.core.processor.ILiveTsUrlConverter; +import com.arialyy.aria.core.wrapper.AbsTaskWrapper; import com.arialyy.aria.util.ALog; +import com.arialyy.aria.util.CheckUtil; /** * m3u8直播参数设置 */ -public class M3U8LiveDelegate extends BaseDelegate { +public class M3U8LiveDelegate extends BaseOption { M3U8LiveDelegate(TARGET target, AbsTaskWrapper wrapper) { super(target, wrapper); @@ -43,6 +44,7 @@ public class M3U8LiveDelegate extends BaseDelegate setLiveTsUrlConvert(ILiveTsUrlConverter converter) { + CheckUtil.checkMemberClass(converter.getClass()); ((DTaskWrapper) getTaskWrapper()).getM3U8Params() .setObjs(IOptionConstant.liveTsUrlConverter, converter); return this; diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8VodDelegate.java b/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8VodDelegate.java index b0c9e880..b1fca565 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8VodDelegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8VodDelegate.java @@ -16,7 +16,7 @@ package com.arialyy.aria.core.download.m3u8; import androidx.annotation.CheckResult; -import com.arialyy.aria.core.common.BaseDelegate; +import com.arialyy.aria.core.common.BaseOption; import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.download.DTaskWrapper; import com.arialyy.aria.core.event.EventMsgUtil; @@ -30,7 +30,7 @@ import com.arialyy.aria.util.ALog; /** * m3u8点播文件参数设置 */ -public class M3U8VodDelegate extends BaseDelegate { +public class M3U8VodDelegate extends BaseOption { private DTaskWrapper mTaskWrapper; M3U8VodDelegate(TARGET target, AbsTaskWrapper wrapper) { diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/target/GroupBuilderTarget.java b/Aria/src/main/java/com/arialyy/aria/core/download/target/GroupBuilderTarget.java index b44f37a4..0bd189ca 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/target/GroupBuilderTarget.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/target/GroupBuilderTarget.java @@ -17,14 +17,15 @@ package com.arialyy.aria.core.download.target; import androidx.annotation.CheckResult; import com.arialyy.aria.core.common.AbsBuilderTarget; -import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.common.HttpDelegate; import com.arialyy.aria.core.download.DGTaskWrapper; -import com.arialyy.aria.core.processor.IHttpFileLenAdapter; import com.arialyy.aria.core.inf.IOptionConstant; +import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.manager.SubTaskManager; +import com.arialyy.aria.core.processor.IHttpFileLenAdapter; import com.arialyy.aria.core.wrapper.ITaskWrapper; import com.arialyy.aria.util.ALog; +import com.arialyy.aria.util.CheckUtil; import java.util.List; /** @@ -151,6 +152,7 @@ public class GroupBuilderTarget extends AbsBuilderTarget { if (adapter == null) { throw new IllegalArgumentException("adapter为空"); } + CheckUtil.checkMemberClass(adapter.getClass()); getTaskWrapper().getOptionParams().setObjs(IOptionConstant.fileLenAdapter, adapter); return this; } diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/target/HttpBuilderTarget.java b/Aria/src/main/java/com/arialyy/aria/core/download/target/HttpBuilderTarget.java index 556244b1..ff3a81ef 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/target/HttpBuilderTarget.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/target/HttpBuilderTarget.java @@ -24,6 +24,7 @@ import com.arialyy.aria.core.processor.IHttpFileLenAdapter; import com.arialyy.aria.core.inf.IOptionConstant; import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.wrapper.ITaskWrapper; +import com.arialyy.aria.util.CheckUtil; public class HttpBuilderTarget extends AbsBuilderTarget { @@ -95,7 +96,7 @@ public class HttpBuilderTarget extends AbsBuilderTarget { if (adapter == null) { throw new IllegalArgumentException("adapter为空"); } - + CheckUtil.checkMemberClass(adapter.getClass()); getTaskWrapper().getOptionParams().setObjs(IOptionConstant.fileLenAdapter, adapter); return this; } diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpDelegate.java b/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpDelegate.java index 6bbc83c0..f77632ef 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpDelegate.java +++ b/Aria/src/main/java/com/arialyy/aria/core/download/tcp/TcpDelegate.java @@ -17,7 +17,7 @@ package com.arialyy.aria.core.download.tcp; import android.text.TextUtils; import androidx.annotation.CheckResult; -import com.arialyy.aria.core.common.BaseDelegate; +import com.arialyy.aria.core.common.BaseOption; import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.inf.AbsTarget; import com.arialyy.aria.core.wrapper.AbsTaskWrapper; @@ -28,7 +28,7 @@ import java.nio.charset.Charset; * @Author aria * @Date 2019-09-06 */ -public class TcpDelegate extends BaseDelegate { +public class TcpDelegate extends BaseOption { private TcpTaskConfig mTcpConfig; diff --git a/Aria/src/main/java/com/arialyy/aria/core/upload/target/FtpBuilderTarget.java b/Aria/src/main/java/com/arialyy/aria/core/upload/target/FtpBuilderTarget.java index 5dd3d981..e9c1119e 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/upload/target/FtpBuilderTarget.java +++ b/Aria/src/main/java/com/arialyy/aria/core/upload/target/FtpBuilderTarget.java @@ -22,6 +22,7 @@ import com.arialyy.aria.core.common.AbsBuilderTarget; import com.arialyy.aria.core.common.FtpDelegate; import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.wrapper.AbsTaskWrapper; +import com.arialyy.aria.util.CheckUtil; /** * Created by Aria.Lao on 2017/7/27. @@ -52,6 +53,7 @@ public class FtpBuilderTarget extends AbsBuilderTarget { */ @CheckResult(suggest = Suggest.TASK_CONTROLLER) public FtpBuilderTarget setUploadInterceptor(@NonNull IFtpUploadInterceptor uploadInterceptor) { + CheckUtil.checkMemberClass(uploadInterceptor.getClass()); return mConfigHandler.setUploadInterceptor(uploadInterceptor); } diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java b/HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java index be15e5ac..9db99f17 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java @@ -27,7 +27,7 @@ import com.arialyy.aria.http.HttpTaskOption; * @Date 2019-09-19 */ public class HttpULoaderUtil extends AbsNormalLoaderUtil { - protected HttpULoaderUtil(AbsTaskWrapper wrapper, IEventListener listener) { + public HttpULoaderUtil(AbsTaskWrapper wrapper, IEventListener listener) { super(wrapper, listener); wrapper.generateTaskOption(HttpTaskOption.class); } diff --git a/PublicComponent/src/main/java/com/arialyy/aria/util/CheckUtil.java b/PublicComponent/src/main/java/com/arialyy/aria/util/CheckUtil.java index 345c6560..8e786b6a 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/util/CheckUtil.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/util/CheckUtil.java @@ -19,11 +19,11 @@ package com.arialyy.aria.util; import android.text.TextUtils; import com.arialyy.aria.core.download.DTaskWrapper; import com.arialyy.aria.core.download.DownloadEntity; -import com.arialyy.aria.core.wrapper.AbsTaskWrapper; import com.arialyy.aria.core.upload.UTaskWrapper; import com.arialyy.aria.core.upload.UploadEntity; -import com.arialyy.aria.exception.ParamException; +import com.arialyy.aria.core.wrapper.AbsTaskWrapper; import java.io.File; +import java.lang.reflect.Modifier; import java.util.List; /** @@ -34,26 +34,15 @@ public class CheckUtil { private static final String TAG = "CheckUtil"; /** - * 检查ftp上传路径,如果ftp上传路径为空,抛出空指针异常 - * 如果ftp上传路径不是以"ftp"或"sftp",抛出参数异常 - * - * @param ftpUrl ftp上传路径 + * 检查成员类是否是静态和public */ - public static void checkFtpUploadUrl(String ftpUrl) { - if (TextUtils.isEmpty(ftpUrl)) { - throw new ParamException("ftp上传路径为空"); - } else if (!ftpUrl.startsWith("ftp") || !ftpUrl.startsWith("sftp")) { - throw new ParamException("ftp上传路径无效"); + public static void checkMemberClass(Class clazz) { + int modifiers = clazz.getModifiers(); + if (!clazz.isMemberClass() || !Modifier.isStatic(modifiers) || Modifier.isPrivate(modifiers)) { + ALog.e(TAG, "为了放置内存泄漏,请使用静态的成员类(public static class xxx)或文件类(A.java)"); } } - /** - * 判空 - */ - public static void checkNull(Object obj) { - if (obj == null) throw new IllegalArgumentException("不能传入空对象"); - } - /** * 检查分页数据,需要查询的页数,从1开始,如果page小于1 或 num 小于1,则抛出{@link NullPointerException} * @@ -64,15 +53,6 @@ public class CheckUtil { if (page < 1 || num < 1) throw new NullPointerException("page和num不能小于1"); } - /** - * 检查下载实体 - */ - public static void checkDownloadEntity(DownloadEntity entity) { - checkUrlInvalidThrow(entity.getUrl()); - entity.setUrl(entity.getUrl()); - checkPath(entity.getDownloadPath()); - } - /** * 检测下载链接是否为null */ @@ -150,15 +130,6 @@ public class CheckUtil { } } - /** - * 检查下载任务组保存路径 - */ - public static void checkDownloadPaths(List paths) { - if (paths == null || paths.isEmpty()) { - throw new IllegalArgumentException("链接保存路径不能为null"); - } - } - /** * 检测上传地址是否为null */ diff --git a/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java b/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java index 88ec8680..5f35c7ad 100644 --- a/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java +++ b/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java @@ -31,11 +31,11 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; -import com.arialyy.aria.core.processor.IHttpFileLenAdapter; import com.arialyy.aria.core.common.controller.ControllerType; import com.arialyy.aria.core.download.DownloadEntity; import com.arialyy.aria.core.inf.IEntity; import com.arialyy.aria.core.listener.ISchedulers; +import com.arialyy.aria.core.processor.IHttpFileLenAdapter; import com.arialyy.aria.core.task.DownloadTask; import com.arialyy.aria.util.ALog; import com.arialyy.aria.util.CommonUtil; @@ -291,18 +291,7 @@ public class SingleTaskActivity extends BaseActivity { .load(mUrl) .useServerFileName(true) .setFilePath(mFilePath, true) - .setFileLenAdapter(new IHttpFileLenAdapter() { - @Override public long handleFileLen(Map> headers) { - - List sLength = headers.get("Content-Length"); - if (sLength == null || sLength.isEmpty()) { - return -1; - } - String temp = sLength.get(0); - - return Long.parseLong(temp); - } - }) + .setFileLenAdapter(new FileLenAdapter()) .option() .addHeader("1", "@") .controller(ControllerType.CREATE_CONTROLLER) @@ -327,4 +316,17 @@ public class SingleTaskActivity extends BaseActivity { mModule.updateFilePath(this, String.valueOf(data)); } } + + static class FileLenAdapter implements IHttpFileLenAdapter { + @Override public long handleFileLen(Map> headers) { + + List sLength = headers.get("Content-Length"); + if (sLength == null || sLength.isEmpty()) { + return -1; + } + String temp = sLength.get(0); + + return Long.parseLong(temp); + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java index 0488f5bd..e9020c41 100644 --- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java +++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java @@ -212,27 +212,28 @@ public class M3U8LiveDLoadActivity extends BaseActivity public void onClick(View view) { switch (view.getId()) { case R.id.start: - if (!AppUtil.chekEntityValid(mEntity)) { - startD(); - break; - } - if (Aria.download(this).load(mEntity.getId()).isRunning()) { - Aria.download(this).load(mEntity.getId()).stop(); - } else { - Aria.download(this).load(mEntity.getId()) - .asM3U8() - .asLive() - .setLiveTsUrlConvert(new ILiveTsUrlConverter() { - @Override public String convert(String m3u8Url, String tsUrl) { - int index = m3u8Url.lastIndexOf("/"); - String parentUrl = m3u8Url.substring(0, index + 1); - return parentUrl + tsUrl; - } - }) - .controller(ControllerType.TASK_CONTROLLER) - .resume(); - } - break; + startD(); + //if (!AppUtil.chekEntityValid(mEntity)) { + // startD(); + // break; + //} + //if (Aria.download(this).load(mEntity.getId()).isRunning()) { + // Aria.download(this).load(mEntity.getId()).stop(); + //} else { + // Aria.download(this).load(mEntity.getId()) + // .asM3U8() + // .asLive() + // .setLiveTsUrlConvert(new ILiveTsUrlConverter() { + // @Override public String convert(String m3u8Url, String tsUrl) { + // int index = m3u8Url.lastIndexOf("/"); + // String parentUrl = m3u8Url.substring(0, index + 1); + // return parentUrl + tsUrl; + // } + // }) + // .controller(ControllerType.TASK_CONTROLLER) + // .resume(); + //} + //break; case R.id.cancel: if (AppUtil.chekEntityValid(mEntity)) { Aria.download(this).load(mEntity.getId()).cancel(true); @@ -254,13 +255,7 @@ public class M3U8LiveDLoadActivity extends BaseActivity // } //}) .asLive() - .setLiveTsUrlConvert(new ILiveTsUrlConverter() { - @Override public String convert(String m3u8Url, String tsUrl) { - int index = m3u8Url.lastIndexOf("/"); - String parentUrl = m3u8Url.substring(0, index + 1); - return parentUrl + tsUrl; - } - }) + .setLiveTsUrlConvert(new LiveTsUrlConverter()) .controller(ControllerType.CREATE_CONTROLLER) //.setLiveTsUrlConvert(new IVodTsUrlConverter() { // @Override public List convert(String m3u8Url, List tsUrls) { @@ -285,4 +280,12 @@ public class M3U8LiveDLoadActivity extends BaseActivity mModule.updateFilePath(this, String.valueOf(data)); } } + + static class LiveTsUrlConverter implements ILiveTsUrlConverter { + @Override public String convert(String m3u8Url, String tsUrl) { + int index = m3u8Url.lastIndexOf("/"); + String parentUrl = m3u8Url.substring(0, index + 1); + return parentUrl + tsUrl; + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/arialyy/simple/core/upload/HttpUploadActivity.java b/app/src/main/java/com/arialyy/simple/core/upload/HttpUploadActivity.java index 49eb0a00..a4bd69bb 100644 --- a/app/src/main/java/com/arialyy/simple/core/upload/HttpUploadActivity.java +++ b/app/src/main/java/com/arialyy/simple/core/upload/HttpUploadActivity.java @@ -17,13 +17,14 @@ package com.arialyy.simple.core.upload; import android.os.Bundle; +import android.os.Environment; import android.view.View; import com.arialyy.annotations.Upload; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.common.RequestEnum; import com.arialyy.aria.core.common.controller.ControllerType; -import com.arialyy.aria.core.upload.UploadEntity; import com.arialyy.aria.core.task.UploadTask; +import com.arialyy.aria.core.upload.UploadEntity; import com.arialyy.frame.util.FileUtil; import com.arialyy.frame.util.show.L; import com.arialyy.simple.R; @@ -40,7 +41,9 @@ public class HttpUploadActivity extends BaseActivity { private static final String TAG = "HttpUploadActivity"; HorizontalProgressBarWithNumber mPb; - private final String FILE_PATH = "/mnt/sdcard/ggsg14.apk"; + //private final String FILE_PATH = "/mnt/sdcard/ggsg14.apk"; + private final String FILE_PATH = + Environment.getExternalStorageDirectory().getPath() + "/Download/PaNTFS15562.zip"; private UploadEntity mEntity; @Override protected int setLayoutId() { diff --git a/py/upload.py b/py/upload.py index 884b337e..eda21a2c 100644 --- a/py/upload.py +++ b/py/upload.py @@ -6,7 +6,7 @@ from werkzeug import secure_filename ALLOWED_EXTENSIONS = set(['png', 'jpg', 'jpeg', 'gif', 'rar', 'apk']) app = Flask(__name__) -app.config['UPLOAD_FOLDER'] = 'd:/db/' +app.config['UPLOAD_FOLDER'] = '/Users/aria/temp/test/' app.config['MAX_CONTENT_LENGTH'] = 1600 * 1024 * 1024 """