From e23a4d928d1e0c986ab83e2e71c1b4efef589e28 Mon Sep 17 00:00:00 2001 From: AriaLyy <511455842@qq.com> Date: Wed, 31 May 2017 23:10:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BF=BD=E7=95=A5cache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 13ca9b55115b3e98575a032fb3a127949c42aaec Mon Sep 17 00:00:00 2001 From: AriaLyy <511455842@qq.com> Date: Thu, 1 Jun 2017 10:56:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 22 ------------ .idea/copyright/profiles_settings.xml | 3 -- .idea/gradle.xml | 19 ---------- .idea/misc.xml | 36 ------------------- .idea/modules.xml | 12 ------- .idea/runConfigurations.xml | 12 ------- Aria/build.gradle | 6 ++-- .../arialyy/aria/core/queue/AbsTaskQueue.java | 2 +- .../aria/core/queue/UploadTaskQueue.java | 5 +-- .../arialyy/simple/upload/UploadActivity.java | 2 +- 10 files changed, 8 insertions(+), 111 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43ef..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 11a6f2e3..00000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index d2e67251..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 5f6de159..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460d..00000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ 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(); }