littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-03 01:17:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化：Pushplus通道允许自定义失效时间（timestamp节点）

Browse Source
This commit is contained in:
pppscn 2021-11-23 21:10:44 +08:00
parent 066d410e88
commit f18d64467b
6 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java
View File

@ -1244,6 +1244,7 @@ public class SenderActivity extends AppCompatActivity {
final EditText editTextPushPlusChannel = view1.findViewById(R.id.editTextPushPlusChannel);
final EditText editTextPushPlusWebhook = view1.findViewById(R.id.editTextPushPlusWebhook);
final EditText editTextPushPlusCallbackUrl = view1.findViewById(R.id.editTextPushPlusCallbackUrl);
final EditText editTextPushPlusValidTime = view1.findViewById(R.id.editTextPushPlusValidTime);
if (pushPlusSettingVo != null) {
editTextPushPlusName.setText(senderModel.getName());
@ -1253,6 +1254,7 @@ public class SenderActivity extends AppCompatActivity {
editTextPushPlusChannel.setText(pushPlusSettingVo.getChannel());
editTextPushPlusWebhook.setText(pushPlusSettingVo.getWebhook());
editTextPushPlusCallbackUrl.setText(pushPlusSettingVo.getCallbackUrl());
editTextPushPlusValidTime.setText(pushPlusSettingVo.getValidTime());
}
Button buttonPushPlusOk = view1.findViewById(R.id.buttonPushPlusOk);
@ -1272,12 +1274,13 @@ public class SenderActivity extends AppCompatActivity {
newSenderModel.setType(TYPE_PUSHPLUS);
newSenderModel.setStatus(STATUS_ON);
PushPlusSettingVo pushPlusSettingVoNew = new PushPlusSettingVo(
editTextPushPlusToken.getText().toString(),
editTextPushPlusTopic.getText().toString(),
editTextPushPlusTemplate.getText().toString(),
editTextPushPlusChannel.getText().toString(),
editTextPushPlusWebhook.getText().toString(),
editTextPushPlusCallbackUrl.getText().toString()
editTextPushPlusToken.getText().toString().trim(),
editTextPushPlusTopic.getText().toString().trim(),
editTextPushPlusTemplate.getText().toString().trim(),
editTextPushPlusChannel.getText().toString().trim(),
editTextPushPlusWebhook.getText().toString().trim(),
editTextPushPlusCallbackUrl.getText().toString().trim(),
editTextPushPlusValidTime.getText().toString().trim()
);
newSenderModel.setJsonSetting(JSON.toJSONString(pushPlusSettingVoNew));
SenderUtil.addSender(newSenderModel);
@ -1288,12 +1291,13 @@ public class SenderActivity extends AppCompatActivity {
senderModel.setType(TYPE_PUSHPLUS);
senderModel.setStatus(STATUS_ON);
PushPlusSettingVo pushPlusSettingVoNew = new PushPlusSettingVo(
editTextPushPlusToken.getText().toString(),
editTextPushPlusTopic.getText().toString(),
editTextPushPlusTemplate.getText().toString(),
editTextPushPlusChannel.getText().toString(),
editTextPushPlusWebhook.getText().toString(),
editTextPushPlusCallbackUrl.getText().toString()
editTextPushPlusToken.getText().toString().trim(),
editTextPushPlusTopic.getText().toString().trim(),
editTextPushPlusTemplate.getText().toString().trim(),
editTextPushPlusChannel.getText().toString().trim(),
editTextPushPlusWebhook.getText().toString().trim(),
editTextPushPlusCallbackUrl.getText().toString().trim(),
editTextPushPlusValidTime.getText().toString().trim()
);
senderModel.setJsonSetting(JSON.toJSONString(pushPlusSettingVoNew));
SenderUtil.updateSender(senderModel);
@ -1314,12 +1318,13 @@ public class SenderActivity extends AppCompatActivity {
buttonPushPlusTest.setOnClickListener(view -> {
PushPlusSettingVo pushPlusSettingVoNew = new PushPlusSettingVo(
editTextPushPlusToken.getText().toString(),
editTextPushPlusTopic.getText().toString(),
editTextPushPlusTemplate.getText().toString(),
editTextPushPlusChannel.getText().toString(),
editTextPushPlusWebhook.getText().toString(),
editTextPushPlusCallbackUrl.getText().toString()
editTextPushPlusToken.getText().toString().trim(),
editTextPushPlusTopic.getText().toString().trim(),
editTextPushPlusTemplate.getText().toString().trim(),
editTextPushPlusChannel.getText().toString().trim(),
editTextPushPlusWebhook.getText().toString().trim(),
editTextPushPlusCallbackUrl.getText().toString().trim(),
editTextPushPlusValidTime.getText().toString().trim()
);
String token = pushPlusSettingVoNew.getToken();

4
app/src/main/java/com/idormy/sms/forwarder/model/vo/PushPlusSettingVo.java
View File

@ -12,16 +12,18 @@ public class PushPlusSettingVo implements Serializable {
private String channel;
private String webhook;
private String callbackUrl;
private String validTime;
public PushPlusSettingVo() {
}
public PushPlusSettingVo(String token, String topic, String template, String channel, String webhook, String callbackUrl) {
public PushPlusSettingVo(String token, String topic, String template, String channel, String webhook, String callbackUrl, String validTime) {
this.token = token;
this.topic = topic;
this.template = template;
this.channel = channel;
this.webhook = webhook;
this.callbackUrl = callbackUrl;
this.validTime = validTime;
}
}

7
app/src/main/java/com/idormy/sms/forwarder/sender/SenderPushPlusMsg.java
View File

@ -29,7 +29,7 @@ import okhttp3.Response;
@SuppressWarnings({"ResultOfMethodCallIgnored", "rawtypes", "unchecked", "deprecation"})
public class SenderPushPlusMsg extends SenderBaseMsg {
static final String TAG = "SenderFeishuMsg";
static final String TAG = "SenderPushPlusMsg";
public static void sendMsg(final long logId, final Handler handError, PushPlusSettingVo pushPlusSettingVo, String title, String content) throws Exception {
@ -67,7 +67,10 @@ public class SenderPushPlusMsg extends SenderBaseMsg {
if (callbackUrl != null && !callbackUrl.isEmpty()) textMsgMap.put("callbackUrl", callbackUrl);
//毫秒时间戳。格式如：1632993318000。服务器时间戳大于此时间戳，则消息不会发送
textMsgMap.put("timestamp", System.currentTimeMillis());
String validTime = pushPlusSettingVo.getValidTime();
if (validTime != null && !validTime.isEmpty() && Integer.parseInt(validTime) > 0) {
textMsgMap.put("timestamp", System.currentTimeMillis() + Integer.parseInt(validTime) * 1000L);
}
final String requestUrl = "http://www.pushplus.plus/send/" + token;
Log.i(TAG, "requestUrl:" + requestUrl);

24
app/src/main/res/layout/alert_dialog_setview_pushplus.xml
View File

@ -177,6 +177,30 @@
tools:ignore="LabelFor" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pushplus_valid_time" />
<EditText
android:id="@+id/editTextPushPlusValidTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:autofillHints=""
android:ems="14"
android:inputType="number"
android:text=""
tools:ignore="LabelFor" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

1
app/src/main/res/values-en/strings.xml
View File

@ -236,5 +236,6 @@
<string name="pushplus_channel">Channel</string>
<string name="pushplus_webhook">Webhook Code</string>
<string name="pushplus_callback">Callback Url</string>
<string name="pushplus_valid_time">Valid time(secs)</string>
<string name="wechat">wechat</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -235,5 +235,6 @@
<string name="pushplus_channel">发送渠道</string>
<string name="pushplus_webhook">webhook编码</string>
<string name="pushplus_callback">回调地址</string>
<string name="pushplus_valid_time">有效时间(秒)</string>
<string name="wechat">wechat</string>
</resources>