diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt index 523496a0..ccb8aa26 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt @@ -231,6 +231,7 @@ class ClientFragment : BaseFragment(), override fun onError(e: ApiException) { XToastUtils.error(e.displayMessage) + if (needToast) mCountDownHelper?.finish() } override fun onSuccess(response: String) { @@ -250,6 +251,7 @@ class ClientFragment : BaseFragment(), e.printStackTrace() if (needToast) XToastUtils.error(ResUtils.getString(R.string.request_failed) + response) } + if (needToast) mCountDownHelper?.finish() } }) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsSendFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsSendFragment.kt index 53451c09..15d7c619 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsSendFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsSendFragment.kt @@ -120,6 +120,7 @@ class SmsSendFragment : BaseFragment(), View.OnCl override fun onError(e: ApiException) { XToastUtils.error(e.displayMessage) + mCountDownHelper?.finish() } override fun onSuccess(response: String) { @@ -135,6 +136,7 @@ class SmsSendFragment : BaseFragment(), View.OnCl e.printStackTrace() XToastUtils.error(ResUtils.getString(R.string.request_failed) + response) } + mCountDownHelper?.finish() } }) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/WolSendFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/WolSendFragment.kt index 0f5ed0cd..cbcf4c71 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/WolSendFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/WolSendFragment.kt @@ -155,6 +155,7 @@ class WolSendFragment : BaseFragment(), View.OnCl override fun onError(e: ApiException) { XToastUtils.error(e.displayMessage) + mCountDownHelper?.finish() } override fun onSuccess(response: String) { @@ -173,6 +174,7 @@ class WolSendFragment : BaseFragment(), View.OnCl e.printStackTrace() XToastUtils.error(ResUtils.getString(R.string.request_failed) + response) } + mCountDownHelper?.finish() } }) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt index fe27c603..22125a11 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt @@ -20,6 +20,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.BarkSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.BarkUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -159,6 +160,7 @@ class BarkFragment : BaseFragment(), View.OnClickLi binding!!.btnTest.setOnClickListener(this) binding!!.btnDel.setOnClickListener(this) binding!!.btnSave.setOnClickListener(this) + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -196,6 +198,7 @@ class BarkFragment : BaseFragment(), View.OnClickLi XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/DingtalkGroupRobotFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/DingtalkGroupRobotFragment.kt index 740c41d6..105dfc38 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/DingtalkGroupRobotFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/DingtalkGroupRobotFragment.kt @@ -20,6 +20,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.DingtalkGroupRobotSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.DingtalkGroupRobotUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -141,6 +142,7 @@ class DingtalkGroupRobotFragment : BaseFragment binding!!.layoutCustomTemplate.visibility = if (checkedId == R.id.rb_msg_type_markdown) View.VISIBLE else View.GONE } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SuppressLint("SetTextI18n") @@ -211,6 +213,7 @@ class DingtalkInnerRobotFragment : BaseFragment(), View.OnClick binding!!.btnTest.setOnClickListener(this) binding!!.btnDel.setOnClickListener(this) binding!!.btnSave.setOnClickListener(this) + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -225,6 +227,7 @@ class EmailFragment : BaseFragment(), View.OnClick XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/FeishuFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/FeishuFragment.kt index d950a093..a74d0671 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/FeishuFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/FeishuFragment.kt @@ -20,6 +20,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.FeishuSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.FeishuUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -130,9 +131,14 @@ class FeishuFragment : BaseFragment(), View.OnCli } override fun initListeners() { + binding!!.btInsertSender.setOnClickListener(this) + binding!!.btInsertExtra.setOnClickListener(this) + binding!!.btInsertTime.setOnClickListener(this) + binding!!.btInsertDeviceName.setOnClickListener(this) binding!!.btnTest.setOnClickListener(this) binding!!.btnDel.setOnClickListener(this) binding!!.btnSave.setOnClickListener(this) + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -170,6 +176,7 @@ class FeishuFragment : BaseFragment(), View.OnCli XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/GotifyFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/GotifyFragment.kt index 75298d81..e1d0c829 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/GotifyFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/GotifyFragment.kt @@ -20,6 +20,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.GotifySetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.GotifyUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -129,13 +130,14 @@ class GotifyFragment : BaseFragment(), View.OnCli } override fun initListeners() { - binding!!.btnTest.setOnClickListener(this) - binding!!.btnDel.setOnClickListener(this) - binding!!.btnSave.setOnClickListener(this) binding!!.btInsertSender.setOnClickListener(this) binding!!.btInsertExtra.setOnClickListener(this) binding!!.btInsertTime.setOnClickListener(this) binding!!.btInsertDeviceName.setOnClickListener(this) + binding!!.btnTest.setOnClickListener(this) + binding!!.btnDel.setOnClickListener(this) + binding!!.btnSave.setOnClickListener(this) + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -173,6 +175,7 @@ class GotifyFragment : BaseFragment(), View.OnCli XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/PushplusFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/PushplusFragment.kt index 40cff2a6..70e7c2e9 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/PushplusFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/PushplusFragment.kt @@ -21,6 +21,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.PushplusSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.PushplusUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -140,6 +141,10 @@ class PushplusFragment : BaseFragment(), View.O } override fun initListeners() { + binding!!.btInsertSender.setOnClickListener(this) + binding!!.btInsertExtra.setOnClickListener(this) + binding!!.btInsertTime.setOnClickListener(this) + binding!!.btInsertDeviceName.setOnClickListener(this) binding!!.btnTest.setOnClickListener(this) binding!!.btnDel.setOnClickListener(this) binding!!.btnSave.setOnClickListener(this) @@ -152,6 +157,7 @@ class PushplusFragment : BaseFragment(), View.O binding!!.layoutPlusTwo.visibility = View.VISIBLE } } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -189,6 +195,7 @@ class PushplusFragment : BaseFragment(), View.O XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/ServerchanFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/ServerchanFragment.kt index 92217f83..2f9004be 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/ServerchanFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/ServerchanFragment.kt @@ -19,6 +19,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.ServerchanSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.ServerchanUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -131,6 +132,7 @@ class ServerchanFragment : BaseFragment(), Vi binding!!.btnTest.setOnClickListener(this) binding!!.btnDel.setOnClickListener(this) binding!!.btnSave.setOnClickListener(this) + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -151,6 +153,7 @@ class ServerchanFragment : BaseFragment(), Vi XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/SmsFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/SmsFragment.kt index 5f6f9613..e5a6b528 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/SmsFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/SmsFragment.kt @@ -22,6 +22,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.SmsSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.SmsUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -157,6 +158,7 @@ class SmsFragment : BaseFragment(), View.OnClickList binding!!.btnTest.setOnClickListener(this) binding!!.btnDel.setOnClickListener(this) binding!!.btnSave.setOnClickListener(this) + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -177,6 +179,7 @@ class SmsFragment : BaseFragment(), View.OnClickList XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/TelegramFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/TelegramFragment.kt index f22974c2..4676a158 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/TelegramFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/TelegramFragment.kt @@ -21,6 +21,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.TelegramSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.TelegramUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -152,6 +153,7 @@ class TelegramFragment : BaseFragment(), View.O binding!!.layoutProxyAuthenticator.visibility = View.GONE } } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) { @@ -177,6 +179,7 @@ class TelegramFragment : BaseFragment(), View.O XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WebhookFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WebhookFragment.kt index 50570314..b18e7591 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WebhookFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WebhookFragment.kt @@ -22,6 +22,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.WebhookSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.WebhookUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -143,6 +144,7 @@ class WebhookFragment : BaseFragment(), View.OnC binding!!.btnDel.setOnClickListener(this) binding!!.btnSave.setOnClickListener(this) binding!!.btnAddHeader.setOnClickListener { addHeaderItemLinearLayout(headerItemMap, binding!!.layoutHeaders, null, null) } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -163,6 +165,7 @@ class WebhookFragment : BaseFragment(), View.OnC XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkAgentFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkAgentFragment.kt index 71d8710e..479d23f8 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkAgentFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkAgentFragment.kt @@ -22,6 +22,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.WeworkAgentSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.WeworkAgentUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -156,6 +157,7 @@ class WeworkAgentFragment : BaseFragment(), binding!!.layoutProxyAuthenticator.visibility = View.GONE } } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SuppressLint("SetTextI18n") @@ -195,6 +197,7 @@ class WeworkAgentFragment : BaseFragment(), XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkRobotFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkRobotFragment.kt index 659a5cc1..ef7cbad6 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkRobotFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkRobotFragment.kt @@ -19,6 +19,7 @@ import com.idormy.sms.forwarder.entity.MsgInfo import com.idormy.sms.forwarder.entity.setting.WeworkRobotSetting import com.idormy.sms.forwarder.utils.* import com.idormy.sms.forwarder.utils.sender.WeworkRobotUtils +import com.jeremyliao.liveeventbus.LiveEventBus import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xpage.annotation.Page import com.xuexiang.xrouter.annotation.AutoWired @@ -129,6 +130,7 @@ class WeworkRobotFragment : BaseFragment(), binding!!.btnTest.setOnClickListener(this) binding!!.btnDel.setOnClickListener(this) binding!!.btnSave.setOnClickListener(this) + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).observe(this) { mCountDownHelper?.finish() } } @SingleClick @@ -149,6 +151,7 @@ class WeworkRobotFragment : BaseFragment(), XToastUtils.error(e.message.toString()) Looper.loop() } + LiveEventBus.get(KEY_SENDER_TEST, String::class.java).post("finish") }.start() return } diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt index 58bee788..e11feabb 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt @@ -209,6 +209,7 @@ const val EVENT_UPDATE_NOTIFY = "key_notify" const val KEY_SENDER_ID = "key_sender_id" const val KEY_SENDER_TYPE = "key_sender_type" const val KEY_SENDER_CLONE = "key_sender_clone" +const val KEY_SENDER_TEST = "key_sender_test" const val KEY_RULE_ID = "key_rule_id" const val KEY_RULE_TYPE = "key_rule_type" diff --git a/versions.gradle b/versions.gradle index aee6a86d..5f73452f 100644 --- a/versions.gradle +++ b/versions.gradle @@ -38,7 +38,7 @@ versions.kotlin = '1.6.21' //========xlibrary start========// -versions.xui = "1.2.1" +versions.xui = "1.2.2" versions.xupdate = "2.1.3" versions.xaop = "1.1.0" versions.xutil = "2.0.0"