From b9617e09788051534fb4edb5096eb78d8433a6af Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Fri, 29 Jul 2022 13:58:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A`=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E6=8E=A7=E5=88=B6`=E5=A2=9E=E5=8A=A0`=E8=BF=9C=E7=A8=8BWOL`?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=88=E7=94=A8=E4=BA=8E=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=94=A4=E9=86=92=E5=90=8C=E4=B8=80=E4=B8=AA=E5=B1=80=E5=9F=9F?= =?UTF-8?q?=E7=BD=91=E5=85=B6=E4=BB=96=E8=AE=BE=E5=A4=87=EF=BC=89=20#190?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/idormy/sms/forwarder/fragment/ClientFragment.kt | 3 ++- .../idormy/sms/forwarder/server/controller/ConfigController.kt | 1 + .../java/com/idormy/sms/forwarder/server/model/ConfigData.kt | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) 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 65857257..523496a0 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 @@ -53,7 +53,7 @@ class ClientFragment : BaseFragment(), appContext = requireActivity().application as App //测试按钮增加倒计时，避免重复点击 - mCountDownHelper = CountDownButtonHelper(binding!!.btnServerTest, SettingUtils.requestTimeout) + mCountDownHelper = CountDownButtonHelper(binding!!.btnServerTest, 3) mCountDownHelper!!.setOnCountDownListener(object : CountDownButtonHelper.OnCountDownListener { override fun onCountDown(time: Int) { binding!!.btnServerTest.text = String.format(getString(R.string.seconds_n), time) @@ -184,6 +184,7 @@ class ClientFragment : BaseFragment(), || (item.name == ResUtils.getString(R.string.api_call_query) && !serverConfig!!.enableApiCallQuery) || (item.name == ResUtils.getString(R.string.api_contact_query) && !serverConfig!!.enableApiContactQuery) || (item.name == ResUtils.getString(R.string.api_battery_query) && !serverConfig!!.enableApiBatteryQuery) + || (item.name == ResUtils.getString(R.string.api_wol) && !serverConfig!!.enableApiWol) ) ) { XToastUtils.error(getString(R.string.disabled_on_the_server)) diff --git a/app/src/main/java/com/idormy/sms/forwarder/server/controller/ConfigController.kt b/app/src/main/java/com/idormy/sms/forwarder/server/controller/ConfigController.kt index 65d17034..9d9b9769 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/server/controller/ConfigController.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/server/controller/ConfigController.kt @@ -36,6 +36,7 @@ class ConfigController { HttpServerUtils.enableApiCallQuery, HttpServerUtils.enableApiContactQuery, HttpServerUtils.enableApiBatteryQuery, + HttpServerUtils.enableApiWol, SettingUtils.extraDeviceMark.toString(), SettingUtils.extraSim1.toString(), SettingUtils.extraSim2.toString(), diff --git a/app/src/main/java/com/idormy/sms/forwarder/server/model/ConfigData.kt b/app/src/main/java/com/idormy/sms/forwarder/server/model/ConfigData.kt index 05717dea..38ad96fd 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/server/model/ConfigData.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/server/model/ConfigData.kt @@ -17,6 +17,8 @@ data class ConfigData( var enableApiContactQuery: Boolean = false, @SerializedName("enable_api_battery_query") var enableApiBatteryQuery: Boolean = false, + @SerializedName("enable_api_wol") + var enableApiWol: Boolean = false, @SerializedName("extra_device_mark") var extraDeviceMark: String = "", @SerializedName("extra_sim1")