From 05ae7ce09916a9734e5e024f78e8594d5fb90138 Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Sun, 18 Nov 2018 23:29:00 +0800
Subject: [PATCH] =?UTF-8?q?APK=E6=8A=93=E5=8C=85>=E4=BB=8E=E9=A2=91?=
 =?UTF-8?q?=E9=81=931=E5=BC=80=E5=A7=8B=E4=BE=9D=E6=AC=A1=E6=8A=93?=
 =?UTF-8?q?=E5=8F=96,=20=E4=B8=80=E4=BA=9Bepg=E6=98=BE=E7=A4=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BF=87=E9=95=BF=E7=9A=84=E5=BA=94=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E8=BF=94=E5=9B=9E=E9=94=AE=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=20#BYLSERVER-1693?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/duolebo/blyrobot/data/ApkInfo.kt   | 17 ++++++++---------
 .../main/java/com/duolebo/blyrobot/data/Task.kt |  6 ++++--
 2 files changed, 12 insertions(+), 11 deletions(-)

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 ed86c30..0fb5d06 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt
@@ -43,19 +43,18 @@ class ApkInfo: IModel {
         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, "down")
+        this.mediaExt = json.optString(MEDIA_EXT, VIDEO_EXTS)
+        this.filterUrl = json.optString(FILTER_URL, "")
+        this.monitoring = json.optBoolean(MONITORING, true)
 
-        var channelKeyEvent = json.optString(CHANNEL_KEY_EVENT)
+        var menuKeyEvent = json.optString(MENU_KEY_EVENT)
         // 如果包含百分号则epg需要按返回键
-        if (!channelKeyEvent.isNullOrEmpty() && channelKeyEvent.contains('%')) {
+        if (!menuKeyEvent.isNullOrEmpty() && menuKeyEvent.contains('%')) {
             this.epgBack = true
-            channelKeyEvent = channelKeyEvent.replace("%", "")
+            menuKeyEvent = menuKeyEvent.replace("%", "")
         }
-        this.channelKeyEvent = channelKeyEvent
-
-        this.mediaExt = json.optString(MEDIA_EXT, VIDEO_EXTS)
-        this.filterUrl = json.optString(FILTER_URL, "")
-        this.menuKeyEvent = json.optString(MENU_KEY_EVENT, "ok")
-        this.monitoring = json.optBoolean(MONITORING, true)
+        this.menuKeyEvent = menuKeyEvent
 
         return true
     }
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 6a80375..f57a454 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -195,12 +195,14 @@ class Task : Thread, IAppBaseCallback {
         AdbUtil.launchApp("${this.apkInfo.packageName}/${this.apkInfo.launcher}")
         // 启动立即抓取，避免第一个频道没有抓到
         capture(this.apkInfo.captureDelay, false)
-        Thread.sleep(this.apkInfo.launchDelay * 1000L)
+        sleepBySeconds(this.apkInfo.launchDelay)
 
         // 启动后按键事件模拟
         if (!this.apkInfo.launchKeyEvent.isNullOrEmpty()) {
             AdbUtil.sendMultiKey(this.apkInfo.launchKeyEvent!!)
         }
+
+        sleepBySeconds(this.apkInfo.captureDelay)
     }
 
     /**
@@ -209,8 +211,8 @@ class Task : Thread, IAppBaseCallback {
      */
     private fun processChannels(index: Int): Boolean {
         Log.i(TAG, "processChannels")
-        processChannelItem()
         quitCapture()
+        processChannelItem()
 
         for (i in index + 1 until this.apkInfo.channelCount) {
 
-- 
2.21.0