diff --git a/DEV_LOG.md b/DEV_LOG.md index 2d90f30c..6d6cae72 100644 --- a/DEV_LOG.md +++ b/DEV_LOG.md @@ -1,4 +1,6 @@ ## 开发日志 + + v_3.8.2 + - fix bug https://github.com/AriaLyy/Aria/issues/573 + v_3.8.1 (2019/12/22) - 修复一个表创建失败的问题 https://github.com/AriaLyy/Aria/issues/570 - 修复一个非分块模式下导致下载失败的问题 https://github.com/AriaLyy/Aria/issues/571 diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/HttpRecordAdapter.java b/HttpComponent/src/main/java/com/arialyy/aria/http/HttpRecordAdapter.java index 1dbba97b..3d313171 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/HttpRecordAdapter.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/HttpRecordAdapter.java @@ -38,9 +38,6 @@ public class HttpRecordAdapter extends AbsRecordHandlerAdapter { @Override public void onPre() { super.onPre(); - if (getWrapper().getRequestType() == ITaskWrapper.U_HTTP) { - RecordUtil.delTaskRecord(getEntity().getFilePath(), IRecordHandler.TYPE_UPLOAD); - } } @Override public void handlerTaskRecord(TaskRecord record) { diff --git a/PublicComponent/src/main/java/com/arialyy/aria/orm/DelegateFind.java b/PublicComponent/src/main/java/com/arialyy/aria/orm/DelegateFind.java index 21f2af4f..55dbfffc 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/orm/DelegateFind.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/orm/DelegateFind.java @@ -422,13 +422,19 @@ class DelegateFind extends AbsDelegate { private List exeNormalDataSql(SQLiteDatabase db, Class clazz, String sql, String[] selectionArgs) { SqlUtil.checkTable(db, clazz); - String[] temp = new String[selectionArgs.length]; - int i = 0; - for (String arg : selectionArgs) { - temp[i] = SqlUtil.encodeStr(arg); - i++; + Cursor cursor; + if (selectionArgs != null) { + + String[] temp = new String[selectionArgs.length]; + int i = 0; + for (String arg : selectionArgs) { + temp[i] = SqlUtil.encodeStr(arg); + i++; + } + cursor = db.rawQuery(sql, temp); + } else { + cursor = db.rawQuery(sql, null); } - Cursor cursor = db.rawQuery(sql, temp); List data = cursor.getCount() > 0 ? newInstanceEntity(clazz, cursor) : null; closeCursor(cursor); return data; diff --git a/PublicComponent/src/main/java/com/arialyy/aria/util/ComponentUtil.java b/PublicComponent/src/main/java/com/arialyy/aria/util/ComponentUtil.java index 75d9a2a0..5ea85006 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/util/ComponentUtil.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/util/ComponentUtil.java @@ -28,7 +28,6 @@ import java.lang.ref.SoftReference; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Proxy; import java.util.List; /** diff --git a/README.md b/README.md index bed787dc..3cc991f4 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,8 @@ protected void onCreate(Bundle savedInstanceState) { ### [文档地址](https://aria.laoyuyu.me/aria_doc/) +### QQ群:524329160 + ### 版本日志 + v_3.8.1 (2019/12/22) 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 4f6082a9..944a8c8c 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 @@ -43,7 +43,7 @@ public class HttpUploadActivity extends BaseActivity { //private final String FILE_PATH = "/mnt/sdcard/ggsg14.apk"; private final String FILE_PATH = - Environment.getExternalStorageDirectory().getPath() + "/Download/PaNTFS15562.zip"; + Environment.getExternalStorageDirectory().getPath() + "/Download/QQMusic-import-1.2.1.zip"; private UploadEntity mEntity; @Override protected int setLayoutId() { @@ -53,6 +53,7 @@ public class HttpUploadActivity extends BaseActivity { @Override protected void init(Bundle savedInstanceState) { setTile("D_HTTP 上传"); super.init(savedInstanceState); + Aria.upload(this).getTaskList(); mEntity = Aria.upload(this).getFirstUploadEntity(FILE_PATH); @@ -81,7 +82,7 @@ public class HttpUploadActivity extends BaseActivity { .setParam("params", "bbbbbbbb"); Aria.upload(HttpUploadActivity.this).load(FILE_PATH) //.setUploadUrl("http://lib-test.xzxyun.com:8042/Api/upload?data={\"type\":\"1\",\"fileType\":\".apk\"}") - .setUploadUrl("http://9.9.9.205:5000/upload/") + .setUploadUrl("http://9.9.12.210:5000/upload/") //.setTempUrl("http://192.168.1.6:8080/upload/sign_file/").setAttachment("file") //.addHeader("iplanetdirectorypro", "11a09102fb934ad0bc206f9c611d7933") .option(option)