feature：

1）common模块开发
2）zap模块异常捕获开发

README.md

@@ -4,5 +4,5 @@ an application performance monitor framework of Android
 
 ## Zap
 
-a log framework of Android , [Detail](library_zap/README.md)
+[A log framework of Android](library_zap/README.md)
 

demo/build.gradle

@@ -73,6 +73,8 @@ android {
 
 dependencies {
 //    implementation project(':library_caps')
+    implementation 'com.google.android.material:material:1.3.0'
     implementation project(':library_zap')
+    implementation project(':library_common')
 
 }

demo/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
 
         <activity
             android:name=".DemoActivity"
@@ -33,5 +33,4 @@
             </intent-filter>
         </activity>
     </application>
-
 </manifest>

demo/src/main/java/com/suyghur/dolin/DemoActivity.kt

@@ -7,10 +7,9 @@ import android.view.KeyEvent
 import android.view.View
 import android.widget.Button
 import android.widget.LinearLayout
+import android.widget.TextView
+import com.suyghur.dolin.common.util.DeviceInfoUtils
 import com.suyghur.dolin.zap.Zap
-import com.suyghur.dolin.zap.entity.Level
-import com.suyghur.dolin.zap.util.FileUtils
-import com.suyghur.dolin.zap.util.LevelUtils
 import kotlin.system.exitProcess
 
 /**
@@ -19,6 +18,8 @@ import kotlin.system.exitProcess
  */
 class DemoActivity : Activity(), View.OnClickListener {
 
+    private lateinit var textView: TextView
+
     private val events: MutableList<Item> = mutableListOf(
             Item(0, "Zap日志测试"),
             Item(1, "申请多个危险权限")
@@ -27,8 +28,15 @@ class DemoActivity : Activity(), View.OnClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        initView()
+        initDeviceInfo()
+    }
+
+    private fun initView() {
         val layout = LinearLayout(this)
         layout.orientation = LinearLayout.VERTICAL
+        textView = TextView(this)
+        layout.addView(textView)
         for (event in events) {
             with(Button(this)) {
                 tag = event.id
@@ -40,6 +48,19 @@ class DemoActivity : Activity(), View.OnClickListener {
         setContentView(layout)
     }
 
+    private fun initDeviceInfo() {
+        val sb = StringBuilder()
+        sb.append("Android ID：").append(DeviceInfoUtils.getAndroidDeviceId(this)).append("\n")
+        sb.append("厂商：").append(DeviceInfoUtils.getDeviceBrand()).append("\n")
+        sb.append("型号：").append(DeviceInfoUtils.getModel()).append("\n")
+        sb.append("系统版本：").append(DeviceInfoUtils.getDeviceSoftWareVersion()).append("\n")
+        sb.append("cpu核数：").append(DeviceInfoUtils.getCpuCount()).append("\n")
+        sb.append("cpu架构：").append(DeviceInfoUtils.getCpuABI()).append("\n")
+        sb.append("本机内存：").append(DeviceInfoUtils.getRAM()).append("\n")
+        sb.append("本机剩余内存：").append(DeviceInfoUtils.getAvailMem(this)).append("M")
+        textView.text = sb.toString()
+    }
+
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             AlertDialog.Builder(this)

demo/src/main/java/com/suyghur/dolin/ZapActivity.kt

@@ -6,8 +6,8 @@ import android.os.Bundle
 import android.view.View
 import android.widget.Button
 import android.widget.LinearLayout
+import com.suyghur.dolin.common.util.DeviceInfoUtils
 import com.suyghur.dolin.zap.Zap
-import com.suyghur.dolin.zap.util.FileUtils
 
 /**
  * @author #Suyghur.
@@ -35,7 +35,7 @@ class ZapActivity : Activity(), View.OnClickListener {
             }
         }
         setContentView(layout)
-        Zap.d(FileUtils.getLogDir(this))
+        Zap.d("free RAM : ${DeviceInfoUtils.getAvailMem(this)}M")
     }
 
     override fun onClick(v: View?) {

library_common/.gitignore

@@ -0,0 +1 @@
+/build

library_common/build.gradle

@@ -0,0 +1,44 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
+
+
+    defaultConfig {
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled MINIFY_ENABLE
+            proguardFiles 'proguard-rules.pro'
+        }
+    }
+
+    buildFeatures {
+        buildConfig = false
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    repositories {
+        flatDir {
+            dirs 'libs'
+        }
+    }
+
+    dexOptions {
+        preDexLibraries = false
+    }
+}
+
+dependencies {
+    implementation 'androidx.core:core-ktx:1.3.2'
+}

library_common/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

library_common/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.suyghur.dolin.common">
+
+</manifest>

library_common/src/main/java/com/suyghur/dolin/common/Common.kt

@@ -0,0 +1,8 @@
+package com.suyghur.dolin.common
+
+/**
+ * @author #Suyghur.
+ * Created on 4/12/21
+ */
+class Common {
+}

library_common/src/main/java/com/suyghur/dolin/common/util/CrashUtils.kt

@@ -0,0 +1,12 @@
+package com.suyghur.dolin.common.util
+
+/**
+ * @author #Suyghur.
+ * Created on 4/12/21
+ */
+object CrashUtils {
+
+    fun appendSessionInfo() {
+
+    }
+}

library_common/src/main/java/com/suyghur/dolin/common/util/DeviceInfoUtils.kt

@@ -0,0 +1,104 @@
+package com.suyghur.dolin.common.util
+
+import android.app.ActivityManager
+import android.content.Context
+import android.os.Build
+import android.provider.Settings
+import android.text.TextUtils
+import java.io.BufferedReader
+import java.io.FileReader
+import kotlin.math.ceil
+
+/**
+ * @author #Suyghur.
+ * Created on 4/12/21
+ */
+object DeviceInfoUtils {
+
+
+    /**
+     * 获取设备ID（AndroidId）
+     */
+    fun getAndroidDeviceId(context: Context): String {
+        val id = Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
+        return if (TextUtils.isEmpty(id)) {
+            ""
+        } else {
+            id
+        }
+    }
+
+    /**
+     * 获取手机厂商
+     */
+    fun getDeviceBrand(): String {
+        return Build.BRAND
+    }
+
+    /**
+     * 获取手机型号
+     */
+    fun getModel(): String {
+        return Build.MODEL
+    }
+
+    /**
+     * 获取系统版本
+     */
+    fun getDeviceSoftWareVersion(): String {
+        return Build.VERSION.RELEASE
+    }
+
+    /**
+     * 获取cpu核数
+     */
+    fun getCpuCount(): String {
+        return "${Runtime.getRuntime().availableProcessors()}"
+    }
+
+    /**
+     * 获取cpu架构
+     */
+    fun getCpuABI(): String {
+        val abis: Array<String> = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Build.SUPPORTED_ABIS
+        } else {
+            arrayOf(Build.CPU_ABI, Build.CPU_ABI2)
+        }
+        val sb = StringBuilder()
+        for (index in abis.indices) {
+            sb.append(abis[index])
+            if (index != abis.size - 1) {
+                sb.append(" , ")
+            }
+        }
+        return sb.toString()
+    }
+
+    /**
+     * 获取手机运行内存RAM
+     */
+    fun getRAM(): String {
+        var firstLine = ""
+        BufferedReader(FileReader("/proc/meminfo"), 8192).use {
+            firstLine = it.readLine().split("\\s+".toRegex())[1]
+        }
+        return if (TextUtils.isEmpty(firstLine)) {
+            "0GB"
+        } else {
+            "${ceil(firstLine.toFloat() / (1024 * 1024).toDouble()).toInt()}GB"
+        }
+    }
+
+    /**
+     * 系统空闲内存（单位M）
+     */
+    fun getAvailMem(context: Context): Int {
+        val am = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        val mi = ActivityManager.MemoryInfo()
+        am.getMemoryInfo(mi)
+        //mi.availMem
+        return (mi.availMem / 1024 / 1024).toInt()
+    }
+
+}

library_zap/src/main/java/com/suyghur/dolin/zap/util/FileUtils.kt → library_common/src/main/java/com/suyghur/dolin/common/util/FileUtils.kt

@@ -1,4 +1,4 @@
-package com.suyghur.dolin.zap.util
+package com.suyghur.dolin.common.util
 
 import android.content.Context
 import java.io.File

library_zap/build.gradle

@@ -23,7 +23,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled MINIFY_ENABLE
             proguardFiles 'proguard-rules.pro'
         }
     }
@@ -56,4 +56,5 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
     implementation 'androidx.core:core-ktx:1.3.2'
+    compileOnly project(':library_common')
 }

library_zap/src/main/java/com/suyghur/dolin/zap/crashlytics/JavaCrashCatcher.kt

@@ -0,0 +1,68 @@
+package com.suyghur.dolin.zap.crashlytics
+
+import android.os.Process
+import com.suyghur.dolin.zap.Zap
+import kotlin.system.exitProcess
+
+/**
+ * @author #Suyghur.
+ * Created on 4/12/21
+ */
+class JavaCrashCatcher : Thread.UncaughtExceptionHandler {
+
+    private val defaultHandler = Thread.getDefaultUncaughtExceptionHandler()
+
+    private var intercept = false
+
+    fun initialize() {
+        try {
+            Thread.setDefaultUncaughtExceptionHandler(this)
+        } catch (e: Exception) {
+            Zap.e("JavaCrashCatcher->setDefaultUncaughtExceptionHandler() error , ${e.localizedMessage}")
+        }
+    }
+
+    override fun uncaughtException(t: Thread, e: Throwable) {
+        if (defaultHandler != null) {
+            Thread.setDefaultUncaughtExceptionHandler(defaultHandler)
+        }
+        try {
+            handleException(t, e)
+        } catch (e: Exception) {
+            Zap.e("JavaCrashCatcher->handlerException error , ${e.localizedMessage}")
+        }
+        if (intercept) {
+            Process.killProcess(Process.myPid())
+            exitProcess(10)
+        } else {
+            defaultHandler?.apply {
+                uncaughtException(t, e)
+            }
+        }
+
+    }
+
+    private fun handleException(t: Thread, e: Throwable) {
+
+    }
+
+
+    companion object {
+
+        fun getInstance(): JavaCrashCatcher {
+            return JavaCrashCatcherHolder.INSTANCE
+        }
+
+        private object JavaCrashCatcherHolder {
+            val INSTANCE = JavaCrashCatcher()
+        }
+
+        /**
+         * 防止单例对象在反序列化时重新生成对象
+         */
+        private fun readResolve(): Any {
+            return JavaCrashCatcherHolder.INSTANCE
+        }
+    }
+
+}

library_zap/src/main/java/com/suyghur/dolin/zap/entity/Config.kt

@@ -16,6 +16,8 @@ class Config private constructor(builder: Builder) {
         private set
     var recordEnable: Boolean
         private set
+    var catchEnable: Boolean
+        private set
     private var overdueDayMs = 0L
     private var fileSizeLimitDayByte = 0
 
@@ -26,6 +28,7 @@ class Config private constructor(builder: Builder) {
         this.logcatLevel = builder.logcatLevel
         this.recordLevel = builder.recordLevel
         this.recordEnable = builder.recordEnable
+        this.catchEnable = builder.catchEnable
         this.overdueDayMs = builder.overdueDay * 24 * 3600 * 1000L
         this.fileSizeLimitDayByte = builder.fileSizeLimitDay * 1024 * 1024
     }
@@ -40,12 +43,13 @@ class Config private constructor(builder: Builder) {
                 '}'
     }
 
-    class Builder() {
+    class Builder {
         internal var logDir = ""
         internal var tag = ""
         internal var logcatLevel = Level.DEBUG
         internal var recordLevel = Level.DEBUG
         internal var recordEnable = true
+        internal var catchEnable = true
         internal var overdueDay = 3
         internal var fileSizeLimitDay = 15
 
@@ -83,6 +87,11 @@ class Config private constructor(builder: Builder) {
             return this
         }
 
+        fun setCatchEnable(enable: Boolean): Builder {
+            this.catchEnable = enable
+            return this
+        }
+
         /**
          * 日志过期天数，过期日志将自动清除，默认为3
          */

library_zap/src/main/java/com/suyghur/dolin/zap/impl/DateFileFormatter.kt → library_zap/src/main/java/com/suyghur/dolin/zap/format/DateFileFormatter.kt

@@ -1,4 +1,4 @@
-package com.suyghur.dolin.zap.impl
+package com.suyghur.dolin.zap.format
 
 import android.text.TextUtils
 import com.suyghur.dolin.zap.entity.Level

library_zap/src/main/java/com/suyghur/dolin/zap/impl/ZapPrint.kt

@@ -3,11 +3,13 @@ package com.suyghur.dolin.zap.impl
 import android.app.Application
 import android.text.TextUtils
 import android.util.Log
+import com.suyghur.dolin.common.util.FileUtils
 import com.suyghur.dolin.zap.entity.Config
 import com.suyghur.dolin.zap.entity.Level
 import com.suyghur.dolin.zap.entity.ZapData
+import com.suyghur.dolin.zap.format.DateFileFormatter
 import com.suyghur.dolin.zap.internal.IPrint
-import com.suyghur.dolin.zap.util.FileUtils
+import com.suyghur.dolin.zap.lifecycle.ZapLifecycle
 import java.io.File
 import java.lang.reflect.Array
 import java.text.SimpleDateFormat

library_zap/src/main/java/com/suyghur/dolin/zap/internal/ICatch.kt

@@ -0,0 +1,10 @@
+package com.suyghur.dolin.zap.internal
+
+/**
+ * @author #Suyghur.
+ * Created on 4/12/21
+ */
+interface ICatch {
+
+    fun onCatch()
+}

library_zap/src/main/java/com/suyghur/dolin/zap/impl/ZapLifecycle.kt → library_zap/src/main/java/com/suyghur/dolin/zap/lifecycle/ZapLifecycle.kt

@@ -1,8 +1,9 @@
-package com.suyghur.dolin.zap.impl
+package com.suyghur.dolin.zap.lifecycle
 
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
+import com.suyghur.dolin.zap.impl.Record2MMap
 
 
 /**
@@ -39,8 +40,8 @@ object ZapLifecycle {
     }
 
     fun registerZapLifeCallback(application: Application, record2MMap: Record2MMap) {
-        this.application = application
-        this.record2MMap = record2MMap
+        ZapLifecycle.application = application
+        ZapLifecycle.record2MMap = record2MMap
         application.registerActivityLifecycleCallbacks(callback)
     }
 

settings.gradle

@@ -1,3 +1,4 @@
+include ':library_common'
 include ':demo'
 //include ':library_caps'
 include ':library_zap'