Commit 8b7715a1 authored by liuyang's avatar liuyang

APK图片抓取识别及轮播流地址抓取,客户端上报修改

#BYLSERVER-1438
parent 03719142
...@@ -295,7 +295,7 @@ class Task : IAppBaseCallback { ...@@ -295,7 +295,7 @@ class Task : IAppBaseCallback {
override fun onError(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?, exception: java.lang.Exception?) { override fun onError(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?, exception: java.lang.Exception?) {
Log.i(TAG, "upload error uploadCount: $uploadCount " + uploadInfo?.toString()) Log.i(TAG, "upload error uploadCount: $uploadCount " + uploadInfo?.toString())
uploadCount++ uploadCount++
if (uploadCount == totalUpload) { if (uploadCount == totalUpload - 1) {
uploadComplete(uploadCount - uploadInfo?.successfullyUploadedFiles!!.size) uploadComplete(uploadCount - uploadInfo?.successfullyUploadedFiles!!.size)
} }
} }
...@@ -303,7 +303,7 @@ class Task : IAppBaseCallback { ...@@ -303,7 +303,7 @@ class Task : IAppBaseCallback {
override fun onCompleted(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?) { override fun onCompleted(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?) {
Log.i(TAG, "onCompleted...uploadCount: $uploadCount") Log.i(TAG, "onCompleted...uploadCount: $uploadCount")
uploadCount++ uploadCount++
if (uploadCount == totalUpload) { if (uploadCount == totalUpload - 1) {
uploadComplete(uploadCount - uploadInfo?.successfullyUploadedFiles!!.size) uploadComplete(uploadCount - uploadInfo?.successfullyUploadedFiles!!.size)
} }
} }
...@@ -325,7 +325,7 @@ class Task : IAppBaseCallback { ...@@ -325,7 +325,7 @@ class Task : IAppBaseCallback {
this.uploadImages.forEach { this.uploadImages.forEach {
val uploadFile = File(it) val uploadFile = File(it)
if (uploadFile.exists()) { if (uploadFile.exists()) {
uploadRequest.addFileToUpload(it, Config.instance.getFtpRemotePath()) uploadRequest.addFileToUpload(it, Config.instance.getFtpRemotePath() + "/" + uploadFile.name)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment