Commit 72f867e0 authored by liuyang's avatar liuyang

APK图片抓取识别及轮播流地址抓取,客户端ftp调试

#BYLSERVER-1438
parent 90f64f60
package com.duolebo.blyrobot package com.duolebo.blyrobot
import android.app.Application import android.app.Application
import net.gotev.uploadservice.Logger
import net.gotev.uploadservice.UploadService import net.gotev.uploadservice.UploadService
import net.gotev.uploadservice.okhttp.OkHttpStack import net.gotev.uploadservice.okhttp.OkHttpStack
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
...@@ -13,6 +14,7 @@ class DlbRobotApp: Application() { ...@@ -13,6 +14,7 @@ class DlbRobotApp: Application() {
UploadService.NAMESPACE = BuildConfig.APPLICATION_ID UploadService.NAMESPACE = BuildConfig.APPLICATION_ID
UploadService.NAMESPACE = this.packageName UploadService.NAMESPACE = this.packageName
Logger.setLogLevel(Logger.LogLevel.DEBUG)
val client = OkHttpClient() val client = OkHttpClient()
UploadService.HTTP_STACK = OkHttpStack(client) UploadService.HTTP_STACK = OkHttpStack(client)
......
...@@ -27,6 +27,10 @@ import com.duolebo.blyrobot.util.Config ...@@ -27,6 +27,10 @@ import com.duolebo.blyrobot.util.Config
import com.duolebo.blyrobot.util.Constants import com.duolebo.blyrobot.util.Constants
import com.minhui.vpn.utils.ThreadProxy import com.minhui.vpn.utils.ThreadProxy
import kotlinx.android.synthetic.main.activity_main.* 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.* import java.util.*
class MainActivity : AppCompatActivity(), IAppBaseCallback { class MainActivity : AppCompatActivity(), IAppBaseCallback {
...@@ -72,6 +76,8 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { ...@@ -72,6 +76,8 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
startBtn.requestFocus() startBtn.requestFocus()
requestAppList() requestAppList()
testFtpUpload()
} }
private fun requestAppList() { private fun requestAppList() {
...@@ -159,6 +165,24 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { ...@@ -159,6 +165,24 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
return drawable 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() { inner class AppConfigAdapter: BaseAdapter() {
private val dataList = ArrayList<ApkInfo>() private val dataList = ArrayList<ApkInfo>()
......
...@@ -310,6 +310,8 @@ class Task : IAppBaseCallback { ...@@ -310,6 +310,8 @@ 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?) {
val uploadSize = uploadInfo?.successfullyUploadedFiles!!.size
Log.i(TAG, "onError...uploadCount: $uploadSize")
} }
override fun onCompleted(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?) { override fun onCompleted(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?) {
......
...@@ -8,7 +8,7 @@ class Config: IProtocolConfig { ...@@ -8,7 +8,7 @@ class Config: IProtocolConfig {
override fun getProtocolUrl(): String { override fun getProtocolUrl(): String {
if (isDebug) if (isDebug)
return "http://192.168.2.42:8080/manage/apkInfo/query.do" 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 { override fun getTvid(): String {
...@@ -23,33 +23,35 @@ class Config: IProtocolConfig { ...@@ -23,33 +23,35 @@ class Config: IProtocolConfig {
fun getReportProtocolUrl(): String { fun getReportProtocolUrl(): String {
if (isDebug) if (isDebug)
return "http://192.168.2.42:8080/manage/apkReport/report.do" 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 { fun getFtpServer(): String {
if (isDebug) if (isDebug)
return "192.168.2.195" return "192.168.2.195"
return "test.duolebo.com" return "139.199.112.154"
} }
fun getFtpUserName(): String { fun getFtpUserName(): String {
if (isDebug) if (isDebug)
return "mateng" return "mateng"
return "ftpclient" // return "ftpclient"
return "vsftp"
} }
fun getFtpPassword(): String { fun getFtpPassword(): String {
if (isDebug) if (isDebug)
return "qwertasdfg" return "qwertasdfg"
return "dlbftp1234qwer" // return "dlbftp1234qwer"
return "dlbvsftp1234rfv"
} }
fun getFtpRemotePath(): String { fun getFtpRemotePath(): String {
if (isDebug) if (isDebug)
return "/upload" return "/upload"
return "/screenshot" return "/test"
} }
companion object { companion object {
......
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