diff --git a/app/build.gradle b/app/build.gradle index a3de34852425b52e42c35327019d958fcef7980b..9393f8a27b1e040e28575fa518a1d42e5ffdc12e 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 b159b9b0b04f2dffd8a654e1c09ad47f8e6bd050..ed86c3095f55a22c0e77f123a7e0e9c3e10739dd 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 b9c5127afe258797b7033d39537c76b6766dcf4b..6a80375707ab721ae8429e7c04e41328c2c76234 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)