diff --git a/app/src/main/java/com/idormy/sms/forwarder/database/entity/Rule.kt b/app/src/main/java/com/idormy/sms/forwarder/database/entity/Rule.kt index c5a66d0e..8707069f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/database/entity/Rule.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/database/entity/Rule.kt @@ -119,11 +119,7 @@ data class Rule( val name: String get() { val sb = StringBuilder() - when (type) { - "app" -> sb.append("[").append(getString(R.string.type_param_app)).append("]") - "call" -> sb.append("[").append(getString(R.string.type_param_call)).append("]").append(SIM_SLOT_MAP[simSlot].toString()).append(getString(R.string.rule_card)) - else -> sb.append("[").append(getString(R.string.type_param_sms)).append("]").append(SIM_SLOT_MAP[simSlot].toString()).append(getString(R.string.rule_card)) - } + if (type == "call" || type == "sms") sb.append(SIM_SLOT_MAP[simSlot].toString()).append(getString(R.string.rule_card)) when (filed) { FILED_TRANSPOND_ALL -> sb.append(getString(R.string.rule_all_fw_to)) FILED_CALL_TYPE -> sb.append(getString(R.string.rule_when) + FILED_MAP[filed] + CHECK_MAP[check] + CALL_TYPE_MAP[value] + getString(R.string.rule_fw_to)) diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/action/FrpcSetting.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/action/FrpcSetting.kt index 60ea3274..e3c20f8f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/entity/action/FrpcSetting.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/entity/action/FrpcSetting.kt @@ -1,9 +1,10 @@ package com.idormy.sms.forwarder.entity.action +import com.idormy.sms.forwarder.database.entity.Frpc import java.io.Serializable data class FrpcSetting( var description: String = "", //描述 var action: String = "start", //动作: start=启动, stop=停止 - var uids: String = "", //指定配置UID,多个以半角逗号分隔 + var frpcList: List, //Frpc列表 ) : Serializable