diff --git a/.gitignore b/.gitignore index 0a7d0a5d..2f961d9e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ .idea/misc.xml .gradle /.idea -.idea \ No newline at end of file +.idea +/cache \ No newline at end of file diff --git a/Aria/build.gradle b/Aria/build.gradle index 4f351abc..1e811256 100644 --- a/Aria/build.gradle +++ b/Aria/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 9 targetSdkVersion 23 - versionCode 312 - versionName "3.1.2" + versionCode 313 + versionName "3.1.3" } buildTypes { release { @@ -23,4 +23,4 @@ dependencies { testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.1.1' } -//apply from: 'jcenter.gradle' +apply from: 'jcenter.gradle' diff --git a/Aria/src/main/java/com/arialyy/aria/core/queue/AbsTaskQueue.java b/Aria/src/main/java/com/arialyy/aria/core/queue/AbsTaskQueue.java index bdccfe9c..15c10575 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/queue/AbsTaskQueue.java +++ b/Aria/src/main/java/com/arialyy/aria/core/queue/AbsTaskQueue.java @@ -31,7 +31,7 @@ abstract class AbsTaskQueue { private final String TAG = "AbsTaskQueue"; CachePool mCachePool = new CachePool<>(); - ExecutePool mExecutePool = null; + ExecutePool mExecutePool; /** * 获取任务执行池 diff --git a/Aria/src/main/java/com/arialyy/aria/core/queue/UploadTaskQueue.java b/Aria/src/main/java/com/arialyy/aria/core/queue/UploadTaskQueue.java index 2430782e..21513f72 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/queue/UploadTaskQueue.java +++ b/Aria/src/main/java/com/arialyy/aria/core/queue/UploadTaskQueue.java @@ -32,7 +32,6 @@ public class UploadTaskQueue extends AbsTaskQueue mExecutePool = new ExecutePool<>(false); public static UploadTaskQueue getInstance() { if (INSTANCE == null) { @@ -43,6 +42,9 @@ public class UploadTaskQueue extends AbsTaskQueue(false); + } @Override public void setMaxTaskNum(int newMaxNum) { @@ -74,5 +76,4 @@ public class UploadTaskQueue extends AbsTaskQueue { @OnClick(R.id.upload) void upload() { Aria.upload(this) .load(FILE_PATH) - .setUploadUrl("http://172.18.104.50:8080/upload/sign_file") + .setUploadUrl("http://172.18.104.228:8080/upload/sign_file") .setAttachment("file") .start(); }