From 7b8240c27edd8d07557ff89cb37de80636f99ab9 Mon Sep 17 00:00:00 2001
From: AceDroidX <15519693+AceDroidX@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E9=9C=80=E8=A6=81=E5=86=99=E5=85=A5frpc.log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/github/acedroidx/frp/MainActivity.kt   | 20 +++--------
 .../io/github/acedroidx/frp/ShellService.kt   | 29 ++++++++++++----
 .../io/github/acedroidx/frp/ShellThread.kt    | 34 +++++++++++++++++++
 3 files changed, 60 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/io/github/acedroidx/frp/ShellThread.kt

diff --git a/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt b/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt
index 1faf1df..e5ed4b2 100644
--- a/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt
+++ b/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt
@@ -19,7 +19,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SwitchCompat
 import androidx.core.content.ContextCompat
-import java.io.File
 
 
 class MainActivity : AppCompatActivity() {
@@ -94,28 +93,17 @@ class MainActivity : AppCompatActivity() {
         }
         val deleteButton = findViewById<Button>(R.id.deleteButton)
         deleteButton.setOnClickListener {
-            val logfile = File(this.filesDir.toString() + "/${BuildConfig.LogFileName}")
-            Log.d("adx", logfile.absoluteFile.toString())
-            logfile.delete()
+            mService.clearOutput()
             readLog()
         }
     }
 
     fun readLog() {
-        val files: Array<String> = this.fileList()
         val logTextView = findViewById<TextView>(R.id.logTextView)
-        if (files.contains(BuildConfig.LogFileName)) {
-            val mReader = this.openFileInput(BuildConfig.LogFileName).bufferedReader()
-            val mRespBuff = StringBuffer()
-            val buff = CharArray(1024)
-            var ch = 0
-            while (mReader.read(buff).also { ch = it } != -1) {
-                mRespBuff.append(buff, 0, ch)
-            }
-            mReader.close()
-            logTextView.text = mRespBuff.toString()
+        if (mBound) {
+            logTextView.text = mService.getOutput()
         } else {
-            logTextView.text = "无日志"
+            Log.w("adx", "readLog mBound==null")
         }
     }
 
diff --git a/app/src/main/java/io/github/acedroidx/frp/ShellService.kt b/app/src/main/java/io/github/acedroidx/frp/ShellService.kt
index 64cad25..98fb190 100644
--- a/app/src/main/java/io/github/acedroidx/frp/ShellService.kt
+++ b/app/src/main/java/io/github/acedroidx/frp/ShellService.kt
@@ -11,11 +11,20 @@ import android.os.IBinder
 import android.util.Log
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
-import java.util.*
+import java.io.File
+import java.util.Random
+
 
 class ShellService : Service() {
-    var p: Process? = null
+    private var process_thread: Thread? = null
+    private val outputBuilder = StringBuilder()
+    fun getOutput(): String {
+        return outputBuilder.toString()
+    }
 
+    fun clearOutput() {
+        outputBuilder.clear()
+    }
 
     // Binder given to clients
     private val binder = LocalBinder()
@@ -42,7 +51,7 @@ class ShellService : Service() {
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         var filename = ""
-        if (p != null) {
+        if (process_thread != null) {
             Log.w("adx", "process isn't null,service won't start")
             Toast.makeText(this, "process isn't null,service won't start", Toast.LENGTH_SHORT)
                 .show()
@@ -61,8 +70,10 @@ class ShellService : Service() {
             packageManager.getApplicationInfo(packageName, PackageManager.GET_SHARED_LIBRARY_FILES)
         Log.d("adx", "native library dir ${ainfo.nativeLibraryDir}")
         try {
-            p = Runtime.getRuntime().exec(
-                "${ainfo.nativeLibraryDir}/${filename} -c ${BuildConfig.ConfigFileName}", arrayOf(""), this.filesDir
+            runCommand(
+                "${ainfo.nativeLibraryDir}/${filename} -c ${BuildConfig.ConfigFileName}",
+                arrayOf(""),
+                this.filesDir
             )
         } catch (e: Exception) {
             Log.e("adx", e.stackTraceToString())
@@ -76,11 +87,15 @@ class ShellService : Service() {
     }
 
     override fun onDestroy() {
-        p?.destroy()
-        p = null
+        process_thread?.interrupt()
         Toast.makeText(this, "已关闭frp服务", Toast.LENGTH_SHORT).show()
     }
 
+    private fun runCommand(command: String, envp: Array<String>, dir: File) {
+        process_thread = ShellThread(command, envp, dir) { outputBuilder.append(it + "\n") }
+        process_thread?.start()
+    }
+
     private fun showMotification(): Notification {
         val pendingIntent: PendingIntent =
             Intent(this, MainActivity::class.java).let { notificationIntent ->
diff --git a/app/src/main/java/io/github/acedroidx/frp/ShellThread.kt b/app/src/main/java/io/github/acedroidx/frp/ShellThread.kt
new file mode 100644
index 0000000..d820f90
--- /dev/null
+++ b/app/src/main/java/io/github/acedroidx/frp/ShellThread.kt
@@ -0,0 +1,34 @@
+package io.github.acedroidx.frp
+
+import android.util.Log
+import java.io.BufferedReader
+import java.io.File
+import java.io.IOException
+import java.io.InputStreamReader
+
+class ShellThread(
+    val command: String,
+    val envp: Array<String>,
+    val dir: File,
+    val outputCallback: (text: String) -> Unit
+) : Thread() {
+    override fun run() {
+        try {
+//            Log.d("adx","线程启动")
+            val process = Runtime.getRuntime().exec(command, envp, dir)
+            val inputStream = process.inputStream
+            val reader = BufferedReader(InputStreamReader(inputStream))
+            var line: String?
+            while (((reader.readLine().also { line = it }) != null) && !isInterrupted) {
+//                outputBuilder.insert(0, line).append("\n")
+//                outputBuilder.append(line).append("\n")
+                line?.let { outputCallback(it) }
+            }
+            reader.close()
+            process.destroy()
+//            Log.d("adx","线程关闭")
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+}
\ No newline at end of file