diff --git a/app/build.gradle b/app/build.gradle index 6dfb1352e4cd26990c8d165aa9db6b5c80fd7450..7608b47d693e9dc1e2e70ffa0e81fb96dd9a52d6 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 ab0f0d55672880ee3992c1168f0d5904e16db812..0e86ab03775d9b40cdd62073e49637724dafa100 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 5d5af533b2eec9e1e6db9f873c8ab96c6db72bfe..1c615afe269376b3049cc194035f68a159a66bce 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 }