优化:仅测试转发规则与发送通道时Toast提示
This commit is contained in:
parent
bee6017ea0
commit
be3617be29
|
@ -5,6 +5,7 @@ import androidx.work.OneTimeWorkRequestBuilder
|
|||
import androidx.work.WorkManager
|
||||
import androidx.work.workDataOf
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.LogsAndRuleAndSender
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.database.entity.Sender
|
||||
|
@ -14,6 +15,7 @@ import com.idormy.sms.forwarder.entity.setting.*
|
|||
import com.idormy.sms.forwarder.utils.sender.*
|
||||
import com.idormy.sms.forwarder.workers.SendWorker
|
||||
import com.idormy.sms.forwarder.workers.UpdateLogsWorker
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
import com.xuexiang.xutil.XUtil
|
||||
import com.xuexiang.xutil.data.DateUtils
|
||||
import java.text.SimpleDateFormat
|
||||
|
@ -121,7 +123,15 @@ object SendUtils {
|
|||
|
||||
//更新转发日志状态
|
||||
fun updateLogs(logId: Long?, status: Int, response: String) {
|
||||
if (logId == null) return
|
||||
if (logId == null || logId == 0L) {
|
||||
//测试的没有记录ID,这里取巧了
|
||||
if (status == 2) {
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
val sendResponse = SendResponse(logId, status, response)
|
||||
val request = OneTimeWorkRequestBuilder<UpdateLogsWorker>()
|
||||
|
|
|
@ -3,19 +3,16 @@ package com.idormy.sms.forwarder.utils.sender
|
|||
import android.text.TextUtils
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.result.BarkResult
|
||||
import com.idormy.sms.forwarder.entity.setting.BarkSetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xhttp2.XHttp
|
||||
import com.xuexiang.xhttp2.cache.model.CacheMode
|
||||
import com.xuexiang.xhttp2.callback.SimpleCallBack
|
||||
import com.xuexiang.xhttp2.exception.ApiException
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
import java.util.regex.Pattern
|
||||
|
||||
@Suppress("PrivatePropertyName", "UNUSED_PARAMETER", "unused")
|
||||
|
@ -80,7 +77,7 @@ class BarkUtils {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -89,10 +86,10 @@ class BarkUtils {
|
|||
val resp = Gson().fromJson(response, BarkResult::class.java)
|
||||
if (resp.code == 200L) {
|
||||
SendUtils.updateLogs(logId, 2, response)
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, response)
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4,19 +4,16 @@ import android.text.TextUtils
|
|||
import android.util.Base64
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.result.DingtalkResult
|
||||
import com.idormy.sms.forwarder.entity.setting.DingtalkSetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xhttp2.XHttp
|
||||
import com.xuexiang.xhttp2.cache.model.CacheMode
|
||||
import com.xuexiang.xhttp2.callback.SimpleCallBack
|
||||
import com.xuexiang.xhttp2.exception.ApiException
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
import java.net.URLEncoder
|
||||
import java.nio.charset.StandardCharsets
|
||||
import javax.crypto.Mac
|
||||
|
@ -100,7 +97,7 @@ class DingtalkUtils private constructor() {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -109,10 +106,10 @@ class DingtalkUtils private constructor() {
|
|||
val resp = Gson().fromJson(response, DingtalkResult::class.java)
|
||||
if (resp.errcode == 0L) {
|
||||
SendUtils.updateLogs(logId, 2, response)
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, response)
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@ import com.idormy.sms.forwarder.entity.MsgInfo
|
|||
import com.idormy.sms.forwarder.entity.setting.EmailSetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.idormy.sms.forwarder.utils.mail.Mail
|
||||
import com.idormy.sms.forwarder.utils.mail.MailSender
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
|
@ -133,12 +132,12 @@ class EmailUtils {
|
|||
override fun onError(e: Throwable) {
|
||||
SendUtils.updateLogs(logId, 0, e.message.toString())
|
||||
Log.e("MailSender", e.message.toString())
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + e.message.toString())
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + e.message.toString())
|
||||
}
|
||||
|
||||
override fun onSuccess() {
|
||||
SendUtils.updateLogs(logId, 2, ResUtils.getString(R.string.request_succeeded))
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
@ -3,19 +3,16 @@ package com.idormy.sms.forwarder.utils.sender
|
|||
import android.util.Base64
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.result.FeishuResult
|
||||
import com.idormy.sms.forwarder.entity.setting.FeishuSetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xhttp2.XHttp
|
||||
import com.xuexiang.xhttp2.cache.model.CacheMode
|
||||
import com.xuexiang.xhttp2.callback.SimpleCallBack
|
||||
import com.xuexiang.xhttp2.exception.ApiException
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
import java.nio.charset.StandardCharsets
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
|
@ -148,7 +145,7 @@ class FeishuUtils private constructor() {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -157,10 +154,10 @@ class FeishuUtils private constructor() {
|
|||
val resp = Gson().fromJson(response, FeishuResult::class.java)
|
||||
if (resp.code == 0L) {
|
||||
SendUtils.updateLogs(logId, 2, response)
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, response)
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,19 +2,16 @@ package com.idormy.sms.forwarder.utils.sender
|
|||
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.result.GotifyResult
|
||||
import com.idormy.sms.forwarder.entity.setting.GotifySetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xhttp2.XHttp
|
||||
import com.xuexiang.xhttp2.cache.model.CacheMode
|
||||
import com.xuexiang.xhttp2.callback.SimpleCallBack
|
||||
import com.xuexiang.xhttp2.exception.ApiException
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
|
||||
@Suppress("PrivatePropertyName", "UNUSED_PARAMETER", "unused")
|
||||
class GotifyUtils {
|
||||
|
@ -58,7 +55,7 @@ class GotifyUtils {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -67,10 +64,10 @@ class GotifyUtils {
|
|||
val resp = Gson().fromJson(response, GotifyResult::class.java)
|
||||
if (resp?.id != null) {
|
||||
SendUtils.updateLogs(logId, 2, response)
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, response)
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@ import com.idormy.sms.forwarder.entity.result.PushplusResult
|
|||
import com.idormy.sms.forwarder.entity.setting.PushplusSetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xhttp2.XHttp
|
||||
import com.xuexiang.xhttp2.cache.model.CacheMode
|
||||
import com.xuexiang.xhttp2.callback.SimpleCallBack
|
||||
|
@ -82,7 +81,7 @@ class PushplusUtils private constructor() {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -91,10 +90,10 @@ class PushplusUtils private constructor() {
|
|||
val resp = Gson().fromJson(response, PushplusResult::class.java)
|
||||
if (resp.code == 200L) {
|
||||
SendUtils.updateLogs(logId, 2, response)
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, response)
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3,19 +3,16 @@ package com.idormy.sms.forwarder.utils.sender
|
|||
import android.text.TextUtils
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.result.ServerchanResult
|
||||
import com.idormy.sms.forwarder.entity.setting.ServerchanSetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xhttp2.XHttp
|
||||
import com.xuexiang.xhttp2.cache.model.CacheMode
|
||||
import com.xuexiang.xhttp2.callback.SimpleCallBack
|
||||
import com.xuexiang.xhttp2.exception.ApiException
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
|
||||
@Suppress("PrivatePropertyName", "UNUSED_PARAMETER", "unused")
|
||||
class ServerchanUtils {
|
||||
|
@ -62,7 +59,7 @@ class ServerchanUtils {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -71,10 +68,10 @@ class ServerchanUtils {
|
|||
val resp = Gson().fromJson(response, ServerchanResult::class.java)
|
||||
if (resp?.code == 0L) {
|
||||
SendUtils.updateLogs(logId, 2, response)
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, response)
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@ import com.idormy.sms.forwarder.entity.setting.SmsSetting
|
|||
import com.idormy.sms.forwarder.utils.PhoneUtils
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
import com.xuexiang.xutil.XUtil
|
||||
import com.xuexiang.xutil.net.NetworkUtils
|
||||
|
@ -53,16 +52,16 @@ class SmsUtils {
|
|||
val mSubscriptionId: Int = App.SimInfoList[simSlotIndex]?.mSubscriptionId ?: -1
|
||||
|
||||
if (ActivityCompat.checkSelfPermission(XUtil.getContext(), Manifest.permission.SEND_SMS) != PackageManager.PERMISSION_GRANTED) {
|
||||
XToastUtils.error(ResUtils.getString(R.string.no_sms_sending_permission))
|
||||
//XToastUtils.error(ResUtils.getString(R.string.no_sms_sending_permission))
|
||||
return
|
||||
}
|
||||
val res: String? = PhoneUtils.sendSms(mSubscriptionId, setting.mobiles, content)
|
||||
if (res == null) {
|
||||
SendUtils.updateLogs(logId, 2, ResUtils.getString(R.string.request_succeeded))
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, res)
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + res)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + res)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4,15 +4,12 @@ import android.os.Looper
|
|||
import android.text.TextUtils
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.result.TelegramResult
|
||||
import com.idormy.sms.forwarder.entity.setting.TelegramSetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
import okhttp3.*
|
||||
import java.io.IOException
|
||||
import java.net.InetSocketAddress
|
||||
|
@ -106,7 +103,7 @@ class TelegramUtils {
|
|||
SendUtils.updateLogs(logId, 0, e.message.toString())
|
||||
e.printStackTrace()
|
||||
Looper.prepare()
|
||||
XToastUtils.error("发送失败:" + e.message)
|
||||
//XToastUtils.error("发送失败:" + e.message)
|
||||
Looper.loop()
|
||||
}
|
||||
|
||||
|
@ -119,12 +116,12 @@ class TelegramUtils {
|
|||
if (resp.ok == true) {
|
||||
SendUtils.updateLogs(logId, 2, responseStr.toString())
|
||||
Looper.prepare()
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//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)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
Looper.loop()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,15 +6,12 @@ import android.text.TextUtils
|
|||
import android.util.Base64
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.setting.WebhookSetting
|
||||
import com.idormy.sms.forwarder.utils.CertUtils
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
import com.xuexiang.xutil.app.AppUtils
|
||||
import okhttp3.*
|
||||
import java.io.IOException
|
||||
|
@ -167,7 +164,7 @@ class WebhookUtils {
|
|||
//LogUtils.updateLog(logId, 0, e.message)
|
||||
//解决在子线程中调用Toast的异常情况处理
|
||||
Looper.prepare()
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + e.message)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + e.message)
|
||||
Looper.loop()
|
||||
}
|
||||
|
||||
|
@ -180,12 +177,12 @@ class WebhookUtils {
|
|||
if (200 == response.code()) {
|
||||
SendUtils.updateLogs(logId, 2, responseStr)
|
||||
Looper.prepare()
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//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)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
Looper.loop()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@ package com.idormy.sms.forwarder.utils.sender
|
|||
import android.text.TextUtils
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.result.DingtalkResult
|
||||
|
@ -12,12 +11,10 @@ import com.idormy.sms.forwarder.entity.setting.WeworkAgentSetting
|
|||
import com.idormy.sms.forwarder.utils.MMKVUtils
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xhttp2.XHttp
|
||||
import com.xuexiang.xhttp2.cache.model.CacheMode
|
||||
import com.xuexiang.xhttp2.callback.SimpleCallBack
|
||||
import com.xuexiang.xhttp2.exception.ApiException
|
||||
import com.xuexiang.xui.utils.ResUtils.getString
|
||||
|
||||
@Suppress("PrivatePropertyName", "UNUSED_PARAMETER")
|
||||
class WeworkAgentUtils private constructor() {
|
||||
|
@ -53,7 +50,7 @@ class WeworkAgentUtils private constructor() {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -65,7 +62,7 @@ class WeworkAgentUtils private constructor() {
|
|||
MMKVUtils.put("expires_in_" + setting.agentID, System.currentTimeMillis() + ((resp.expires_in ?: 7200) - 120) * 1000L) //提前2分钟过期
|
||||
sendTextMsg(setting, msgInfo, rule, logId)
|
||||
} else {
|
||||
XToastUtils.error(String.format(getString(R.string.request_failed_tips), response))
|
||||
//XToastUtils.error(String.format(getString(R.string.request_failed_tips), response))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -112,7 +109,7 @@ class WeworkAgentUtils private constructor() {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -121,10 +118,10 @@ class WeworkAgentUtils private constructor() {
|
|||
val resp = Gson().fromJson(response, DingtalkResult::class.java)
|
||||
if (resp.errcode == 0L) {
|
||||
SendUtils.updateLogs(logId, 2, response)
|
||||
XToastUtils.success(getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, response)
|
||||
XToastUtils.error(getString(R.string.request_failed) + response)
|
||||
//XToastUtils.error(getString(R.string.request_failed) + response)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,19 +2,16 @@ package com.idormy.sms.forwarder.utils.sender
|
|||
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.idormy.sms.forwarder.R
|
||||
import com.idormy.sms.forwarder.database.entity.Rule
|
||||
import com.idormy.sms.forwarder.entity.MsgInfo
|
||||
import com.idormy.sms.forwarder.entity.result.WeworkRobotResult
|
||||
import com.idormy.sms.forwarder.entity.setting.WeworkRobotSetting
|
||||
import com.idormy.sms.forwarder.utils.SendUtils
|
||||
import com.idormy.sms.forwarder.utils.SettingUtils
|
||||
import com.idormy.sms.forwarder.utils.XToastUtils
|
||||
import com.xuexiang.xhttp2.XHttp
|
||||
import com.xuexiang.xhttp2.cache.model.CacheMode
|
||||
import com.xuexiang.xhttp2.callback.SimpleCallBack
|
||||
import com.xuexiang.xhttp2.exception.ApiException
|
||||
import com.xuexiang.xui.utils.ResUtils
|
||||
|
||||
@Suppress("PrivatePropertyName", "UNUSED_PARAMETER")
|
||||
class WeworkRobotUtils private constructor() {
|
||||
|
@ -61,7 +58,7 @@ class WeworkRobotUtils private constructor() {
|
|||
override fun onError(e: ApiException) {
|
||||
SendUtils.updateLogs(logId, 0, e.displayMessage)
|
||||
Log.e(TAG, e.detailMessage)
|
||||
XToastUtils.error(e.displayMessage)
|
||||
//XToastUtils.error(e.displayMessage)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: String) {
|
||||
|
@ -70,10 +67,10 @@ class WeworkRobotUtils private constructor() {
|
|||
val resp = Gson().fromJson(response, WeworkRobotResult::class.java)
|
||||
if (resp.errcode == 0L) {
|
||||
SendUtils.updateLogs(logId, 2, response)
|
||||
XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
//XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
|
||||
} else {
|
||||
SendUtils.updateLogs(logId, 0, response)
|
||||
XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
//XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue