From 32cf30542566a22396b86a5df659bd7eb9f2bb3c Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Mon, 22 Oct 2018 17:46:49 +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=8C=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=91=E6=92=AD=E6=8E=A7=E5=88=B6=20#BYLSE?=
 =?UTF-8?q?RVER-1438?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/duolebo/blyrobot/MainActivity.kt    | 2 +-
 app/src/main/java/com/duolebo/blyrobot/data/ApkInfo.kt    | 4 ++++
 .../java/com/duolebo/blyrobot/service/BylRobotService.kt  | 3 ++-
 .../java/com/duolebo/blyrobot/ui/AppConfigListItem.kt     | 8 +++++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
index 69f08a8..5309800 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 37ed3d8..b159b9b 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 a72945e..7d7d699 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 1c615af..df0479b 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
     }
 
-- 
2.21.0