From 179ae5e637280a7757cd78012b1493800299db4b Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Fri, 16 Nov 2018 17:43:39 +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

---
 app/build.gradle                                    |  2 +-
 .../main/java/com/duolebo/blyrobot/data/ApkInfo.kt  | 13 ++++++++++++-
 app/src/main/java/com/duolebo/blyrobot/data/Task.kt |  5 ++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a3de348..9393f8a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 22
         versionCode 15
-        versionName "1.2.25"
+        versionName "1.3.30"
     }
 
     signingConfigs {
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 b159b9b..ed86c30 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt
@@ -30,6 +30,9 @@ class ApkInfo: IModel {
     // 弹出界面菜单按键，默认确定键
     lateinit var menuKeyEvent: String
 
+    // epg是否需要按返回键，因为有些apk的epg显示时间过长
+    var epgBack = false
+
     var monitoring = true
 
     override fun from(json: JSONObject): Boolean {
@@ -40,7 +43,15 @@ 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)
+
+        var channelKeyEvent = json.optString(CHANNEL_KEY_EVENT)
+        // 如果包含百分号则epg需要按返回键
+        if (!channelKeyEvent.isNullOrEmpty() && channelKeyEvent.contains('%')) {
+            this.epgBack = true
+            channelKeyEvent = channelKeyEvent.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")
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 b9c5127..6a80375 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -275,7 +275,10 @@ class Task : Thread, IAppBaseCallback {
         val absOkName = this.imagePath + "/${this.apkInfo.packageName}_${channelIndex}_${time}_ok"
         screenShot(absOkName)
         screenImages.add("$absOkName.jpg")
-        AdbUtil.sendMultiKey("back")
+
+        // 对于一些epg弹出时间过长的应用，模拟点击一次返回键，比如电视家3.0
+        if (this.apkInfo.epgBack)
+            AdbUtil.sendMultiKey("back")
 
         if (screenImages.size > 0)
             uploadImages.addAll(screenImages)
-- 
2.21.0