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

整理：APP通知转发规则描述去掉任意卡 #516

Browse Source
This commit is contained in:
pppscn 2024-08-15 13:56:36 +08:00
parent a83f0da45a
commit 573174feea
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/idormy/sms/forwarder/database/entity/Rule.kt
View File

@ -59,10 +59,10 @@ data class Rule(
companion object { companion object {
val TAG: String = Rule::class.java.simpleName val TAG: String = Rule::class.java.simpleName
fun getRuleMatch(filed: String?, check: String?, value: String?, simSlot: String?, senderList: List<Sender>? = null): String { fun getRuleMatch(type: String?, filed: String?, check: String?, value: String?, simSlot: String?, senderList: List<Sender>? = null): String {
val blank = if (App.isNeedSpaceBetweenWords) " " else "" val blank = if (App.isNeedSpaceBetweenWords) " " else ""
val sb = StringBuilder() val sb = StringBuilder()
sb.append(SIM_SLOT_MAP[simSlot]).append(blank).append(getString(R.string.rule_card)).append(blank) if (type != "app") sb.append(SIM_SLOT_MAP[simSlot]).append(blank).append(getString(R.string.rule_card)).append(blank)
when (filed) { when (filed) {
null, FILED_TRANSPOND_ALL -> sb.append(getString(R.string.rule_all_fw_to)) null, FILED_TRANSPOND_ALL -> sb.append(getString(R.string.rule_all_fw_to))
FILED_CALL_TYPE -> sb.append(getString(R.string.rule_when)) FILED_CALL_TYPE -> sb.append(getString(R.string.rule_when))
@ -127,9 +127,9 @@ data class Rule(
fun getName(appendSenderList: Boolean = true): String { fun getName(appendSenderList: Boolean = true): String {
return if (appendSenderList) { return if (appendSenderList) {
getRuleMatch(filed, check, value, simSlot, senderList) getRuleMatch(type, filed, check, value, simSlot, senderList)
} else { } else {
getRuleMatch(filed, check, value, simSlot, null) getRuleMatch(type, filed, check, value, simSlot, null)
} }
} }

2
app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt
View File

@ -188,7 +188,7 @@ class LogsFragment : BaseFragment<FragmentLogsBinding?>(), MsgPagingAdapter.OnIt
override fun onLogsClicked(view: View?, item: LogsDetail) { override fun onLogsClicked(view: View?, item: LogsDetail) {
Log.d(TAG, "item: $item") Log.d(TAG, "item: $item")
val ruleStr = StringBuilder() val ruleStr = StringBuilder()
ruleStr.append(Rule.getRuleMatch(item.ruleFiled, item.ruleCheck, item.ruleValue, item.ruleSimSlot)).append(item.senderName) ruleStr.append(Rule.getRuleMatch(item.type, item.ruleFiled, item.ruleCheck, item.ruleValue, item.ruleSimSlot)).append(item.senderName)
val detailStr = StringBuilder() val detailStr = StringBuilder()
detailStr.append(getString(R.string.rule)).append(ruleStr.toString()).append("\n\n") detailStr.append(getString(R.string.rule)).append(ruleStr.toString()).append("\n\n")
@SuppressLint("SimpleDateFormat") val utcFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) @SuppressLint("SimpleDateFormat") val utcFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())