格式化代码

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/log/LogHelper.kt

@@ -2,14 +2,13 @@ package com.ydl.ydlcommon.utils.log
 
 import android.content.Context
 import android.util.Log
-import com.yidianling.common.tools.*
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.data.PlatformDataManager
 import com.ydl.ydlcommon.data.http.LogParam
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.utils.FileUtils
-
+import com.yidianling.common.tools.*
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
@@ -40,7 +39,7 @@ class LogHelper private constructor() {
             } catch (e: Exception) {
             }
         }.subscribeOn(Schedulers.io())
-                .subscribe()
+            .subscribe()
     }
 
     /**
@@ -73,7 +72,7 @@ class LogHelper private constructor() {
             } catch (e: Exception) {
             }
         }.subscribeOn(Schedulers.io())
-                .subscribe()
+            .subscribe()
     }
 
     private fun writeLog(content: String, className: String, methodName: String, line: Int) {
@@ -82,7 +81,7 @@ class LogHelper private constructor() {
             val writer = BufferedWriter(fileWriter)
             writer.write("""Time:${format.format(Calendar.getInstance().time)}""")
             writer.newLine()
-            writer.write("UserInfo:uid = ${ ModularServiceManager.getPlatformUserService()?.getUser()?.userId}")
+            writer.write("UserInfo:uid = ${ModularServiceManager.getPlatformUserService()?.getUser()?.userId}")
             writer.newLine()
             writer.write("""Network:${RxNetTool.getNetWorkTypeName(BaseApp.getApp())}""")
             writer.newLine()
@@ -108,30 +107,32 @@ class LogHelper private constructor() {
     }
 
 
-    fun uploadLog(showToast:Boolean) {
+    fun uploadLog(showToast: Boolean) {
         Observable.create<File> {
             it.onNext(zip())
             it.onComplete()
         }.subscribeOn(Schedulers.io())
-                .flatMap { PlatformDataManager.getHttp().uploadLog(
+            .flatMap {
+                PlatformDataManager.getHttp().uploadLog(
                     LogParam(
                         it
                     )
-                ) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer {
-                    if (showToast){
-                        ToastUtil.toastShort(it.msg)
-                    }
-                    Log.d("TAG", "")
-                }, object : ThrowableConsumer() {
-                    override fun accept(msg: String) {
-                        if (showToast){
-                            ToastUtil.toastShort(msg)
-                        }
-                        Log.d("TAG", msg)
+                )
+            }
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(Consumer {
+                if (showToast) {
+                    ToastUtil.toastShort(it.msg)
+                }
+                Log.d("TAG", "")
+            }, object : ThrowableConsumer() {
+                override fun accept(msg: String) {
+                    if (showToast) {
+                        ToastUtil.toastShort(msg)
                     }
-                })
+                    Log.d("TAG", msg)
+                }
+            })
 
     }
 
@@ -153,18 +154,18 @@ class LogHelper private constructor() {
         if (zipFile.exists()) zipFile.delete()
         zipFile.createNewFile()
 
-        if (appLog.exists()){
+        if (appLog.exists()) {
             files.add(appLog)
         }
-        if (yunxinLog.exists()){
+        if (yunxinLog.exists()) {
             files.add(yunxinLog)
         }
-        if (agoraLog.exists()){
+        if (agoraLog.exists()) {
             files.add(agoraLog)
         }
 
 //        ZipUtils.toZip(getLogFolder().absolutePath, FileOutputStream(zipFile), true)
-        ZipUtils.toZip(files,FileOutputStream(zipFile))
+        ZipUtils.toZip(files, FileOutputStream(zipFile))
         return zipFile
     }
 
@@ -213,14 +214,15 @@ class LogHelper private constructor() {
     }
 
     //获取云信日志路径
-    private fun getYunXinLog(context: Context):File{
-        val yunxin = FileUtils.getSDDirectory()+"/"+context.packageName+"/nim/log"
+    private fun getYunXinLog(context: Context): File {
+        val yunxin = FileUtils.getSDDirectory() + "/" + context.packageName + "/nim/log"
         LogUtil.d(yunxin)
         return File(yunxin)
     }
+
     //获取声网日志
-    private fun  getAgoraLog(context: Context):File{
-        val agora = FileUtils.getSDDirectory()+"/"+context.packageName+"/agorasdk.log"
+    private fun getAgoraLog(context: Context): File {
+        val agora = FileUtils.getSDDirectory() + "/" + context.packageName + "/agorasdk.log"
         return File(agora)
     }