From c76d67f31c808cf17237f67ee308105963d6d8df Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Mon, 19 Nov 2018 18:34:10 +0800
Subject: [PATCH] =?UTF-8?q?APK=E6=8A=93=E5=8C=85>=E4=BB=8E=E9=A2=91?=
 =?UTF-8?q?=E9=81=931=E5=BC=80=E5=A7=8B=E4=BE=9D=E6=AC=A1=E6=8A=93?=
 =?UTF-8?q?=E5=8F=96,=20=E6=B8=85=E9=99=A4png=E5=9B=BE=E7=89=87=EF=BC=8C?=
 =?UTF-8?q?=E5=87=8F=E5=B0=91=E7=A3=81=E7=9B=98=E7=A9=BA=E9=97=B4=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=20#BYLSERVER-1693?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../java/com/duolebo/blyrobot/MainActivity.kt |  5 +++-
 .../java/com/duolebo/blyrobot/data/Task.kt    | 23 ++++++++--------
 .../java/com/duolebo/blyrobot/util/AppUtil.kt | 26 ++++++++++++++++++-
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4c84063..98d889c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
index fc23b67..a43dcd8 100644
--- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
@@ -47,6 +47,10 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
         Log.i(TAG, "onCreate....")
         setContentView(R.layout.activity_main)
 
+        init()
+    }
+
+    private fun init() {
         getLocalAppList()
 
         this.appInfoAdapter = AppConfigAdapter()
@@ -84,7 +88,6 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
             this.appInfoAdapter.clear()
             requestAppList()
         }
-
     }
 
     private fun start() {
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 d9a7749..59fc996 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -56,7 +56,7 @@ class Task : Thread, IAppBaseCallback {
     constructor(context: Context) {
         this.context = context
         this.reportProtocol = ApkReportProtocol(context, Config.instance)
-        this.reportProtocol.retryPolicy = DefaultRetryPolicy(10*1000, 3, DEFAULT_BACKOFF_MULT)
+        this.reportProtocol.retryPolicy = DefaultRetryPolicy(30*1000, 3, DEFAULT_BACKOFF_MULT)
         this.dataHandler = AppBaseHandler(this)
     }
 
@@ -179,13 +179,6 @@ class Task : Thread, IAppBaseCallback {
         this.taskListener?.run {
             onComplete(result)
         }
-
-        try {
-            val logPath = this.taskPath + "/" + this.imageDateFormat.format(Date()) + ".log"
-            Runtime.getRuntime().exec("logcat -f $logPath")
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
     }
 
     /**
@@ -407,8 +400,10 @@ class Task : Thread, IAppBaseCallback {
         AdbUtil.screenShot(pngPath)
         // png转换成jpg
         val pngFile = File(pngPath)
-        if (pngFile.exists())
+        if (pngFile.exists()) {
             AppUtil.pngToJpg(pngPath, jpgPath)
+            pngFile.delete()
+        }
         else {
             Log.i(TAG, "screen shot failed")
         }
@@ -480,9 +475,13 @@ class Task : Thread, IAppBaseCallback {
         Log.i(TAG, "report....")
         val postJson = JSONObject()
         val reportArray = JSONArray()
-        reportArray.put(this.reportJson)
-        postJson.putOpt("data", reportArray)
-        reportProtocol.withBody(postJson.toString()).execute(dataHandler)
+        try {
+            reportArray.put(this.reportJson)
+            postJson.putOpt("data", reportArray)
+            reportProtocol.withBody(postJson.toString()).execute(dataHandler)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
 
         val reportPath = this.taskPath + "/" + this.imageDateFormat.format(Date()) + "_report.json"
         AppUtil.saveToFile(reportPath, postJson.toString())
diff --git a/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt b/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt
index 3004cd9..c2aefc7 100644
--- a/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt
@@ -14,6 +14,9 @@ import android.os.Build
 import android.os.Environment
 import java.util.regex.Pattern
 import android.app.ActivityManager.RunningAppProcessInfo
+import java.nio.file.Files.delete
+
+
 
 
 
@@ -76,13 +79,34 @@ object AppUtil {
     fun pngToJpg(pngFilePath: String, jpgFilePath: String) {
         val bitmap = BitmapFactory.decodeFile(pngFilePath)
         try {
-            BufferedOutputStream(FileOutputStream(jpgFilePath)).use { bos ->
+            val fos = FileOutputStream(jpgFilePath)
+            BufferedOutputStream(fos).use { bos ->
                 if (bitmap.compress(Bitmap.CompressFormat.JPEG, 80, bos)) {
                     bos.flush()
                 }
+                bos.close()
+            }
+            fos.close()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } finally {
+            bitmap!!.recycle()
+        }
+    }
+
+    fun pngToJpg2(pngFilePath: String, jpgFilePath: String) {
+        val bitmap: Bitmap? = BitmapFactory.decodeFile(pngFilePath)
+        try {
+            val bos = BufferedOutputStream(FileOutputStream(jpgFilePath))
+            bitmap?.run {
+                compress(Bitmap.CompressFormat.JPEG, 100, bos)
+                bos.flush()
             }
+            bos.close()
         } catch (e: IOException) {
             e.printStackTrace()
+        } finally {
+            bitmap!!.recycle()
         }
     }
 
-- 
2.21.0