From c4effff4cb0b0ad226c54ee57535059d3bd14f71 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Sun, 24 Oct 2021 11:59:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=8F=91=E5=88=B0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=9F=AD=E4=BF=A1=E5=8F=96=E6=B6=88=E5=BB=B6?= =?UTF-8?q?=E6=97=B6=E9=87=8D=E8=AF=95=EF=BC=88=E6=B2=A1=E6=9C=89=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E6=84=8F=E4=B9=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms/forwarder/sender/SenderSmsMsg.java | 42 ++++--------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderSmsMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderSmsMsg.java index 2976598d..8092dc57 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderSmsMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderSmsMsg.java @@ -4,16 +4,9 @@ import android.os.Handler; import android.util.Log; import com.idormy.sms.forwarder.utils.LogUtil; -import com.idormy.sms.forwarder.utils.SettingUtil; import com.idormy.sms.forwarder.utils.SimUtil; import com.idormy.sms.forwarder.utils.SmsUtil; -import java.util.concurrent.TimeUnit; - -import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.ObservableEmitter; - -@SuppressWarnings("ResultOfMethodCallIgnored") public class SenderSmsMsg extends SenderBaseMsg { static final String TAG = "SenderSmsMsg"; @@ -23,35 +16,16 @@ public class SenderSmsMsg extends SenderBaseMsg { //TODO：simSlot转subId final int subId = SimUtil.getSubscriptionIdBySimId(simSlot); + String res = SmsUtil.sendSms(subId, mobiles, text); - Observable - .create((ObservableEmitter emitter) -> { - Toast(handError, TAG, "开始发送短信..."); + //TODO:粗略解析是否发送成功 + if (res == null) { + LogUtil.updateLog(logId, 1, "发送成功"); + } else { + LogUtil.updateLog(logId, 0, res); + Toast(handError, TAG, "短信发送失败"); + } - String res = SmsUtil.sendSms(subId, mobiles, text); - - //TODO:粗略解析是否发送成功 - if (res == null) { - LogUtil.updateLog(logId, 1, "发送成功"); - } else { - LogUtil.updateLog(logId, 0, res); - Toast(handError, TAG, "短信发送失败"); - emitter.onError(new RuntimeException("短信发送异常...")); - } - - }).retryWhen((Observable errorObservable) -> errorObservable - .zipWith(Observable.just( - SettingUtil.getRetryDelayTime(1), - SettingUtil.getRetryDelayTime(2), - SettingUtil.getRetryDelayTime(3), - SettingUtil.getRetryDelayTime(4), - SettingUtil.getRetryDelayTime(5) - ), (Throwable e, Integer time) -> time) - .flatMap((Integer delay) -> { - Toast(handError, TAG, "短信发送异常，" + delay + "秒后重试"); - return Observable.timer(delay, TimeUnit.SECONDS); - })) - .subscribe(System.out::println); } }