Skip to content
Permalink
Browse files

修复gradle 5.0 apt 失效的问题

  • Loading branch information...
AriaLyy committed Oct 18, 2019
1 parent 5504550 commit fb0b95bd075f40c274e6822ba777c61cba28d0d8
Showing with 19,970 additions and 254 deletions.
  1. +3 −1 AppFrame/build.gradle
  2. +4 −3 Aria/bintray-release.gradle
  3. +3 −9 Aria/build.gradle
  4. +28 −13 Aria/src/main/java/com/arialyy/aria/core/common/FtpOption.java
  5. +29 −0 Aria/src/main/java/com/arialyy/aria/core/common/HttpOption.java
  6. +2 −1 Aria/src/main/java/com/arialyy/aria/core/download/DownloadReceiver.java
  7. +1 −1 Aria/src/main/java/com/arialyy/aria/core/download/target/FtpBuilderTarget.java
  8. +1 −1 Aria/src/main/java/com/arialyy/aria/core/download/target/FtpDirBuilderTarget.java
  9. +1 −1 Aria/src/main/java/com/arialyy/aria/core/download/target/FtpDirNormalTarget.java
  10. +1 −1 Aria/src/main/java/com/arialyy/aria/core/download/target/FtpNormalTarget.java
  11. +0 −17 Aria/src/main/java/com/arialyy/aria/core/download/target/GroupBuilderTarget.java
  12. +0 −25 Aria/src/main/java/com/arialyy/aria/core/download/target/HttpBuilderTarget.java
  13. +1 −1 Aria/src/main/java/com/arialyy/aria/core/upload/UploadReceiver.java
  14. +1 −13 Aria/src/main/java/com/arialyy/aria/core/upload/target/FtpBuilderTarget.java
  15. +1 −1 Aria/src/main/java/com/arialyy/aria/core/upload/target/FtpNormalTarget.java
  16. +0 −9 Aria/src/main/java/com/arialyy/aria/core/upload/target/UNormalConfigHandler.java
  17. +4 −3 AriaAnnotations/bintray-release.gradle
  18. +4 −3 AriaCompiler/bintray-release.gradle
  19. +3 −2 AriaCompiler/build.gradle
  20. +13 −0 FtpComponent/bintray-release.gradle
  21. +3 −2 FtpComponent/build.gradle
  22. +287 −0 FtpComponent/src/main/java/aria/apache/commons/net/DatagramSocketClient.java
  23. +67 −0 FtpComponent/src/main/java/aria/apache/commons/net/DatagramSocketFactory.java
  24. +72 −0 FtpComponent/src/main/java/aria/apache/commons/net/DefaultDatagramSocketFactory.java
  25. +204 −0 FtpComponent/src/main/java/aria/apache/commons/net/DefaultSocketFactory.java
  26. +52 −0 FtpComponent/src/main/java/aria/apache/commons/net/MalformedServerReplyException.java
  27. +190 −0 FtpComponent/src/main/java/aria/apache/commons/net/PrintCommandListener.java
  28. +139 −0 FtpComponent/src/main/java/aria/apache/commons/net/ProtocolCommandEvent.java
  29. +58 −0 FtpComponent/src/main/java/aria/apache/commons/net/ProtocolCommandListener.java
  30. +123 −0 FtpComponent/src/main/java/aria/apache/commons/net/ProtocolCommandSupport.java
  31. +869 −0 FtpComponent/src/main/java/aria/apache/commons/net/SocketClient.java
  32. +34 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/Configurable.java
  33. +1,777 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTP.java
  34. +3,787 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPClient.java
  35. +713 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPClientConfig.java
  36. +75 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPCmd.java
  37. +170 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPCommand.java
  38. +52 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPConnectionClosedException.java
  39. +493 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPFile.java
  40. +129 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPFileEntryParser.java
  41. +72 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPFileEntryParserImpl.java
  42. +34 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPFileFilter.java
  43. +54 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPFileFilters.java
  44. +194 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPHTTPClient.java
  45. +311 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPListParseEngine.java
  46. +193 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPReply.java
  47. +931 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPSClient.java
  48. +52 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPSCommand.java
  49. +72 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPSServerSocketFactory.java
  50. +116 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPSSocketFactory.java
  51. +54 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPSTrustManager.java
  52. +33 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/OnFtpInputStreamListener.java
  53. +21 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/package-info.java
  54. +59 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
  55. +123 −0 ...omponent/src/main/java/aria/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
  56. +254 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
  57. +159 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
  58. +63 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/FTPFileEntryParserFactory.java
  59. +53 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/FTPTimestampParser.java
  60. +403 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
  61. +260 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/MLSxEntryParser.java
  62. +537 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
  63. +245 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
  64. +142 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/NTFTPEntryParser.java
  65. +175 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
  66. +127 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
  67. +399 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
  68. +60 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/ParserInitializationException.java
  69. +199 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
  70. +335 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
  71. +251 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
  72. +153 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
  73. +21 −0 FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/package-info.java
  74. +75 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/CRLFLineReader.java
  75. +111 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/CopyStreamAdapter.java
  76. +113 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/CopyStreamEvent.java
  77. +69 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/CopyStreamException.java
  78. +68 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/CopyStreamListener.java
  79. +238 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/DotTerminatedMessageReader.java
  80. +189 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/DotTerminatedMessageWriter.java
  81. +196 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/FromNetASCIIInputStream.java
  82. +150 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/FromNetASCIIOutputStream.java
  83. +64 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/SocketInputStream.java
  84. +80 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/SocketOutputStream.java
  85. +165 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/ToNetASCIIInputStream.java
  86. +105 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/ToNetASCIIOutputStream.java
  87. +351 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/Util.java
  88. +21 −0 FtpComponent/src/main/java/aria/apache/commons/net/io/package-info.java
  89. +1,056 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/Base64.java
  90. +53 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/Charsets.java
  91. +236 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/KeyManagerUtils.java
  92. +59 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/ListenerList.java
  93. +77 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/SSLContextUtils.java
  94. +68 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/SSLSocketUtils.java
  95. +395 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/SubnetUtils.java
  96. +113 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/TrustManagerUtils.java
  97. +21 −0 FtpComponent/src/main/java/aria/apache/commons/net/util/package-info.java
  98. +13 −0 HttpComponent/bintray-release.gradle
  99. +2 −0 HttpComponent/build.gradle
  100. +13 −0 M3U8Component/bintray-release.gradle
  101. +2 −0 M3U8Component/build.gradle
  102. +10 −0 NOTICE
  103. +13 −0 PublicComponent/bintray-release.gradle
  104. +2 −0 PublicComponent/build.gradle
  105. +14 −12 PublicComponent/src/main/java/com/arialyy/aria/core/AriaConfig.java
  106. +1 −0 PublicComponent/src/main/java/com/arialyy/aria/core/TaskOptionParams.java
  107. +34 −0 PublicComponent/src/main/java/com/arialyy/aria/core/common/ErrorCode.java
  108. +0 −13 PublicComponent/src/main/java/com/arialyy/aria/core/common/RecordHandler.java
  109. +0 −20 PublicComponent/src/main/java/com/arialyy/aria/core/processor/IFtpUploadInterceptor.java
  110. +12 −0 PublicComponent/src/main/java/com/arialyy/aria/core/wrapper/AbsTaskWrapper.java
  111. +5 −44 PublicComponent/src/main/java/com/arialyy/aria/util/CheckUtil.java
  112. +8 −11 app/build.gradle
  113. +12 −12 app/src/main/assets/aria_config.xml
  114. +161 −0 app/src/main/assets/aria_config_1.xml
  115. +7 −7 app/src/main/java/com/arialyy/simple/base/BaseApplication.java
  116. +0 −1 app/src/main/java/com/arialyy/simple/core/download/KotlinDownloadActivity.kt
  117. +3 −4 app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
  118. +21 −12 app/src/main/java/com/arialyy/simple/core/download/group/DownloadGroupActivity.java
  119. +0 −1 app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java
  120. +0 −1 app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDLoadActivity.java
  121. +9 −5 build.gradle
  122. +4 −3 gradle.properties
  123. +2 −1 gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,6 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -43,6 +45,6 @@ dependencies {

api 'androidx.lifecycle:lifecycle-runtime:2.0.0'
api 'androidx.lifecycle:lifecycle-extensions:2.0.0'
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'

}
@@ -1,10 +1,11 @@
apply plugin: 'com.novoda.bintray-release'
publish {
artifactId = 'aria-core'
// artifactId = 'aria-core'
// uploadName = 'AriaApi'
artifactId = 'core'
uploadName = 'Core'
userOrg = rootProject.ext.userOrg
groupId = rootProject.ext.groupId
// uploadName = rootProject.uploadName
uploadName = 'AriaApi'
publishVersion = rootProject.ext.publishVersion
desc = rootProject.ext.desc
website = rootProject.ext.website
@@ -20,19 +20,13 @@ android {
abortOnError false
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.12'
implementation "androidx.appcompat:appcompat:${rootProject.ext.XAppcompatVersion}"
api project(':AriaAnnotations')
api project(path: ':PublicComponent')

// api 'com.arialyy.aria:aria-ftp-plug:1.0.4'
implementation project(path: ':HttpComponent') // 打包时用这个

// compile project(':AriaFtpPlug')
// implementation project(path: ':AriaFtpComponent')

api project(path: ':HttpComponent')
}
apply from: 'bintray-release.gradle'

apply from: 'bintray-release.gradle'
@@ -18,7 +18,9 @@
import android.text.TextUtils;
import com.arialyy.aria.core.FtpUrlEntity;
import com.arialyy.aria.core.ProtocolType;
import com.arialyy.aria.core.processor.IFtpUploadInterceptor;
import com.arialyy.aria.util.ALog;
import com.arialyy.aria.util.CheckUtil;

/**
* Created by laoyuyu on 2018/3/9.
@@ -27,9 +29,10 @@

private String charSet, userName, password, account;
private boolean isNeedLogin = false;
private FtpUrlEntity ftpUrlEntity;
private FtpUrlEntity urlEntity;
private String protocol, keyAlias, storePass, storePath;
private boolean isImplicit = true;
private IFtpUploadInterceptor uploadInterceptor;

public FtpOption() {
super();
@@ -128,19 +131,31 @@ public FtpOption setImplicit(boolean isImplicit) {
return this;
}

public void setFtpUrlEntity(FtpUrlEntity ftpUrlEntity) {
this.ftpUrlEntity = ftpUrlEntity;
ftpUrlEntity.needLogin = isNeedLogin;
ftpUrlEntity.user = userName;
ftpUrlEntity.password = password;
ftpUrlEntity.account = account;
/**
* FTP文件上传拦截器,如果远端已有同名文件,可使用该拦截器控制覆盖文件或修改该文件上传到服务器端端文件名
*/
public FtpOption setUploadInterceptor(IFtpUploadInterceptor uploadInterceptor) {
if (uploadInterceptor == null) {
throw new NullPointerException("ftp拦截器为空");
}
CheckUtil.checkMemberClass(uploadInterceptor.getClass());
this.uploadInterceptor = uploadInterceptor;
return this;
}

public void setUrlEntity(FtpUrlEntity urlEntity) {
this.urlEntity = urlEntity;
urlEntity.needLogin = isNeedLogin;
urlEntity.user = userName;
urlEntity.password = password;
urlEntity.account = account;
if (!TextUtils.isEmpty(storePath)) {
ftpUrlEntity.isFtps = true;
ftpUrlEntity.protocol = protocol;
ftpUrlEntity.keyAlias = keyAlias;
ftpUrlEntity.storePass = storePass;
ftpUrlEntity.storePath = storePath;
ftpUrlEntity.isImplicit = isImplicit;
urlEntity.isFtps = true;
urlEntity.protocol = protocol;
urlEntity.keyAlias = keyAlias;
urlEntity.storePass = storePass;
urlEntity.storePath = storePath;
urlEntity.isImplicit = isImplicit;
}
}
}
@@ -18,8 +18,12 @@
import android.text.TextUtils;
import androidx.annotation.CheckResult;
import androidx.annotation.NonNull;
import com.arialyy.aria.core.download.target.HttpBuilderTarget;
import com.arialyy.aria.core.inf.IOptionConstant;
import com.arialyy.aria.core.inf.Suggest;
import com.arialyy.aria.core.processor.IHttpFileLenAdapter;
import com.arialyy.aria.util.ALog;
import com.arialyy.aria.util.CheckUtil;
import java.net.Proxy;
import java.util.HashMap;
import java.util.Map;
@@ -34,6 +38,8 @@
private RequestEnum requestEnum = RequestEnum.GET;
private Map<String, String> formFields;
private Proxy proxy;
private boolean useServerFileName = false;
private IHttpFileLenAdapter fileLenAdapter;

public HttpOption() {
super();
@@ -131,4 +137,27 @@ public HttpOption setUrlProxy(Proxy proxy) {
this.proxy = proxy;
return this;
}

/**
* 是否使用服务器通过content-disposition传递的文件名,内容格式{@code attachment;filename=***}
* 如果获取不到服务器文件名,则使用用户设置的文件名
*
* @param use {@code true} 使用
*/
public HttpOption useServerFileName(boolean use) {
this.useServerFileName = use;
return this;
}

/**
* 如果你需要使用header中特定的key来设置文件长度,或有定制文件长度的需要,那么你可以通过该方法自行处理文件长度
*/
public HttpOption setFileLenAdapter(IHttpFileLenAdapter fileLenAdapter) {
if (fileLenAdapter == null) {
throw new IllegalArgumentException("adapter为空");
}
CheckUtil.checkMemberClass(fileLenAdapter.getClass());
this.fileLenAdapter = fileLenAdapter;
return this;
}
}
@@ -22,6 +22,7 @@
import com.arialyy.aria.core.command.CancelAllCmd;
import com.arialyy.aria.core.command.NormalCmdFactory;
import com.arialyy.aria.core.common.AbsBuilderTarget;
import com.arialyy.aria.core.common.ErrorCode;
import com.arialyy.aria.core.common.ProxyHelper;
import com.arialyy.aria.core.download.target.DTargetFactory;
import com.arialyy.aria.core.download.target.FtpBuilderTarget;
@@ -193,7 +194,7 @@ public void register() {
}
}
} else {
ALog.w(TAG, "没有Aria的注解方法");
ALog.e(TAG, "没有Aria的注解方法");
}
}

@@ -44,7 +44,7 @@ public FtpBuilderTarget option(FtpOption option) {
if (option == null) {
throw new NullPointerException("ftp 任务配置为空");
}
option.setFtpUrlEntity(CommonUtil.getFtpUrlInfo(mConfigHandler.getUrl()));
option.setUrlEntity(CommonUtil.getFtpUrlInfo(mConfigHandler.getUrl()));
getTaskWrapper().getOptionParams().setParams(option);
return this;
}
@@ -78,7 +78,7 @@ public FtpDirBuilderTarget option(FtpOption option) {
if (option == null) {
throw new NullPointerException("ftp 任务配置为空");
}
option.setFtpUrlEntity(CommonUtil.getFtpUrlInfo(url));
option.setUrlEntity(CommonUtil.getFtpUrlInfo(url));
getTaskWrapper().getOptionParams().setParams(option);
return this;
}
@@ -74,7 +74,7 @@ public FtpDirNormalTarget option(FtpOption option) {
if (option == null) {
throw new NullPointerException("ftp 任务配置为空");
}
option.setFtpUrlEntity(CommonUtil.getFtpUrlInfo(getEntity().getKey()));
option.setUrlEntity(CommonUtil.getFtpUrlInfo(getEntity().getKey()));
getTaskWrapper().getOptionParams().setParams(option);
return this;
}
@@ -44,7 +44,7 @@ public FtpNormalTarget option(FtpOption option) {
if (option == null) {
throw new NullPointerException("ftp 任务配置为空");
}
option.setFtpUrlEntity(CommonUtil.getFtpUrlInfo(getEntity().getUrl()));
option.setUrlEntity(CommonUtil.getFtpUrlInfo(getEntity().getUrl()));
getTaskWrapper().getOptionParams().setParams(option);
return this;
}
@@ -19,13 +19,10 @@
import com.arialyy.aria.core.common.AbsBuilderTarget;
import com.arialyy.aria.core.common.HttpOption;
import com.arialyy.aria.core.download.DGTaskWrapper;
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;

/**
@@ -146,18 +143,4 @@ public GroupBuilderTarget setDirPath(String dirPath) {
public GroupBuilderTarget setSubFileName(List<String> subTaskFileName) {
return mConfigHandler.setSubFileName(subTaskFileName);
}

/**
* 如果你需要使用header中特定的key来设置文件长度,或有定制文件长度的需要,那么你可以通过该方法自行处理文件长度
*/
@CheckResult(suggest = Suggest.TASK_CONTROLLER)
public GroupBuilderTarget setFileLenAdapter(IHttpFileLenAdapter adapter) {

if (adapter == null) {
throw new IllegalArgumentException("adapter为空");
}
CheckUtil.checkMemberClass(adapter.getClass());
getTaskWrapper().getOptionParams().setObjs(IOptionConstant.fileLenAdapter, adapter);
return this;
}
}
@@ -72,18 +72,6 @@ public HttpBuilderTarget option(HttpOption option) {
return this;
}

/**
* 是否使用服务器通过content-disposition传递的文件名,内容格式{@code attachment;filename=***}
* 如果获取不到服务器文件名,则使用用户设置的文件名
*
* @param use {@code true} 使用
*/
@CheckResult(suggest = Suggest.TASK_CONTROLLER)
public HttpBuilderTarget useServerFileName(boolean use) {
getTaskWrapper().getOptionParams().setParams(IOptionConstant.useServerFileName, use);
return this;
}

/**
* 设置文件存储路径,如果需要修改新的文件名,修改路径便可。
* 如:原文件路径 /mnt/sdcard/test.zip
@@ -111,17 +99,4 @@ public HttpBuilderTarget setFilePath(@NonNull String filePath, boolean forceDown
mConfigHandler.setForceDownload(forceDownload);
return this;
}

/**
* 如果你需要使用header中特定的key来设置文件长度,或有定制文件长度的需要,那么你可以通过该方法自行处理文件长度
*/
@CheckResult(suggest = Suggest.TASK_CONTROLLER)
public HttpBuilderTarget setFileLenAdapter(IHttpFileLenAdapter adapter) {
if (adapter == null) {
throw new IllegalArgumentException("adapter为空");
}
CheckUtil.checkMemberClass(adapter.getClass());
getTaskWrapper().getOptionParams().setObjs(IOptionConstant.fileLenAdapter, adapter);
return this;
}
}
@@ -270,7 +270,7 @@ public void register() {
}
}
} else {
ALog.i(TAG, "没有Aria的注解方法");
ALog.e(TAG, "没有Aria的注解方法");
}
}

@@ -16,13 +16,10 @@
package com.arialyy.aria.core.upload.target;

import androidx.annotation.CheckResult;
import androidx.annotation.NonNull;
import com.arialyy.aria.core.common.AbsBuilderTarget;
import com.arialyy.aria.core.common.FtpOption;
import com.arialyy.aria.core.inf.Suggest;
import com.arialyy.aria.core.processor.IFtpUploadInterceptor;
import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
import com.arialyy.aria.util.CheckUtil;
import com.arialyy.aria.util.CommonUtil;

/**
@@ -51,15 +48,6 @@ public FtpBuilderTarget setUploadUrl(String tempUrl) {
return this;
}

/**
* FTP文件上传拦截器,如果远端已有同名文件,可使用该拦截器控制覆盖文件或修改该文件上传到服务器端端的文件名
*/
@CheckResult(suggest = Suggest.TASK_CONTROLLER)
public FtpBuilderTarget setUploadInterceptor(@NonNull IFtpUploadInterceptor uploadInterceptor) {
CheckUtil.checkMemberClass(uploadInterceptor.getClass());
return mConfigHandler.setUploadInterceptor(uploadInterceptor);
}

/**
* 设置登陆、字符串编码、ftps等参数
*/
@@ -68,7 +56,7 @@ public FtpBuilderTarget option(FtpOption option) {
if (option == null) {
throw new NullPointerException("ftp 任务配置为空");
}
option.setFtpUrlEntity(CommonUtil.getFtpUrlInfo(url));
option.setUrlEntity(CommonUtil.getFtpUrlInfo(url));
getTaskWrapper().getOptionParams().setParams(option);
return this;
}
@@ -43,7 +43,7 @@ public FtpNormalTarget option(FtpOption option) {
if (option == null) {
throw new NullPointerException("ftp 任务配置为空");
}
option.setFtpUrlEntity(CommonUtil.getFtpUrlInfo(getEntity().getUrl()));
option.setUrlEntity(CommonUtil.getFtpUrlInfo(getEntity().getUrl()));
getTaskWrapper().getOptionParams().setParams(option);
return this;
}
@@ -62,15 +62,6 @@ void setFilePath(String filePath) {
mEntity.setFileSize(file.length());
}

TARGET setUploadInterceptor(IFtpUploadInterceptor uploadInterceptor) {
if (uploadInterceptor == null) {
throw new NullPointerException("ftp拦截器为空");
}
getTaskWrapper().getOptionParams()
.setObjs(IOptionConstant.uploadInterceptor, uploadInterceptor);
return mTarget;
}

@Override public AbsEntity getEntity() {
return mEntity;
}
@@ -1,10 +1,11 @@
apply plugin: 'com.novoda.bintray-release'
publish {
artifactId = 'aria-annotations'
// artifactId = 'aria-annotations'
// uploadName = 'AriaAnnotations'
artifactId = 'annotations'
uploadName = 'Annotations'
userOrg = rootProject.ext.userOrg
groupId = rootProject.ext.groupId
// uploadName = rootProject.uploadName
uploadName = 'AriaAnnotations'
publishVersion = rootProject.ext.publishVersion
desc = rootProject.ext.desc
website = rootProject.ext.website
@@ -1,10 +1,11 @@
apply plugin: 'com.novoda.bintray-release'
publish {
artifactId = 'aria-compiler'
// artifactId = 'aria-compiler'
// uploadName = 'AriaCompiler'
artifactId = 'compiler'
uploadName = 'Compiler'
userOrg = rootProject.ext.userOrg
groupId = rootProject.ext.groupId
// uploadName = rootProject.uploadName
uploadName = 'AriaCompiler'
publishVersion = rootProject.ext.publishVersion
desc = rootProject.ext.desc
website = rootProject.ext.website

0 comments on commit fb0b95b

Please sign in to comment.
You can’t perform that action at this time.