littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-03 01:17:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复：下拉选择框关键字模糊匹配BUG

Browse Source
This commit is contained in:
pppscn 2022-06-07 18:20:10 +08:00
parent 0c5268cc46
commit 3887822962
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/AppListSpinnerAdapter.kt
View File

@ -150,4 +150,8 @@ class AppListSpinnerAdapter<T> : BaseEditSpinnerAdapter<T>, EditSpinnerFilter {
} }
} }
} }
fun getItemSource(position: Int): T {
return mDataSource[mIndexs[position]]
}
} }

4
app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/SenderSpinnerAdapter.kt
View File

@ -160,4 +160,8 @@ class SenderSpinnerAdapter<T> : BaseEditSpinnerAdapter<T>, EditSpinnerFilter {
} }
} }
} }
fun getItemSource(position: Int): T {
return mDataSource[mIndexs[position]]
}
} }

41
app/src/main/java/com/idormy/sms/forwarder/fragment/RulesEditFragment.kt
View File

@ -42,7 +42,7 @@ import kotlinx.coroutines.launch
import java.util.* import java.util.*
@Page(name = "转发规则·编辑器") @Page(name = "转发规则·编辑器")
@Suppress("PrivatePropertyName") @Suppress("PrivatePropertyName", "CAST_NEVER_SUCCEEDS")
class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClickListener, CompoundButton.OnCheckedChangeListener { class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClickListener, CompoundButton.OnCheckedChangeListener {
private val TAG: String = RulesEditFragment::class.java.simpleName private val TAG: String = RulesEditFragment::class.java.simpleName
@ -54,9 +54,11 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
//发送通道列表 //发送通道列表
private val senderSpinnerList = ArrayList<SenderAdapterItem>() private val senderSpinnerList = ArrayList<SenderAdapterItem>()
private lateinit var senderSpinnerAdapter: SenderSpinnerAdapter<*>
//已安装App信息列表 //已安装App信息列表
private val appListSpinnerList = ArrayList<AppListAdapterItem>() private val appListSpinnerList = ArrayList<AppListAdapterItem>()
private lateinit var appListSpinnerAdapter: AppListSpinnerAdapter<*>
@JvmField @JvmField
@AutoWired(name = KEY_RULE_ID) @AutoWired(name = KEY_RULE_ID)
@ -293,14 +295,13 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
for (sender in senderList) { for (sender in senderList) {
senderSpinnerList.add(SenderAdapterItem(sender.name, sender.imageId, sender.id, sender.status)) senderSpinnerList.add(SenderAdapterItem(sender.name, sender.imageId, sender.id, sender.status))
} }
binding!!.spSender.setAdapter( senderSpinnerAdapter = SenderSpinnerAdapter(senderSpinnerList)
SenderSpinnerAdapter(senderSpinnerList) //.setTextColor(ResUtils.getColor(R.color.green))
//.setTextColor(ResUtils.getColor(R.color.green)) //.setTextSize(12F)
//.setTextSize(12F) .setIsFilterKey(true)
.setIsFilterKey(true) .setFilterColor("#EF5362")
.setFilterColor("#FFFF00") .setBackgroundSelector(R.drawable.selector_custom_spinner_bg)
.setBackgroundSelector(R.drawable.selector_custom_spinner_bg) binding!!.spSender.setAdapter(senderSpinnerAdapter)
)
if (senderId > 0) { if (senderId > 0) {
for (sender in senderSpinnerList) { for (sender in senderSpinnerList) {
@ -322,11 +323,11 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
}) })
binding!!.spSender.setOnItemClickListener { _: AdapterView<*>, _: View, position: Int, _: Long -> binding!!.spSender.setOnItemClickListener { _: AdapterView<*>, _: View, position: Int, _: Long ->
try { try {
val sender = senderSpinnerList[position] //val sender = senderSpinnerList[position]
val sender = senderSpinnerAdapter.getItemSource(position) as SenderAdapterItem
sender.id.also { sender.id.also {
senderId = it ?: 0L senderId = it ?: 0L
} }
XToastUtils.toast(sender.title)
binding!!.ivSenderImage.setImageDrawable(sender.icon) binding!!.ivSenderImage.setImageDrawable(sender.icon)
binding!!.ivSenderStatus.setImageDrawable( binding!!.ivSenderStatus.setImageDrawable(
ResUtils.getDrawable( ResUtils.getDrawable(
@ -362,17 +363,17 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
for (appInfo in App.AppInfoList) { for (appInfo in App.AppInfoList) {
appListSpinnerList.add(AppListAdapterItem(appInfo.name, appInfo.icon, appInfo.packageName)) appListSpinnerList.add(AppListAdapterItem(appInfo.name, appInfo.icon, appInfo.packageName))
} }
binding!!.spApp.setAdapter( appListSpinnerAdapter = AppListSpinnerAdapter(appListSpinnerList)
AppListSpinnerAdapter(appListSpinnerList) //.setTextColor(ResUtils.getColor(R.color.green))
//.setTextColor(ResUtils.getColor(R.color.green)) //.setTextSize(12F)
//.setTextSize(12F) .setIsFilterKey(true)
.setIsFilterKey(true) .setFilterColor("#EF5362")
.setFilterColor("#FFFF00") .setBackgroundSelector(R.drawable.selector_custom_spinner_bg)
.setBackgroundSelector(R.drawable.selector_custom_spinner_bg) binding!!.spApp.setAdapter(appListSpinnerAdapter)
)
binding!!.spApp.setOnItemClickListener { _: AdapterView<*>, _: View, position: Int, _: Long -> binding!!.spApp.setOnItemClickListener { _: AdapterView<*>, _: View, position: Int, _: Long ->
try { try {
val appInfo = appListSpinnerList[position] //val appInfo = appListSpinnerList[position]
val appInfo = appListSpinnerAdapter.getItemSource(position) as AppListAdapterItem
CommonUtils.insertOrReplaceText2Cursor(binding!!.etValue, appInfo.packageName.toString()) CommonUtils.insertOrReplaceText2Cursor(binding!!.etValue, appInfo.packageName.toString())
} catch (e: Exception) { } catch (e: Exception) {
XToastUtils.error(e.message.toString()) XToastUtils.error(e.message.toString())