From c9409082ea41e48ce6272c058154f8b7c247e57d Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Sat, 25 Sep 2021 22:57:29 +0800 Subject: [PATCH] =?UTF-8?q?Bark=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=88=86=E7=BB=84=EF=BC=88=E5=8F=91=E9=80=81=E6=96=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=BD=9C=E4=B8=BA=E5=88=86=E7=BB=84=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 ++ app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java | 2 +- .../main/java/com/idormy/sms/forwarder/sender/SendUtil.java | 2 +- .../java/com/idormy/sms/forwarder/sender/SenderBarkMsg.java | 3 ++- app/src/main/res/layout/alert_dialog_setview_bark.xml | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 514bffe8..c65a3e78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -87,6 +87,8 @@ dependencies { //EmailKit implementation 'com.github.mailhu:emailkit:4.2.2' + implementation 'androidx.test.ext:junit-ktx:1.1.2' + testImplementation 'junit:junit:4.12' //Lombok compileOnly 'org.projectlombok:lombok:1.18.20' diff --git a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java index 924b96df..d67e53aa 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java @@ -554,7 +554,7 @@ public class SenderActivity extends AppCompatActivity { String barkServer = editTextBarkServer.getText().toString(); if (!barkServer.isEmpty()) { try { - SenderBarkMsg.sendMsg(0, handler, barkServer, "19999999999", "【京东】验证码为387481（切勿将验证码告知他人），请在页面中输入完成验证，如有问题请点击 ihelp.jd.com 联系京东客服"); + SenderBarkMsg.sendMsg(0, handler, barkServer, "19999999999", "【京东】验证码为387481（切勿将验证码告知他人），请在页面中输入完成验证，如有问题请点击 ihelp.jd.com 联系京东客服", "测试分组"); } catch (Exception e) { Toast.makeText(SenderActivity.this, "发送失败：" + e.getMessage(), Toast.LENGTH_LONG).show(); e.printStackTrace(); diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java index c6a1b75d..26b62a16 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java @@ -143,7 +143,7 @@ public class SendUtil { BarkSettingVo barkSettingVo = JSON.parseObject(senderModel.getJsonSetting(), BarkSettingVo.class); if (barkSettingVo != null) { try { - SenderBarkMsg.sendMsg(logId, handError, barkSettingVo.getServer(), smsVo.getMobile(), smsVo.getSmsVoForSend()); + SenderBarkMsg.sendMsg(logId, handError, barkSettingVo.getServer(), smsVo.getMobile(), smsVo.getSmsVoForSend(), senderModel.getName()); } catch (Exception e) { LogUtil.updateLog(logId, 0, e.getMessage()); Log.e(TAG, "senderSendMsg: SenderBarkMsg error " + e.getMessage()); diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderBarkMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderBarkMsg.java index 663d908a..8a0bc5ed 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderBarkMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderBarkMsg.java @@ -24,7 +24,7 @@ public class SenderBarkMsg { static String TAG = "SenderBarkMsg"; - public static void sendMsg(final long logId, final Handler handError, String barkServer, String from, String content) throws Exception { + public static void sendMsg(final long logId, final Handler handError, String barkServer, String from, String content, String groupName) throws Exception { Log.i(TAG, "sendMsg barkServer:" + barkServer + " from:" + from + " content:" + content); if (barkServer == null || barkServer.isEmpty()) { @@ -37,6 +37,7 @@ public class SenderBarkMsg { barkServer += URLEncoder.encode(from, "UTF-8"); barkServer += "/" + URLEncoder.encode(content, "UTF-8"); barkServer += "?isArchive=1"; //自动保存 + barkServer += "&group=" + URLEncoder.encode(groupName, "UTF-8"); //增加支持分组 int isCode = content.indexOf("验证码"); int isPassword = content.indexOf("动态密码"); if (isCode != -1 || isPassword != -1) { diff --git a/app/src/main/res/layout/alert_dialog_setview_bark.xml b/app/src/main/res/layout/alert_dialog_setview_bark.xml index 0a3c23f2..add4cb89 100644 --- a/app/src/main/res/layout/alert_dialog_setview_bark.xml +++ b/app/src/main/res/layout/alert_dialog_setview_bark.xml @@ -18,7 +18,7 @@ + android:text="设置分组名称" />