From 785a3a2364166764eae2b35f266a0abb4733de02 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Tue, 1 Oct 2024 23:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A`bark`=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E7=9A=84`=E6=8C=81=E7=BB=AD=E6=8F=90=E9=86=92`?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20#528?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/tips.json                 |  2 +-
 .../forwarder/entity/setting/BarkSetting.kt   |  2 ++
 .../fragment/senders/BarkFragment.kt          |  4 +++-
 .../sms/forwarder/utils/sender/BarkUtils.kt   |  3 ++-
 .../main/res/layout/fragment_senders_bark.xml | 22 +++++++++++++++++++
 app/src/main/res/values-en/strings.xml        |  1 +
 app/src/main/res/values-zh-rCN/strings.xml    |  1 +
 app/src/main/res/values-zh-rTW/strings.xml    |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 9 files changed, 34 insertions(+), 3 deletions(-)

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通知，并根据指定规则转发到其他设备！<br />\n请确认是否您是否清楚该软件的用途？！<br />\n否则，请立即卸载！"
+      "content": "本软件用于监控Android手机短信、来电、APP通知，并根据指定规则转发到其他设备！<br />\n请确认您是否清楚该软件的用途？！<br />\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<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() {
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("(?<!回复)(验证码|授权码|校验码|检验码|确认码|激活码|动态码|安全码|(验证)?代码|校验代码|检验代码|激活代码|确认代码|动态代码|安全代码|登入码|认证码|识别码|短信口令|动态密码|交易码|上网密码|动态口令|随机码|驗證碼|授權碼|校驗碼|檢驗碼|確認碼|激活碼|動態碼|(驗證)?代碼|校驗代碼|檢驗代碼|確認代碼|激活代碼|動態代碼|登入碼|認證碼|識別碼|一次性密码|[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
                 }
             }
 
diff --git a/app/src/main/res/layout/fragment_senders_bark.xml b/app/src/main/res/layout/fragment_senders_bark.xml
index 35bc3123..d92459d3 100644
--- a/app/src/main/res/layout/fragment_senders_bark.xml
+++ b/app/src/main/res/layout/fragment_senders_bark.xml
@@ -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"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 6260823e..cf8b3cc0 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -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>
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 @@
     <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>
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 @@
     <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>
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 @@
     <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>