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