From 881fa8ad7d7a86836ed122a5be9093193f1d6a9c Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 11 Feb 2021 21:19:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E5=B8=83?=
=?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sms/forwarder/model/SenderModel.java | 4 +-
.../activity_alter_dialog_setview_bark.xml | 20 ++---
...activity_alter_dialog_setview_dingding.xml | 44 +++++------
.../activity_alter_dialog_setview_email.xml | 78 +++++++++----------
...ty_alter_dialog_setview_qywxgrouprobot.xml | 20 ++---
.../activity_alter_dialog_setview_rule.xml | 15 ++--
...ctivity_alter_dialog_setview_webnotify.xml | 30 ++++---
app/src/main/res/values/array.xml | 4 +-
8 files changed, 104 insertions(+), 111 deletions(-)
diff --git a/app/src/main/java/com/idormy/sms/forwarder/model/SenderModel.java b/app/src/main/java/com/idormy/sms/forwarder/model/SenderModel.java
index 50ea41d1..cb2b011d 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/model/SenderModel.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/model/SenderModel.java
@@ -8,10 +8,10 @@ public class SenderModel {
public static final int STATUS_OFF = 0;
public static final int TYPE_DINGDING = 0;
public static final int TYPE_EMAIL = 1;
- public static final int TYPE_MESSAGE = 2;
+ public static final int TYPE_BARK = 2;
public static final int TYPE_WEB_NOTIFY = 3;
public static final int TYPE_QYWX_GROUP_ROBOT = 4;
- public static final int TYPE_BARK = 5;
+ public static final int TYPE_MESSAGE = 5;
private Long id;
private String name;
private int status;
diff --git a/app/src/main/res/layout/activity_alter_dialog_setview_bark.xml b/app/src/main/res/layout/activity_alter_dialog_setview_bark.xml
index 81120bf3..7809f846 100644
--- a/app/src/main/res/layout/activity_alter_dialog_setview_bark.xml
+++ b/app/src/main/res/layout/activity_alter_dialog_setview_bark.xml
@@ -7,20 +7,21 @@
@@ -28,21 +29,20 @@
-
@@ -50,13 +50,13 @@
@@ -64,7 +64,7 @@
android:id="@+id/buttonBarkDel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/del" />
@@ -72,7 +72,7 @@
android:id="@+id/buttonBarkTest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/test" />
diff --git a/app/src/main/res/layout/activity_alter_dialog_setview_dingding.xml b/app/src/main/res/layout/activity_alter_dialog_setview_dingding.xml
index fa6688cc..98952afe 100644
--- a/app/src/main/res/layout/activity_alter_dialog_setview_dingding.xml
+++ b/app/src/main/res/layout/activity_alter_dialog_setview_dingding.xml
@@ -7,20 +7,21 @@
@@ -28,21 +29,20 @@
-
@@ -51,21 +51,20 @@
-
@@ -73,21 +72,20 @@
-
@@ -95,33 +93,33 @@
+ android:text="是否@所有人" />
+ android:ems="14"
+ android:checked="false" />
@@ -129,7 +127,7 @@
android:id="@+id/buttondingdingdel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/del" />
@@ -137,7 +135,7 @@
android:id="@+id/buttondingdingtest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/test" />
diff --git a/app/src/main/res/layout/activity_alter_dialog_setview_email.xml b/app/src/main/res/layout/activity_alter_dialog_setview_email.xml
index 9ea3dbd1..98c38c4b 100644
--- a/app/src/main/res/layout/activity_alter_dialog_setview_email.xml
+++ b/app/src/main/res/layout/activity_alter_dialog_setview_email.xml
@@ -7,20 +7,21 @@
@@ -28,20 +29,21 @@
+ android:text="发件服务器" />
@@ -49,61 +51,54 @@
+ android:text="SMTP端口" />
-
-
-
+ android:text="开启SSL" />
+ android:checked="true" />
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:orientation="horizontal">
+ android:text="发件帐号" />
@@ -111,20 +106,21 @@
+ android:text="登录密码" />
@@ -132,20 +128,21 @@
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:orientation="horizontal">
+ android:text="收件地址" />
@@ -153,20 +150,21 @@
@@ -174,7 +172,7 @@
android:id="@+id/buttonemailtest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="2dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/test" />
diff --git a/app/src/main/res/layout/activity_alter_dialog_setview_qywxgrouprobot.xml b/app/src/main/res/layout/activity_alter_dialog_setview_qywxgrouprobot.xml
index a6b15ac1..34f50c1f 100644
--- a/app/src/main/res/layout/activity_alter_dialog_setview_qywxgrouprobot.xml
+++ b/app/src/main/res/layout/activity_alter_dialog_setview_qywxgrouprobot.xml
@@ -7,20 +7,21 @@
@@ -28,21 +29,20 @@
-
@@ -50,13 +50,13 @@
@@ -64,7 +64,7 @@
android:id="@+id/buttonQyWxGroupRobotDel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/del" />
@@ -72,7 +72,7 @@
android:id="@+id/buttonQyWxGroupRobotTest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/test" />
diff --git a/app/src/main/res/layout/activity_alter_dialog_setview_rule.xml b/app/src/main/res/layout/activity_alter_dialog_setview_rule.xml
index 2a8dc9f0..3253897f 100644
--- a/app/src/main/res/layout/activity_alter_dialog_setview_rule.xml
+++ b/app/src/main/res/layout/activity_alter_dialog_setview_rule.xml
@@ -8,12 +8,12 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
android:orientation="vertical">
@@ -125,6 +124,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
android:orientation="vertical">
@@ -161,13 +160,13 @@
@@ -175,7 +174,7 @@
android:id="@+id/buttonruledel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/del" />
diff --git a/app/src/main/res/layout/activity_alter_dialog_setview_webnotify.xml b/app/src/main/res/layout/activity_alter_dialog_setview_webnotify.xml
index 0b5be390..3281d7a5 100644
--- a/app/src/main/res/layout/activity_alter_dialog_setview_webnotify.xml
+++ b/app/src/main/res/layout/activity_alter_dialog_setview_webnotify.xml
@@ -7,20 +7,21 @@
@@ -28,21 +29,20 @@
-
+ android:text="设置Token:示例:https://a.b.com/msg?token=xyz" />
@@ -50,36 +50,34 @@
-
-
@@ -87,7 +85,7 @@
android:id="@+id/buttonbebnotifydel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/del" />
@@ -95,7 +93,7 @@
android:id="@+id/buttonbebnotifytest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="3dp"
+ android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="@string/test" />
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index fdb7f9c7..a02d838f 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -3,9 +3,9 @@
- 转发到钉钉机器人
- 转发到邮箱
- - 转发到其他手机SMS
+ - 转发到Bark
- 转发到Webhook
- 转发到企业微信群机器人
- - 转发到Bark
+
\ No newline at end of file