diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt index fff97513..456789f2 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt @@ -39,13 +39,17 @@ data class MsgInfo( if (TextUtils.isEmpty(template)) template = getString(R.string.tag_from) val deviceMark = extraDeviceMark.trim() val versionName = AppUtils.getAppVersionName() + val splitSimInfo = simInfo.split("#####") + val title = splitSimInfo.getOrElse(0) { simInfo } + val schema = splitSimInfo.getOrElse(1) { "" } val titleForSend: String = template.replace(getString(R.string.tag_from), from) .replace(getString(R.string.tag_package_name), from) .replace(getString(R.string.tag_sms), content) .replace(getString(R.string.tag_msg), content) - .replace(getString(R.string.tag_card_slot), simInfo) + .replace(getString(R.string.tag_card_slot), title) .replace(getString(R.string.tag_card_subid), subId.toString()) - .replace(getString(R.string.tag_title), simInfo) + .replace(getString(R.string.tag_title), title) + .replace(getString(R.string.tag_schema), schema) .replace(getString(R.string.tag_receive_time), SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)) .replace(getString(R.string.tag_device_name), deviceMark) .replace(getString(R.string.tag_app_version), versionName) @@ -81,13 +85,17 @@ data class MsgInfo( } } val versionName = AppUtils.getAppVersionName() + val splitSimInfo = simInfo.split("#####") + val title = splitSimInfo.getOrElse(0) { simInfo } + val schema = splitSimInfo.getOrElse(1) { "" } val smsVoForSend: String = customSmsTemplate.replace(getString(R.string.tag_from), from) .replace(getString(R.string.tag_package_name), from) .replace(getString(R.string.tag_sms), content) .replace(getString(R.string.tag_msg), content) - .replace(getString(R.string.tag_card_slot), simInfo) + .replace(getString(R.string.tag_card_slot), title) .replace(getString(R.string.tag_card_subid), subId.toString()) - .replace(getString(R.string.tag_title), simInfo) + .replace(getString(R.string.tag_title), title) + .replace(getString(R.string.tag_schema), schema) .replace(getString(R.string.tag_receive_time), SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)) .replace(getString(R.string.tag_device_name), deviceMark) .replace(getString(R.string.tag_app_version), versionName) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt index 966edcad..41c10b41 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt @@ -105,8 +105,19 @@ class LogsFragment : BaseFragment(), MsgPagingAdapter.OnIt val detailStr = StringBuilder() detailStr.append(ResUtils.getString(R.string.from)).append(item.msg.from).append("\n\n") - detailStr.append(ResUtils.getString(R.string.msg)).append(item.msg.content).append("\n\n") - if (!TextUtils.isEmpty(item.msg.simInfo)) detailStr.append(ResUtils.getString(R.string.slot)).append(item.msg.simInfo).append("\n\n") + if (!TextUtils.isEmpty(item.msg.simInfo)) { + if (item.msg.type == "app") { + val splitSimInfo = item.msg.simInfo.split("#####") + val title = splitSimInfo.getOrElse(0) { item.msg.simInfo } + val schema = splitSimInfo.getOrElse(1) { "" } + detailStr.append(ResUtils.getString(R.string.title)).append(title).append("\n\n") + detailStr.append(ResUtils.getString(R.string.msg)).append(item.msg.content).append("\n\n") + if (!TextUtils.isEmpty(schema) && schema != "null") detailStr.append(ResUtils.getString(R.string.schema)).append(schema).append("\n\n") + } else { + detailStr.append(ResUtils.getString(R.string.msg)).append(item.msg.content).append("\n\n") + detailStr.append(ResUtils.getString(R.string.slot)).append(item.msg.simInfo).append("\n\n") + } + } @SuppressLint("SimpleDateFormat") val utcFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) detailStr.append(ResUtils.getString(R.string.time)).append(DateUtils.date2String(item.msg.time, utcFormatter)) diff --git a/app/src/main/java/com/idormy/sms/forwarder/service/NotifyService.kt b/app/src/main/java/com/idormy/sms/forwarder/service/NotifyService.kt index d4dfbf1f..ae10fedf 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/service/NotifyService.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/service/NotifyService.kt @@ -90,6 +90,12 @@ class NotifyService : NotificationListenerService() { if (text.isEmpty() && sbn.notification.tickerText != null) { text = sbn.notification.tickerText.toString() } + //通知Schema + val schema = sbn.notification.extras["android.template"].toString()//.substringBefore('/') + Log.d(TAG, "schema=$schema") + if (!TextUtils.isEmpty(schema)) { + title += "#####$schema" + } //不处理空消息(标题跟内容都为空) if (TextUtils.isEmpty(title) && TextUtils.isEmpty(text)) return diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 0753154d..52514274 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -571,6 +571,8 @@ Resend Rematch From: + Title: + Schema: Msg: Slot: Rule: @@ -590,6 +592,7 @@ {{DEVICE_NAME}} {{APP_VERSION}} {{TITLE}} + {{SCHEMA}} SMS CALL APP @@ -724,6 +727,12 @@ Only added to the notification list, no screen reminder Url format error + AES Key + Fill in 16 chars to enable push encryption + AES iv + Fill in 16 chars to enable push encryption + + AES Key and iv must be 16 characters Fill in the username before @ Fill in the format: AAA@BBB.CCC diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 171f20a8..1002307f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -572,6 +572,8 @@ 重发消息 重新匹配规则 来源: + 标题: + Schema: 消息: 卡槽: 规则: @@ -591,6 +593,7 @@ {{设备名称}} {{当前应用版本号}} {{通知标题}} + {{通知Schema}} 短信 来电 应用 @@ -725,6 +728,12 @@ 仅添加到通知列表,不会亮屏提醒 Url格式错误 + 加密密钥 + 填写16个字符,以启用推送加密 + 偏移向量 + 填写16个字符,以启用推送加密 + + 加密密钥和偏移向量必须同时是16个字符 填写 @ 前面的用户名 填写格式: AAA@BBB.CCC