From 800f67e411f329dc1c64932eaebc21fc829ecdc4 Mon Sep 17 00:00:00 2001 From: liuyang Date: Fri, 7 Dec 2018 12:26:21 +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,=20=E5=88=86=E7=A6=BBservice?= =?UTF-8?q?=E5=92=8C=E7=95=8C=E9=9D=A2=EF=BC=8C=E9=81=BF=E5=85=8D=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=9C=A8=E5=90=8E=E5=8F=B0=E8=A2=AB=E6=9D=80=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/AndroidManifest.xml | 3 +-- .../main/java/com/duolebo/blyrobot/MainActivity.kt | 12 +++++++++--- app/src/main/java/com/duolebo/blyrobot/data/Task.kt | 1 + .../com/duolebo/blyrobot/service/BylRobotService.kt | 8 +++++--- .../java/com/duolebo/blyrobot/tools/TaskManager.kt | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 98d889c..0f567c5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,6 @@ - - + diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt index 9683aa0..1501b94 100644 --- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt +++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt @@ -56,6 +56,11 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { this.appInfoAdapter = AppConfigAdapter() listView.adapter = this.appInfoAdapter + listView.setOnItemClickListener { _, _, position, _ -> + val itemData = this.appInfoAdapter.getItem(position) as ApkInfo + AdbUtil.launchApp("${itemData.packageName}/${itemData.launcher}") + } + initRefreshTimer() val hasRoot = AdbUtil.checkRootPermission() @@ -172,13 +177,13 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { Log.i(TAG, "startRobot...") val intent = Intent(Constants.ACTION_LOCAL_SERVICE) intent.putExtra(Constants.KEY_CMD, Constants.CMD_START) - LocalBroadcastManager.getInstance(this).sendBroadcast(intent) + sendBroadcast(intent) } private fun stopRobot() { val intent = Intent(Constants.ACTION_LOCAL_SERVICE) intent.putExtra(Constants.KEY_CMD, Constants.CMD_STOP) - LocalBroadcastManager.getInstance(this).sendBroadcast(intent) + sendBroadcast(intent) } override fun onProtocolFailed(protocol: IProtocol?) { @@ -263,8 +268,9 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { else itemView = convertView as AppConfigListItem + val itemData = dataList[position] itemView.setData(dataList[position]) - val drawable = getAppIcon(dataList[position].packageName) + val drawable = getAppIcon(itemData.packageName) drawable?.run { itemView.setIcon(this) } 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 41ab160..4d4b359 100644 --- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt +++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt @@ -397,6 +397,7 @@ class Task : Thread, IAppBaseCallback { Log.i(TAG, "sleep seconds:$seconds") try { Thread.sleep((seconds * 1000).toLong()) +// AdbUtil.exeCmdEcho("sleep $seconds", true) } catch (e: Exception) { e.printStackTrace() } 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 3bde02d..24cc8fb 100644 --- a/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt +++ b/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt @@ -48,13 +48,13 @@ class BylRobotService: Service(), IAppBaseCallback { super.onCreate() FtpManager.instance.start() initBroadcast() -// requestAppList() + requestAppList() } private fun initBroadcast() { Log.i(TAG, "initBroadcast...") val intentFilter = IntentFilter(Constants.ACTION_LOCAL_SERVICE) - LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter) + registerReceiver(broadcastReceiver, intentFilter) } private fun requestAppList() { @@ -93,7 +93,7 @@ class BylRobotService: Service(), IAppBaseCallback { super.onDestroy() stopTask() FtpManager.instance.stop() - LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver) + unregisterReceiver(broadcastReceiver) } override fun onProtocolFailed(protocol: IProtocol?) { @@ -113,6 +113,8 @@ class BylRobotService: Service(), IAppBaseCallback { TaskManager.instance.add(task) } } + + loadTask() } } } \ No newline at end of file diff --git a/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt b/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt index ee1b2ca..e79ea56 100644 --- a/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt +++ b/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt @@ -110,7 +110,7 @@ class TaskManager { } } - Thread.sleep(3 * 1000) + Thread.sleep(5 * 1000) } } }, 0, RUN_TASK_PERIOD) -- 2.21.0