mirror of
https://github.com/pppscn/SmsForwarder
synced 2025-08-02 17:07:41 +08:00
新增：bark通道的持续提醒功能 #528
This commit is contained in:
pppscn
parent
66831865cb
commit
785a3a2364
@ -3,7 +3,7 @@
|
||||
"Data": [
|
||||
{
|
||||
"title": "短信转发器",
|
||||
"content": "本软件用于监控Android手机短信、来电、APP通知，并根据指定规则转发到其他设备！<br />\n请确认是否您是否清楚该软件的用途？！<br />\n否则，请立即卸载！"
|
||||
"content": "本软件用于监控Android手机短信、来电、APP通知，并根据指定规则转发到其他设备！<br />\n请确认您是否清楚该软件的用途？！<br />\n否则，请立即卸载！"
|
||||
},
|
||||
{
|
||||
"title": "防诈提醒",
|
||||
|
||||
@ -25,4 +25,6 @@ data class BarkSetting(
|
||||
val key: String = "",
|
||||
//初始偏移向量
|
||||
val iv: String = "",
|
||||
//持续提醒
|
||||
val call: String = "",
|
||||
) : Serializable
|
||||
@ -156,6 +156,7 @@ class BarkFragment : BaseFragment<FragmentSendersBarkBinding?>(), 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<FragmentSendersBarkBinding?>(), 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<FragmentSendersBarkBinding?>(), 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() {
|
||||
|
||||
@ -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("(?<!回复)(验证码|授权码|校验码|检验码|确认码|激活码|动态码|安全码|(验证)?代码|校验代码|检验代码|激活代码|确认代码|动态代码|安全代码|登入码|认证码|识别码|短信口令|动态密码|交易码|上网密码|动态口令|随机码|驗證碼|授權碼|校驗碼|檢驗碼|確認碼|激活碼|動態碼|(驗證)?代碼|校驗代碼|檢驗代碼|確認代碼|激活代碼|動態代碼|登入碼|認證碼|識別碼|一次性密码|[Cc][Oo][Dd][Ee]|[Vv]erification)")
|
||||
@ -76,7 +77,7 @@ class BarkUtils {
|
||||
code = code.replace("\\D*[\\(（\\[【{「]?([0-9]{3}\\s?[0-9]{1,3})[」}】\\]）\\)]?(?=.*((代|授权|验证|动态|校验)码|[【\\[].*[】\\]]|[Cc][Oo][Dd][Ee]|[Vv]erification\\s?([Cc]ode)?))(.*)".toRegex(), "$1").trim()
|
||||
if (code.isNotEmpty()) {
|
||||
msgMap["copy"] = code
|
||||
msgMap["automaticallyCopy"] = 1
|
||||
msgMap["autoCopy"] = 1
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -140,6 +140,28 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
style="@style/BarStyle.Switch"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="3"
|
||||
android:text="@string/bark_call"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<com.xuexiang.xui.widget.button.switchbutton.SwitchButton
|
||||
android:id="@+id/sb_call"
|
||||
style="@style/SwitchButtonStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:checked="true" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
style="@style/BarStyle"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -540,6 +540,7 @@
|
||||
<string name="bark_group_tips">Opt., e.g. SmsForwarder</string>
|
||||
<string name="bark_icon">Message Icon</string>
|
||||
<string name="bark_icon_tips">Opt., fill in Url, the picture should not be too big</string>
|
||||
<string name="bark_call">Keep Reminding</string>
|
||||
<string name="bark_sound">Message Sound</string>
|
||||
<string name="bark_sound_tips">Opt., e.g. minuet.caf</string>
|
||||
<string name="bark_badge">Message Badge</string>
|
||||
|
||||
@ -541,6 +541,7 @@
|
||||
<string name="bark_group_tips">可选，例：短信转发器</string>
|
||||
<string name="bark_icon">消息图标</string>
|
||||
<string name="bark_icon_tips">可选，填写Url，图片不要太大</string>
|
||||
<string name="bark_call">持续提醒</string>
|
||||
<string name="bark_sound">消息声音</string>
|
||||
<string name="bark_sound_tips">可选，例：minuet.caf</string>
|
||||
<string name="bark_badge">消息角标</string>
|
||||
|
||||
@ -541,6 +541,7 @@
|
||||
<string name="bark_group_tips">可選，例：簡訊轉發器</string>
|
||||
<string name="bark_icon">消息圖標</string>
|
||||
<string name="bark_icon_tips">可選，填寫Url，圖片不要太大</string>
|
||||
<string name="bark_call">持續提醒</string>
|
||||
<string name="bark_sound">消息聲音</string>
|
||||
<string name="bark_sound_tips">可選，例：minuet.caf</string>
|
||||
<string name="bark_badge">消息角標</string>
|
||||
|
||||
@ -568,6 +568,7 @@
|
||||
<string name="bark_group_tips">可选，例：短信转发器</string>
|
||||
<string name="bark_icon">消息图标</string>
|
||||
<string name="bark_icon_tips">可选，填写Url，图片不要太大</string>
|
||||
<string name="bark_call">持续提醒</string>
|
||||
<string name="bark_sound">消息声音</string>
|
||||
<string name="bark_sound_tips">可选，例：minuet.caf</string>
|
||||
<string name="bark_badge">消息角标</string>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user