From 43f33e5fe2209ceccba6125454a992525353b583 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Thu, 9 Jun 2022 16:02:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=9C=A8=E5=AD=90?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E4=B8=AD=E8=B0=83=E7=94=A8Toast=E7=9A=84?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=83=85=E5=86=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idormy/sms/forwarder/utils/sender/TelegramUtils.kt | 9 ++++++++- .../idormy/sms/forwarder/utils/sender/WebhookUtils.kt | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt index ede5f5c7..5461e132 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt @@ -1,5 +1,6 @@ package com.idormy.sms.forwarder.utils.sender +import android.os.Looper import android.text.TextUtils import android.util.Log import com.google.gson.Gson @@ -104,7 +105,9 @@ class TelegramUtils { override fun onFailure(call: Call, e: IOException) { SendUtils.updateLogs(logId, 0, e.message.toString()) e.printStackTrace() - //XToastUtils.error("发送失败：" + e.message) + Looper.prepare() + XToastUtils.error("发送失败：" + e.message) + Looper.loop() } @Throws(IOException::class) @@ -115,10 +118,14 @@ class TelegramUtils { val resp = Gson().fromJson(responseStr, TelegramResult::class.java) if (resp.ok == true) { SendUtils.updateLogs(logId, 2, responseStr.toString()) + Looper.prepare() XToastUtils.success(ResUtils.getString(R.string.request_succeeded)) + Looper.loop() } else { SendUtils.updateLogs(logId, 0, responseStr.toString()) + Looper.prepare() XToastUtils.error(ResUtils.getString(R.string.request_failed) + response) + Looper.loop() } } }) diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt index 00fa5cba..96dbfcf7 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt @@ -1,6 +1,7 @@ package com.idormy.sms.forwarder.utils.sender import android.annotation.SuppressLint +import android.os.Looper import android.text.TextUtils import android.util.Base64 import android.util.Log @@ -164,7 +165,10 @@ class WebhookUtils { override fun onFailure(call: Call, e: IOException) { SendUtils.updateLogs(logId, 0, e.message.toString()) //LogUtils.updateLog(logId, 0, e.message) + //解决在子线程中调用Toast的异常情况处理 + Looper.prepare() XToastUtils.error(ResUtils.getString(R.string.request_failed) + e.message) + Looper.loop() } @Throws(IOException::class) @@ -172,14 +176,17 @@ class WebhookUtils { val responseStr = response.body().toString() Log.d(TAG, "Response：" + response.code() + "，" + responseStr) - //返回http状态200即为成功 if (200 == response.code()) { SendUtils.updateLogs(logId, 2, responseStr) + Looper.prepare() XToastUtils.success(ResUtils.getString(R.string.request_succeeded)) + Looper.loop() } else { SendUtils.updateLogs(logId, 0, responseStr) + Looper.prepare() XToastUtils.error(ResUtils.getString(R.string.request_failed) + response) + Looper.loop() } } })