From 90f64f6016c9cf41abaf818bc9d16c6b511bf2ae Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Tue, 16 Oct 2018 11:42:32 +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?=E5=A2=9E=E5=8A=A0=E5=90=AF=E5=8A=A8=E5=90=8E=E6=8C=89=E9=94=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20#BYLSERVER-1438?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt | 4 ++++
 app/src/main/java/com/duolebo/blyrobot/data/Task.kt    | 5 +++++
 2 files changed, 9 insertions(+)

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 57d1fde..b605d84 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt
@@ -23,6 +23,8 @@ class ApkInfo: IModel {
     var launchDelay = 15
     // 频道抓取延时(秒)
     var captureDelay = 15
+    //启动后按键事件组合
+    var launchKeyEvent: String? = null
     // 切换频道按键事件组合
     lateinit var channelKeyEvent: String
     // 弹出界面菜单按键，默认确定键
@@ -34,6 +36,7 @@ class ApkInfo: IModel {
         this.launcher = json.optString(LAUNCHER)
         this.launchDelay = json.optInt(LAUNCH_DELAY, 15)
         this.captureDelay = json.optInt(CAPTURE_DELAY, 15)
+        this.launchKeyEvent = json.optString(LAUNCH_KEY_EVENT, "")
         this.channelCount = json.optInt(CHANNEL_COUNT, 5)
         this.channelKeyEvent = json.optString(CHANNEL_KEY_EVENT)
         this.mediaExt = json.optString(MEDIA_EXT, VIDEO_EXTS)
@@ -60,6 +63,7 @@ class ApkInfo: IModel {
         const val LAUNCHER = "launcher"
         const val LAUNCH_DELAY = "launchDelay"
         const val CAPTURE_DELAY = "captureDelay"
+        const val LAUNCH_KEY_EVENT = "launchKeyEvent"
         const val CHANNEL_KEY_EVENT = "channelKeyEvent"
         const val CHANNEL_COUNT = "channelCount"
         const val MEDIA_EXT = "mediaExt"
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 ffd25bd..bcf0135 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -146,6 +146,11 @@ class Task : IAppBaseCallback {
         // 启动2s开始抓取，避免第一个频道没有抓到
         capture(this.apkInfo.launchDelay + this.apkInfo.captureDelay)
         Thread.sleep(this.apkInfo.launchDelay * 1000L)
+
+        // 启动后按键事件模拟
+        if (!this.apkInfo.launchKeyEvent.isNullOrEmpty()) {
+            AdbUtil.sendMultiKey(this.apkInfo.launchKeyEvent!!)
+        }
     }
 
     private fun processChannels() {
-- 
2.21.0