From 096043331cf8e545a3b59385229c2a9826b2e73f Mon Sep 17 00:00:00 2001 From: Yenaly <2021214976@stu.cqupt.edu.cn> Date: Sat, 18 May 2024 17:33:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E6=90=9C=E7=B4=A2=E6=97=B6=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yenaly/han1meviewer/ui/activity/SearchActivity.kt | 8 ++++---- .../ui/adapter/HanimeSearchHistoryRvAdapter.kt | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt index 232bbc2a..0e384292 100644 --- a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt +++ b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt @@ -187,12 +187,12 @@ class SearchActivity : YenalyActivity(), } val searchAdapter = HanimeSearchHistoryRvAdapter() searchAdapter.listener = object : HanimeSearchHistoryRvAdapter.OnItemViewClickListener { - override fun onItemClickListener(v: View, history: SearchHistoryEntity) { - binding.searchBar.searchText = history.query + override fun onItemClickListener(v: View, history: SearchHistoryEntity?) { + binding.searchBar.searchText = history?.query } - override fun onItemRemoveListener(v: View, history: SearchHistoryEntity) { - viewModel.deleteSearchHistory(history) + override fun onItemRemoveListener(v: View, history: SearchHistoryEntity?) { + history?.let(viewModel::deleteSearchHistory) } } binding.searchBar.apply hsb@{ diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/HanimeSearchHistoryRvAdapter.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/HanimeSearchHistoryRvAdapter.kt index e675f09d..a9605ecb 100644 --- a/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/HanimeSearchHistoryRvAdapter.kt +++ b/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/HanimeSearchHistoryRvAdapter.kt @@ -58,20 +58,21 @@ class HanimeSearchHistoryRvAdapter : ): QuickViewHolder { return QuickViewHolder(R.layout.item_search_history, parent).also { viewHolder -> viewHolder.getView(R.id.btn_remove).setOnClickListener { + // #issue-142: 部分机型调用 getItem().notNull() 可能会报错 listener?.onItemRemoveListener( - it, getItem(viewHolder.bindingAdapterPosition).notNull() + it, getItem(viewHolder.bindingAdapterPosition) ) } viewHolder.getView(R.id.root).setOnClickListener { listener?.onItemClickListener( - it, getItem(viewHolder.bindingAdapterPosition).notNull() + it, getItem(viewHolder.bindingAdapterPosition) ) } } } interface OnItemViewClickListener { - fun onItemClickListener(v: View, history: SearchHistoryEntity) - fun onItemRemoveListener(v: View, history: SearchHistoryEntity) + fun onItemClickListener(v: View, history: SearchHistoryEntity?) + fun onItemRemoveListener(v: View, history: SearchHistoryEntity?) } } \ No newline at end of file