diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 98d889c4f1b68e0b105365782b9077a19072f7d1..0f567c5f7010986bff3ac5498fdf38c89073ccfc 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 9683aa0034a049fae2d429c79835f6b5403aea89..1501b948b75b57c0b6f34cb8bab5e68c6319b7da 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 41ab160eee3af0438a0ebbc60f9cffd795a9e2f5..4d4b3591516df5e509f4dcf7c4bb367a4e84512a 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 3bde02dca53cccb7b4c314eda1a73d48d41dab5c..24cc8fb64c19b57bf21df261ac6874c3482b0ce7 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 ee1b2ca9db8c56f3d1d63c62106410bf54044271..e79ea56ad39267c7c9bce9bf9758ed9d905e514f 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)