diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt index 69f08a83fb2c97c94fa1c7795b87e5878c740c8b..53098002fe9f7608b9e17d4a80efac91bcef0255 100644 --- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt +++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt @@ -139,7 +139,7 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { this.appInfoAdapter.notifyDataSetChanged() for (apkInfo in appInfoData.apkInfos) { - if (AppUtil.isAppInstalled(this, apkInfo.packageName)) { + if (apkInfo.monitoring && AppUtil.isAppInstalled(this, apkInfo.packageName)) { val task = Task(this.applicationContext) task.from(apkInfo) TaskManager.instance.add(task) 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 37ed3d8128717e97db27af5367d65dbb030a4345..b159b9b0b04f2dffd8a654e1c09ad47f8e6bd050 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,8 @@ class ApkInfo: IModel { // 弹出界面菜单按键,默认确定键 lateinit var menuKeyEvent: String + var monitoring = true + override fun from(json: JSONObject): Boolean { this.name = json.optString(NAME) this.packageName = json.optString(PACKAGE_NAME) @@ -42,6 +44,7 @@ class ApkInfo: IModel { 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) return true } @@ -69,6 +72,7 @@ class ApkInfo: IModel { const val MEDIA_EXT = "mediaExt" const val FILTER_URL = "filterUrl" const val MENU_KEY_EVENT = "menuKeyEvent" + const val MONITORING = "monitoring" } } \ No newline at end of file diff --git a/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt b/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt index a72945e4dbc56c91ffa526e83805921998677e24..7d7d699cbec3369455c46b26de8217cf7b06b7f1 100644 --- a/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt +++ b/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt @@ -48,6 +48,7 @@ class BylRobotService: Service(), IAppBaseCallback { override fun onCreate() { super.onCreate() initBroadcast() +// requestAppList() } private fun initBroadcast() { @@ -104,7 +105,7 @@ class BylRobotService: Service(), IAppBaseCallback { val appInfoData = protocol.data as AppInfoData for (apkInfo in appInfoData.apkInfos) { - if (AppUtil.isAppInstalled(this, apkInfo.packageName)) { + if (apkInfo.monitoring && AppUtil.isAppInstalled(this, apkInfo.packageName)) { val task = Task(this.applicationContext) task.from(apkInfo) TaskManager.instance.add(task) 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 1c615afe269376b3049cc194035f68a159a66bce..df0479b5a3cfeb4843a93536d69a3ed352bf00c3 100644 --- a/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt +++ b/app/src/main/java/com/duolebo/blyrobot/ui/AppConfigListItem.kt @@ -16,10 +16,12 @@ class AppConfigListItem(context: Context?) : RelativeLayout(context) { } fun setData(apkInfo: ApkInfo) { - var installTips = "" + var tips = "" if (!AppUtil.isAppInstalled(context, apkInfo.packageName)) - installTips = "(未安装)" - this.appName.text = apkInfo.name + installTips + tips = "(未安装)" + else if (!apkInfo.monitoring) + tips = "(监播未启用)" + this.appName.text = apkInfo.name + tips this.packageName.text = apkInfo.packageName }