From a8ded1196cd3689f73417c0754403d5aadbe065a Mon Sep 17 00:00:00 2001
From: LiuYang <yang.liu@duolebo.com>
Date: Mon, 24 Sep 2018 21:33:49 +0800
Subject: [PATCH] add task

---
 app/src/main/AndroidManifest.xml              |   1 +
 .../java/com/duolebo/blyrobot/MainActivity.kt | 143 +---------------
 .../blyrobot/activity/CaptureActivity.kt      | 156 ++++++++++++++++++
 .../blyrobot/service/BylRobotService.kt       |  17 ++
 .../com/duolebo/blyrobot/util/Constants.kt    |   2 +
 app/src/main/res/layout/activity_capture.xml  |  47 ++++++
 app/src/main/res/layout/activity_main.xml     |  31 +---
 7 files changed, 232 insertions(+), 165 deletions(-)
 create mode 100644 app/src/main/java/com/duolebo/blyrobot/activity/CaptureActivity.kt
 create mode 100644 app/src/main/res/layout/activity_capture.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6cce2a5..92a57a6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".CaptureActivity" />
         <activity android:name=".activity.PackageListActivity" />
 
         <service android:name=".service.BylRobotService" />
diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
index c376814..f241a51 100644
--- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
@@ -1,157 +1,28 @@
 package com.duolebo.blyrobot
 
-import android.app.Activity
-import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
+import android.support.v4.content.LocalBroadcastManager
 import android.support.v7.app.AppCompatActivity
 import android.util.Log
-import android.widget.*
-import com.duolebo.blyrobot.activity.PackageListActivity
-import com.duolebo.blyrobot.data.ApkPackageInfo
-import com.duolebo.blyrobot.service.BylRobotService
-import com.duolebo.blyrobot.service.BylWebService
-import com.duolebo.blyrobot.util.AppUtil
-import com.duolebo.blyrobot.util.Constants
-import com.minhui.vpn.ProxyConfig
-import com.minhui.vpn.VPNConstants.*
-import com.minhui.vpn.utils.ThreadProxy
-import com.minhui.vpn.utils.VpnServiceHelper
-import com.minhui.vpn.utils.VpnServiceHelper.START_VPN_SERVICE_REQUEST_CODE
-import java.io.File
-import java.io.FileFilter
+import android.widget.Button
 
 class MainActivity : AppCompatActivity() {
 
-    private val REQUEST_PACKAGE = 103
-    private lateinit var captureButton:Button
-
-    private var vpnStatusListener: ProxyConfig.VpnStatusListener = object : ProxyConfig.VpnStatusListener {
-
-        override fun onVpnStart(context: Context) {
-            runOnUiThread {
-                refreshCaptureBtn()
-            }
-        }
-
-        override fun onVpnEnd(context: Context) {
-            runOnUiThread {
-                refreshCaptureBtn()
-            }
-        }
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Log.i("", "onCreate....")
         setContentView(R.layout.activity_main)
-        ProxyConfig.Instance.registerVpnStatusListener(vpnStatusListener)
-//        startService(Intent(this, BylRobotService::class.java))
-        val selectBtn = findViewById<Button>(R.id.selectBtn)
-        selectBtn.setOnClickListener{
-            selectApp()
-        }
-
-        captureButton = findViewById(R.id.captureBtn)
-        captureButton.setOnClickListener {
-            runOrStopCapture()
-        }
-
-        val clearBtn = findViewById<Button>(R.id.clearBtn)
-        clearBtn.setOnClickListener {
-            clearHistoryData()
-        }
-
-        initCheckbox()
-
-        val webUrlText = findViewById<TextView>(R.id.webUrl)
-        webUrlText.text = "启动抓取后请在浏览器打开：\nhttp://" + AppUtil.getIPAddress(true, null) + ":48080"
-
-        startRobotService()
-    }
-
-    private fun startRobotService() {
-        startService(Intent(this, BylRobotService::class.java))
-    }
-
-    private fun initCheckbox() {
-        val checkbox = findViewById<CheckBox>(R.id.videoCheckbox)
-        val sp = getSharedPreferences(VPN_SP_NAME, Context.MODE_PRIVATE)
-        checkbox.isChecked = sp.getBoolean(Constants.ONLY_VIDEO, false)
-        checkbox.setOnCheckedChangeListener { _, isChecked ->
-            sp.edit().putBoolean(Constants.ONLY_VIDEO, isChecked).apply()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        refreshCaptureBtn()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        ProxyConfig.Instance.unregisterVpnStatusListener(vpnStatusListener)
-    }
-
-    private fun refreshCaptureBtn() {
-        if (VpnServiceHelper.vpnRunningStatus()) {
-            captureButton.text = "停止抓取"
-        }
-        else {
-            captureButton.text = "启动抓取"
-        }
-    }
-
-    private fun runOrStopCapture() {
-        if (VpnServiceHelper.vpnRunningStatus()) {
-            // 由于5.0以下系统无法控制抓取规则，所以停止抓取之后才能通过web查看
-//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-//                stopService(Intent(this, BylWebService::class.java))
-//            }
 
-            VpnServiceHelper.changeVpnRunningStatus(this, false)
-        }
-        else {
-            val sp = getSharedPreferences(VPN_SP_NAME, Context.MODE_PRIVATE)
-            val selectPackage = sp.getString(DEFAULT_PACKAGE_ID, null)
-            val selectName = sp.getString(DEFAULT_PACAGE_NAME, null)
-            if (selectPackage.isNullOrEmpty() && selectName.isNullOrEmpty()) {
-                Toast.makeText(this, "请选择抓取应用", Toast.LENGTH_SHORT).show()
-            }
-            else {
-                VpnServiceHelper.changeVpnRunningStatus(this, true)
-                startService(Intent(this, BylWebService::class.java))
-            }
+        val startBtn = findViewById<Button>(R.id.startBtn)
+        startBtn.setOnClickListener{
         }
     }
 
-    private fun selectApp() {
-        val intent = Intent(this, PackageListActivity::class.java)
-        startActivityForResult(intent, REQUEST_PACKAGE)
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == START_VPN_SERVICE_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
-            VpnServiceHelper.startVpnService(applicationContext)
-        } else if (requestCode == REQUEST_PACKAGE && resultCode == Activity.RESULT_OK) {
-            val showInfo = data?.getParcelableExtra<ApkPackageInfo>(PackageListActivity.SELECT_PACKAGE)
-            showInfo?.run {
-                val sp = getSharedPreferences(VPN_SP_NAME, Context.MODE_PRIVATE)
-                sp.edit().putString(DEFAULT_PACKAGE_ID, packageName)
-                        .putString(DEFAULT_PACAGE_NAME, appName).apply()
-            }
-        }
-    }
-
-    private fun clearHistoryData() {
-        ThreadProxy.getInstance().execute {
-            val file = File(BASE_DIR)
-            AppUtil.deleteFile(file, FileFilter { pathname ->
-                return@FileFilter true
-            })
-        }
+    private fun startRobot() {
+        val intent = Intent()
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
     }
 
 }
diff --git a/app/src/main/java/com/duolebo/blyrobot/activity/CaptureActivity.kt b/app/src/main/java/com/duolebo/blyrobot/activity/CaptureActivity.kt
new file mode 100644
index 0000000..d5f4c6a
--- /dev/null
+++ b/app/src/main/java/com/duolebo/blyrobot/activity/CaptureActivity.kt
@@ -0,0 +1,156 @@
+package com.duolebo.blyrobot
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.util.Log
+import android.widget.*
+import com.duolebo.blyrobot.activity.PackageListActivity
+import com.duolebo.blyrobot.data.ApkPackageInfo
+import com.duolebo.blyrobot.service.BylRobotService
+import com.duolebo.blyrobot.service.BylWebService
+import com.duolebo.blyrobot.util.AppUtil
+import com.duolebo.blyrobot.util.Constants
+import com.minhui.vpn.ProxyConfig
+import com.minhui.vpn.VPNConstants.*
+import com.minhui.vpn.utils.ThreadProxy
+import com.minhui.vpn.utils.VpnServiceHelper
+import com.minhui.vpn.utils.VpnServiceHelper.START_VPN_SERVICE_REQUEST_CODE
+import java.io.File
+import java.io.FileFilter
+
+class CaptureActivity : AppCompatActivity() {
+
+    private val REQUEST_PACKAGE = 103
+    private lateinit var captureButton:Button
+
+    private var vpnStatusListener: ProxyConfig.VpnStatusListener = object : ProxyConfig.VpnStatusListener {
+
+        override fun onVpnStart(context: Context) {
+            runOnUiThread {
+                refreshCaptureBtn()
+            }
+        }
+
+        override fun onVpnEnd(context: Context) {
+            runOnUiThread {
+                refreshCaptureBtn()
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Log.i("", "onCreate....")
+        setContentView(R.layout.activity_capture)
+        ProxyConfig.Instance.registerVpnStatusListener(vpnStatusListener)
+//        startService(Intent(this, BylRobotService::class.java))
+        val selectBtn = findViewById<Button>(R.id.selectBtn)
+        selectBtn.setOnClickListener{
+            selectApp()
+        }
+
+        captureButton = findViewById(R.id.captureBtn)
+        captureButton.setOnClickListener {
+            runOrStopCapture()
+        }
+
+        val clearBtn = findViewById<Button>(R.id.clearBtn)
+        clearBtn.setOnClickListener {
+            clearHistoryData()
+        }
+
+        initCheckbox()
+
+        val webUrlText = findViewById<TextView>(R.id.webUrl)
+        webUrlText.text = "启动抓取后请在浏览器打开：\nhttp://" + AppUtil.getIPAddress(true, null) + ":48080"
+
+        startRobotService()
+    }
+
+    private fun startRobotService() {
+        startService(Intent(this, BylRobotService::class.java))
+    }
+
+    private fun initCheckbox() {
+        val checkbox = findViewById<CheckBox>(R.id.videoCheckbox)
+        val sp = getSharedPreferences(VPN_SP_NAME, Context.MODE_PRIVATE)
+        checkbox.isChecked = sp.getBoolean(Constants.ONLY_VIDEO, false)
+        checkbox.setOnCheckedChangeListener { _, isChecked ->
+            sp.edit().putBoolean(Constants.ONLY_VIDEO, isChecked).apply()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        refreshCaptureBtn()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        ProxyConfig.Instance.unregisterVpnStatusListener(vpnStatusListener)
+    }
+
+    private fun refreshCaptureBtn() {
+        if (VpnServiceHelper.vpnRunningStatus()) {
+            captureButton.text = "停止抓取"
+        }
+        else {
+            captureButton.text = "启动抓取"
+        }
+    }
+
+    private fun runOrStopCapture() {
+        if (VpnServiceHelper.vpnRunningStatus()) {
+            // 由于5.0以下系统无法控制抓取规则，所以停止抓取之后才能通过web查看
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//                stopService(Intent(this, BylWebService::class.java))
+//            }
+
+            VpnServiceHelper.changeVpnRunningStatus(this, false)
+        }
+        else {
+            val sp = getSharedPreferences(VPN_SP_NAME, Context.MODE_PRIVATE)
+            val selectPackage = sp.getString(DEFAULT_PACKAGE_ID, null)
+            val selectName = sp.getString(DEFAULT_PACAGE_NAME, null)
+            if (selectPackage.isNullOrEmpty() && selectName.isNullOrEmpty()) {
+                Toast.makeText(this, "请选择抓取应用", Toast.LENGTH_SHORT).show()
+            }
+            else {
+                VpnServiceHelper.changeVpnRunningStatus(this, true)
+                startService(Intent(this, BylWebService::class.java))
+            }
+        }
+    }
+
+    private fun selectApp() {
+        val intent = Intent(this, PackageListActivity::class.java)
+        startActivityForResult(intent, REQUEST_PACKAGE)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == START_VPN_SERVICE_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+            VpnServiceHelper.startVpnService(applicationContext)
+        } else if (requestCode == REQUEST_PACKAGE && resultCode == Activity.RESULT_OK) {
+            val showInfo = data?.getParcelableExtra<ApkPackageInfo>(PackageListActivity.SELECT_PACKAGE)
+            showInfo?.run {
+                val sp = getSharedPreferences(VPN_SP_NAME, Context.MODE_PRIVATE)
+                sp.edit().putString(DEFAULT_PACKAGE_ID, packageName)
+                        .putString(DEFAULT_PACAGE_NAME, appName).apply()
+            }
+        }
+    }
+
+    private fun clearHistoryData() {
+        ThreadProxy.getInstance().execute {
+            val file = File(BASE_DIR)
+            AppUtil.deleteFile(file, FileFilter { pathname ->
+                return@FileFilter true
+            })
+        }
+    }
+
+}
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 ada7eae..5758499 100644
--- a/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt
@@ -2,12 +2,17 @@ package com.duolebo.blyrobot.service
 
 import android.annotation.SuppressLint
 import android.app.Service
+import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.os.IBinder
+import android.support.v4.content.LocalBroadcastManager
 import android.util.Log
 import com.duolebo.blyrobot.data.Task
 import com.duolebo.blyrobot.util.AdbUtil
 import com.duolebo.blyrobot.util.AppUtil
+import com.duolebo.blyrobot.util.Constants
 import org.json.JSONObject
 import java.util.*
 
@@ -19,6 +24,12 @@ class BylRobotService: Service() {
     private var count = 0
     private val tasks = ArrayList<Task>()
 
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(p0: Context?, p1: Intent?) {
+
+        }
+    }
+
     override fun onCreate() {
         super.onCreate()
 
@@ -38,6 +49,11 @@ class BylRobotService: Service() {
         },2000, 10*1000)
     }
 
+    private fun initBroadcast() {
+        val intentFilter = IntentFilter(Constants.BC_SERVICE)
+        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter)
+    }
+
     private fun loadTask() {
         val task = Task(this)
         task.from(JSONObject(AppUtil.readFromAssert(this, "test.json")))
@@ -81,6 +97,7 @@ class BylRobotService: Service() {
     override fun onDestroy() {
         Log.i(TAG, "destroy...")
         super.onDestroy()
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver)
         cancelTimer()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duolebo/blyrobot/util/Constants.kt b/app/src/main/java/com/duolebo/blyrobot/util/Constants.kt
index 34d10f0..53db088 100644
--- a/app/src/main/java/com/duolebo/blyrobot/util/Constants.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/util/Constants.kt
@@ -33,4 +33,6 @@ object Constants {
     const val PACKAGE_NAME = "packageName"
     const val LAUNCHER = "launcher"
     const val LAUNCH_DELAY = "launchDelay"
+
+    const val BC_SERVICE = "broadcast_service"
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_capture.xml b/app/src/main/res/layout/activity_capture.xml
new file mode 100644
index 0000000..169a388
--- /dev/null
+++ b/app/src/main/res/layout/activity_capture.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:context=".MainActivity"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerInParent="true">
+        <Button
+            android:id="@+id/selectBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择目标App"/>
+
+        <Button
+            android:id="@+id/captureBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="开始抓包"/>
+
+        <CheckBox
+            android:id="@+id/videoCheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="只抓取视频"/>
+
+        <Button
+            android:id="@+id/clearBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="清除历史"/>
+
+        <TextView
+            android:id="@+id/webUrl"
+            android:layout_marginTop="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 169a388..8fcc74f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,37 +11,10 @@
         android:orientation="vertical"
         android:layout_centerInParent="true">
         <Button
-            android:id="@+id/selectBtn"
+            android:id="@+id/startBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="选择目标App"/>
-
-        <Button
-            android:id="@+id/captureBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="开始抓包"/>
-
-        <CheckBox
-            android:id="@+id/videoCheckbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="只抓取视频"/>
-
-        <Button
-            android:id="@+id/clearBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="清除历史"/>
-
-        <TextView
-            android:id="@+id/webUrl"
-            android:layout_marginTop="10dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:text="启动"/>
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
-- 
2.21.0