From 3eb63bdadbbc991874cc2b9c8f842e19fd2f7b6c Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Thu, 18 Oct 2018 10:06:19 +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=8Capk=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=20#BYLSERVER-1438?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                   | 14 ++++++++++++--
 .../main/java/com/duolebo/blyrobot/data/Task.kt    | 14 ++++++++++++--
 .../com/duolebo/blyrobot/ui/AppConfigListItem.kt   |  6 +++++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6dfb135..7608b47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,14 +2,18 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
+static def releaseTime() {
+    return new Date().format("yyyyMMdd", TimeZone.getTimeZone("UTC"))
+}
+
 android {
     compileSdkVersion 27
     defaultConfig {
         applicationId "com.duolebo.bylrobot"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 1
-        versionName "1.1"
+        versionCode 10
+        versionName "1.2"
     }
 
     signingConfigs {
@@ -26,6 +30,12 @@ android {
             minifyEnabled false
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            applicationVariants.all { variant ->
+                variant.outputs.all {
+                    outputFileName = "dlbrebot_v${defaultConfig.versionName}_${releaseTime()}.apk"
+                }
+            }
         }
     }
 }
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 ab0f0d5..0e86ab0 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -86,6 +86,16 @@ class Task : IAppBaseCallback {
         this.prepareReport()
         // 启动应用
         this.launchApp()
+
+//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+//            if (!AdbUtil.isAppActive(this.apkInfo.packageName)) {
+//                Log.i(TAG, "Launch app failed")
+//                // 退出应用
+//                AdbUtil.stopApp(this.apkInfo.packageName)
+//                finish(false)
+//                return
+//            }
+//        }
         // 频道轮询处理
         try {
             this.processChannels()
@@ -237,11 +247,11 @@ class Task : IAppBaseCallback {
                 val host = it.substring(start)
                 val url = "http://$host$partUrl"
 
-                var add = true
+                var add = false
                 // 如果筛选url不为空，这里需要进行过滤
                 if (!this.apkInfo.filterUrl.isNullOrEmpty()) {
                     if (url.contains(this.apkInfo.filterUrl))
-                        add = false
+                        add = true
                 }
 
                 if (add) {
diff --git a/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt b/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt
index 5d5af53..1c615af 100644
--- a/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.widget.RelativeLayout
 import com.duolebo.blyrobot.R
 import com.duolebo.blyrobot.data.ApkInfo
+import com.duolebo.blyrobot.util.AppUtil
 import kotlinx.android.synthetic.main.app_config_item.view.*
 
 class AppConfigListItem(context: Context?) : RelativeLayout(context) {
@@ -15,7 +16,10 @@ class AppConfigListItem(context: Context?) : RelativeLayout(context) {
     }
 
     fun setData(apkInfo: ApkInfo) {
-        this.appName.text = apkInfo.name
+        var installTips = ""
+        if (!AppUtil.isAppInstalled(context, apkInfo.packageName))
+            installTips = "(未安装)"
+        this.appName.text = apkInfo.name + installTips
         this.packageName.text = apkInfo.packageName
     }
 
-- 
2.21.0