From a8768540101a101ccc7e8620c0bca4995b61ebf5 Mon Sep 17 00:00:00 2001 From: ZQDesigned <2990918167@QQ.COM> Date: Wed, 21 Jun 2023 01:32:06 +0800 Subject: [PATCH] Revert some changes and Refactor code style again --- .../ui/activity/errors/AppErrorsDetailActivity.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsDetailActivity.kt b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsDetailActivity.kt index 6bb1505..6664f92 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsDetailActivity.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsDetailActivity.kt @@ -62,8 +62,7 @@ class AppErrorsDetailActivity : BaseActivity() { private var stackTrace = "" override fun onCreate() { - if (intent.parseAppErrorsInfo().not()) return - + if (initUi(intent).not()) return binding.titleBackIcon.setOnClickListener { onBackPressed() } binding.disableAutoWrapErrorStackTraceSwitch.bind(ConfigData.DISABLE_AUTO_WRAP_ERROR_STACK_TRACE) { onInitialize { @@ -82,12 +81,10 @@ class AppErrorsDetailActivity : BaseActivity() { /** * 从 [Intent] 中解析 [AppErrorsInfoBean] 并加载至界面 * - * @receiver [Intent] 待解析的 [Intent] 实例 - * - * @return [Boolean] 是否解析成功：true为成功；false为失败，可能是 [Intent] 为空或者 [AppErrorsInfoBean] 为空 + * @return [Boolean] 是否解析成功：true 为成功；false 为失败，可能是 [Intent] 为空或者 [AppErrorsInfoBean] 为空 */ - private fun Intent?.parseAppErrorsInfo(): Boolean { - val appErrorsInfo = runCatching { this?.getSerializableExtraCompat(EXTRA_APP_ERRORS_INFO) }.getOrNull() + private fun initUi(intent: Intent?): Boolean { + val appErrorsInfo = runCatching { intent?.getSerializableExtraCompat(EXTRA_APP_ERRORS_INFO) }.getOrNull() if (appErrorsInfo == null) { toastAndFinish(name = "AppErrorsInfo") return false @@ -179,9 +176,9 @@ class AppErrorsDetailActivity : BaseActivity() { intent?.removeExtra(EXTRA_APP_ERRORS_INFO) finish() } + override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) - if (intent.parseAppErrorsInfo()) binding.appPanelScrollView.scrollTo(0, 0) + if (initUi(intent)) binding.appPanelScrollView.scrollTo(0, 0) } - } \ No newline at end of file