From 72f867e06b618aabeb6d09d3d8a5d89b26f31219 Mon Sep 17 00:00:00 2001 From: liuyang Date: Tue, 16 Oct 2018 23:15:30 +0800 Subject: [PATCH] =?UTF-8?q?APK=E5=9B=BE=E7=89=87=E6=8A=93=E5=8F=96?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=8A=E8=BD=AE=E6=92=AD=E6=B5=81=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=8A=93=E5=8F=96=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?ftp=E8=B0=83=E8=AF=95=20#BYLSERVER-1438?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/duolebo/blyrobot/DlbRobotApp.kt | 2 ++ .../java/com/duolebo/blyrobot/MainActivity.kt | 24 +++++++++++++++++++ .../java/com/duolebo/blyrobot/data/Task.kt | 2 ++ .../java/com/duolebo/blyrobot/util/Config.kt | 14 ++++++----- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/duolebo/blyrobot/DlbRobotApp.kt b/app/src/main/java/com/duolebo/blyrobot/DlbRobotApp.kt index 44716e9..ed0f774 100644 --- a/app/src/main/java/com/duolebo/blyrobot/DlbRobotApp.kt +++ b/app/src/main/java/com/duolebo/blyrobot/DlbRobotApp.kt @@ -1,6 +1,7 @@ package com.duolebo.blyrobot import android.app.Application +import net.gotev.uploadservice.Logger import net.gotev.uploadservice.UploadService import net.gotev.uploadservice.okhttp.OkHttpStack import okhttp3.OkHttpClient @@ -13,6 +14,7 @@ class DlbRobotApp: Application() { UploadService.NAMESPACE = BuildConfig.APPLICATION_ID UploadService.NAMESPACE = this.packageName + Logger.setLogLevel(Logger.LogLevel.DEBUG) val client = OkHttpClient() UploadService.HTTP_STACK = OkHttpStack(client) diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt index e119364..ad3a01b 100644 --- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt +++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt @@ -27,6 +27,10 @@ import com.duolebo.blyrobot.util.Config import com.duolebo.blyrobot.util.Constants import com.minhui.vpn.utils.ThreadProxy import kotlinx.android.synthetic.main.activity_main.* +import net.gotev.uploadservice.UploadNotificationConfig +import net.gotev.uploadservice.ftp.FTPUploadRequest +import net.gotev.uploadservice.ftp.UnixPermissions +import java.io.File import java.util.* class MainActivity : AppCompatActivity(), IAppBaseCallback { @@ -72,6 +76,8 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { startBtn.requestFocus() requestAppList() + + testFtpUpload() } private fun requestAppList() { @@ -159,6 +165,24 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { return drawable } + fun testFtpUpload() { + try { + val uploadRequest = FTPUploadRequest(this, Config.instance.getFtpServer(), 21) + .setUsernameAndPassword(Config.instance.getFtpUserName(), Config.instance.getFtpPassword()) + .setNotificationConfig(UploadNotificationConfig()) + .setCreatedDirectoriesPermissions(UnixPermissions("777")) + .setMaxRetries(4) + + val uploadFile = File("/sdcard/shumei.txt") + uploadRequest.addFileToUpload(uploadFile.absolutePath, Config.instance.getFtpRemotePath() + "/" + uploadFile.name) + + val uploadId = uploadRequest.startUpload() + Log.i(TAG, "upload id $uploadId") + } catch (exc: Exception) { + Log.e(TAG, exc.message, exc) + } + } + inner class AppConfigAdapter: BaseAdapter() { private val dataList = ArrayList() diff --git a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt index bcf0135..97be1ce 100644 --- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt +++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt @@ -310,6 +310,8 @@ class Task : IAppBaseCallback { } override fun onError(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?, exception: java.lang.Exception?) { + val uploadSize = uploadInfo?.successfullyUploadedFiles!!.size + Log.i(TAG, "onError...uploadCount: $uploadSize") } override fun onCompleted(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?) { diff --git a/app/src/main/java/com/duolebo/blyrobot/util/Config.kt b/app/src/main/java/com/duolebo/blyrobot/util/Config.kt index bc7e6a5..878bf10 100644 --- a/app/src/main/java/com/duolebo/blyrobot/util/Config.kt +++ b/app/src/main/java/com/duolebo/blyrobot/util/Config.kt @@ -8,7 +8,7 @@ class Config: IProtocolConfig { override fun getProtocolUrl(): String { if (isDebug) return "http://192.168.2.42:8080/manage/apkInfo/query.do" - return "http://test.duolebo.com/staging/apkInfo/query.do" + return "http://test.duolebo.com:8091/staging/apkInfo/query.do" } override fun getTvid(): String { @@ -23,33 +23,35 @@ class Config: IProtocolConfig { fun getReportProtocolUrl(): String { if (isDebug) return "http://192.168.2.42:8080/manage/apkReport/report.do" - return "http://test.duolebo.com/staging/apkReport/report.do" + return "http://test.duolebo.com:8091/staging/apkReport/report.do" } fun getFtpServer(): String { if (isDebug) return "192.168.2.195" - return "test.duolebo.com" + return "139.199.112.154" } fun getFtpUserName(): String { if (isDebug) return "mateng" - return "ftpclient" +// return "ftpclient" + return "vsftp" } fun getFtpPassword(): String { if (isDebug) return "qwertasdfg" - return "dlbftp1234qwer" +// return "dlbftp1234qwer" + return "dlbvsftp1234rfv" } fun getFtpRemotePath(): String { if (isDebug) return "/upload" - return "/screenshot" + return "/test" } companion object { -- 2.21.0