From 075850d239769211d84fce2441acbe57f0d3327f Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Thu, 19 Jan 2023 13:07:26 +0800 Subject: [PATCH] Modify remove @Keep in all beans and add @SerializedName in AppErrorsInfoBean --- .../bean/AppErrorsDisplayBean.kt | 19 +++++----- .../bean/AppErrorsInfoBean.kt | 38 ++++++++++++------- .../apperrorstracking/bean/AppFiltersBean.kt | 5 +-- .../apperrorstracking/bean/AppInfoBean.kt | 7 ++-- .../bean/MutedErrorsAppBean.kt | 5 +-- 5 files changed, 41 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsDisplayBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsDisplayBean.kt index dc1158c..898446b 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsDisplayBean.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsDisplayBean.kt @@ -21,7 +21,6 @@ */ package com.fankes.apperrorstracking.bean -import androidx.annotation.Keep import java.io.Serializable /** @@ -37,13 +36,13 @@ import java.io.Serializable * @param isShowReopenButton 是否显示重新打开按钮 */ data class AppErrorsDisplayBean( - @Keep var pid: Int, - @Keep var userId: Int, - @Keep var packageName: String, - @Keep var processName: String, - @Keep var appName: String, - @Keep var title: String, - @Keep var isShowAppInfoButton: Boolean, - @Keep var isShowCloseAppButton: Boolean, - @Keep var isShowReopenButton: Boolean + var pid: Int, + var userId: Int, + var packageName: String, + var processName: String, + var appName: String, + var title: String, + var isShowAppInfoButton: Boolean, + var isShowCloseAppButton: Boolean, + var isShowReopenButton: Boolean ) : Serializable \ No newline at end of file diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt index 96d5ce1..cbaee0e 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt @@ -23,10 +23,10 @@ package com.fankes.apperrorstracking.bean import android.app.ApplicationErrorReport import android.os.Build -import androidx.annotation.Keep import com.fankes.apperrorstracking.locale.LocaleString import com.fankes.apperrorstracking.utils.factory.difference import com.fankes.apperrorstracking.utils.factory.toUtcTime +import com.google.gson.annotations.SerializedName import java.io.Serializable import java.text.SimpleDateFormat import java.util.* @@ -47,18 +47,30 @@ import java.util.* * @param timestamp 记录时间戳 */ data class AppErrorsInfoBean( - @Keep var pid: Int = -1, - @Keep var userId: Int = -1, - @Keep var packageName: String = "", - @Keep var isNativeCrash: Boolean = false, - @Keep var exceptionClassName: String = "", - @Keep var exceptionMessage: String = "", - @Keep var throwFileName: String = "", - @Keep var throwClassName: String = "", - @Keep var throwMethodName: String = "", - @Keep var throwLineNumber: Int = -1, - @Keep var stackTrace: String = "", - @Keep var timestamp: Long = -1L + @SerializedName("pid") + var pid: Int = -1, + @SerializedName("userId") + var userId: Int = -1, + @SerializedName("packageName") + var packageName: String = "", + @SerializedName("isNativeCrash") + var isNativeCrash: Boolean = false, + @SerializedName("exceptionClassName") + var exceptionClassName: String = "", + @SerializedName("exceptionMessage") + var exceptionMessage: String = "", + @SerializedName("throwFileName") + var throwFileName: String = "", + @SerializedName("throwClassName") + var throwClassName: String = "", + @SerializedName("throwMethodName") + var throwMethodName: String = "", + @SerializedName("throwLineNumber") + var throwLineNumber: Int = -1, + @SerializedName("stackTrace") + var stackTrace: String = "", + @SerializedName("timestamp") + var timestamp: Long = -1L ) : Serializable { companion object { diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppFiltersBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppFiltersBean.kt index 4fd33dd..cc3a742 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppFiltersBean.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppFiltersBean.kt @@ -21,7 +21,6 @@ */ package com.fankes.apperrorstracking.bean -import androidx.annotation.Keep import java.io.Serializable /** @@ -30,6 +29,6 @@ import java.io.Serializable * @param isContainsSystem 是否包含系统应用 */ data class AppFiltersBean( - @Keep var name: String = "", - @Keep var isContainsSystem: Boolean = false + var name: String = "", + var isContainsSystem: Boolean = false ) : Serializable \ No newline at end of file diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppInfoBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppInfoBean.kt index 269c06b..ecbd95b 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppInfoBean.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppInfoBean.kt @@ -22,7 +22,6 @@ package com.fankes.apperrorstracking.bean import android.graphics.drawable.Drawable -import androidx.annotation.Keep import java.io.Serializable /** @@ -32,7 +31,7 @@ import java.io.Serializable * @param packageName APP 包名 */ data class AppInfoBean( - @Keep var icon: Drawable? = null, - @Keep var name: String, - @Keep var packageName: String + var icon: Drawable? = null, + var name: String, + var packageName: String ) : Serializable \ No newline at end of file diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/MutedErrorsAppBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/MutedErrorsAppBean.kt index 84bd0a6..a20bb47 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/bean/MutedErrorsAppBean.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/bean/MutedErrorsAppBean.kt @@ -21,7 +21,6 @@ */ package com.fankes.apperrorstracking.bean -import androidx.annotation.Keep import java.io.Serializable /** @@ -30,8 +29,8 @@ import java.io.Serializable * @param packageName 包名 */ data class MutedErrorsAppBean( - @Keep var type: MuteType, - @Keep var packageName: String + var type: MuteType, + var packageName: String ) : Serializable { /**