diff --git a/app/src/main/assets/tips.json b/app/src/main/assets/tips.json index 6c5be705..d5d889d2 100644 --- a/app/src/main/assets/tips.json +++ b/app/src/main/assets/tips.json @@ -3,7 +3,7 @@ "Data": [ { "title": "短信转发器", - "content": "本软件用于监控Android手机短信、来电、APP通知,并根据指定规则转发到其他设备!
\n请确认是否您是否清楚该软件的用途?!
\n否则,请立即卸载!" + "content": "本软件用于监控Android手机短信、来电、APP通知,并根据指定规则转发到其他设备!
\n请确认您是否清楚该软件的用途?!
\n否则,请立即卸载!" }, { "title": "防诈提醒", diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/setting/BarkSetting.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/setting/BarkSetting.kt index 45a92717..7165182a 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/entity/setting/BarkSetting.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/entity/setting/BarkSetting.kt @@ -25,4 +25,6 @@ data class BarkSetting( val key: String = "", //初始偏移向量 val iv: String = "", + //持续提醒 + val call: String = "", ) : Serializable \ No newline at end of file diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt index c5c3b67a..005d378f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt @@ -156,6 +156,7 @@ class BarkFragment : BaseFragment(), View.OnClickLi binding!!.etServer.setText(settingVo.server) binding!!.etGroup.setText(settingVo.group) binding!!.etIcon.setText(settingVo.icon) + binding!!.sbCall.isChecked = settingVo.call == "1" binding!!.etSound.setText(settingVo.sound) binding!!.etBadge.setText(settingVo.badge) binding!!.etUrl.setText(settingVo.url) @@ -281,6 +282,7 @@ class BarkFragment : BaseFragment(), View.OnClickLi if (!CommonUtils.checkUrl(icon, true)) { throw Exception(getString(R.string.invalid_bark_icon)) } + val call = if (binding!!.sbCall.isChecked) "1" else "0" val sound = binding!!.etSound.text.toString().trim() val badge = binding!!.etBadge.text.toString().trim() val url = binding!!.etUrl.text.toString().trim() @@ -301,7 +303,7 @@ class BarkFragment : BaseFragment(), View.OnClickLi throw Exception(getString(R.string.bark_encryption_key_error4)) } - return BarkSetting(server, group, icon, sound, badge, url, barkLevel, title, transformation, key, iv) + return BarkSetting(server, group, icon, sound, badge, url, barkLevel, title, transformation, key, iv, call) } override fun onDestroyView() { diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/BarkUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/BarkUtils.kt index 4f007c6f..b8968196 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/BarkUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/BarkUtils.kt @@ -68,6 +68,7 @@ class BarkUtils { if (!TextUtils.isEmpty(setting.sound)) msgMap["sound"] = setting.sound if (!TextUtils.isEmpty(setting.badge)) msgMap["badge"] = setting.badge if (!TextUtils.isEmpty(setting.url)) msgMap["url"] = setting.url + if (!TextUtils.isEmpty(setting.call)) msgMap["call"] = setting.call //自动复制验证码 val pattern = Regex("(? + + + + + + + + Opt., e.g. SmsForwarder Message Icon Opt., fill in Url, the picture should not be too big + Keep Reminding Message Sound Opt., e.g. minuet.caf Message Badge diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a8540ac4..1cc9cc1e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -541,6 +541,7 @@ 可选,例:短信转发器 消息图标 可选,填写Url,图片不要太大 + 持续提醒 消息声音 可选,例:minuet.caf 消息角标 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cca6f4f0..d7f84847 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -541,6 +541,7 @@ 可選,例:簡訊轉發器 消息圖標 可選,填寫Url,圖片不要太大 + 持續提醒 消息聲音 可選,例:minuet.caf 消息角標 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 821268a1..a2442821 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -568,6 +568,7 @@ 可选,例:短信转发器 消息图标 可选,填写Url,图片不要太大 + 持续提醒 消息声音 可选,例:minuet.caf 消息角标