diff --git a/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt b/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt index c2b8faf7ac41fdeb123cda278f358ffef0b8b105..57d1fde2c98572abbe54f39e255818a8bd903d90 100644 --- a/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt +++ b/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt @@ -6,6 +6,7 @@ import org.json.JSONArray import org.json.JSONObject class ApkInfo: IModel { + lateinit var name: String //包名 lateinit var packageName: String //启动apk配置信息 @@ -28,6 +29,7 @@ class ApkInfo: IModel { lateinit var menuKeyEvent: String override fun from(json: JSONObject): Boolean { + this.name = json.optString(NAME) this.packageName = json.optString(PACKAGE_NAME) this.launcher = json.optString(LAUNCHER) this.launchDelay = json.optInt(LAUNCH_DELAY, 15) @@ -53,6 +55,7 @@ class ApkInfo: IModel { const val VIDEO_EXTS = "m3u8|.ts|.mp4|.rmvb|.mkv|.wmv" //data key + const val NAME = "name" const val PACKAGE_NAME = "packageName" const val LAUNCHER = "launcher" const val LAUNCH_DELAY = "launchDelay" 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 179c05410eb147136172c7055255a1601ca4941c..4ded089fb6989c1bf3fd06caaded5e8d131e4d97 100644 --- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt +++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt @@ -64,9 +64,13 @@ class Task : IAppBaseCallback { fun start() { this.reportJson = JSONObject() + // 启动应用 this.launchApp() + // 频道轮询处理 this.processChannels() + // 上传图片 this.uploadImage() + // 上报服务器 this.report() } @@ -278,7 +282,7 @@ class Task : IAppBaseCallback { } private fun report() { - reportProtocol.execute(dataHandler) + reportProtocol.withBody(reportJson.toString()).execute(dataHandler) } override fun onProtocolFailed(p0: IProtocol?) { diff --git a/app/src/main/java/com/duolebo/blyrobot/protocol/ApkReportProtocol.kt b/app/src/main/java/com/duolebo/blyrobot/protocol/ApkReportProtocol.kt index ccb21b57e0d5c3d97a5e54733f14f7c485cb2a53..f48a39892e09667581db727385182bf6f3a9a4c2 100644 --- a/app/src/main/java/com/duolebo/blyrobot/protocol/ApkReportProtocol.kt +++ b/app/src/main/java/com/duolebo/blyrobot/protocol/ApkReportProtocol.kt @@ -6,15 +6,26 @@ import com.duolebo.appbase.prj.bmtv.protocol.IProtocolConfig import com.duolebo.appbase.prj.bmtv.protocol.ProtocolBase import com.duolebo.blyrobot.data.ApkReportData import com.duolebo.blyrobot.util.Config +import java.lang.StringBuilder class ApkReportProtocol(context: Context?, config: IProtocolConfig?) : ProtocolBase(context, config) { val model = ApkReportData() + var body = "" + + fun withBody(body: String): ApkReportProtocol { + this.body = body + return this + } override fun prepareProtocolBody(p0: MutableMap?) { } + override fun prepareHttpBody(): ByteArray { + return body.toByteArray() + } + override fun getData(): IModel { return model } diff --git a/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt b/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt new file mode 100644 index 0000000000000000000000000000000000000000..3cb899ad6928cc9eb5bfdb26b1106e8c3ed7e595 --- /dev/null +++ b/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt @@ -0,0 +1,20 @@ +package com.duolebo.blyrobot.ui + +import android.content.Context +import android.view.LayoutInflater +import android.widget.RelativeLayout +import com.duolebo.blyrobot.R +import com.duolebo.blyrobot.data.ApkInfo +import kotlinx.android.synthetic.main.app_config_item.view.* + +class AppConfigListItem(context: Context?) : RelativeLayout(context) { + + init { + LayoutInflater.from(context).inflate(R.layout.app_config_item, this) + } + + fun setData(apkInfo: ApkInfo) { + this.appName.text = apkInfo.name + this.packageName.text = apkInfo.packageName + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9387ace759a60e3f92d5f31b931acdb4153efcd5..23ea9c5f8da11e57e958adc4269110a9c165a991 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,10 +6,12 @@ android:layout_width="match_parent"> + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:orientation="horizontal">