From 5387202e36188546ecca2b83fba7d9604165d889 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Sun, 29 Jan 2023 09:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E9=80=80=E5=87=BA=E7=BA=AF=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idormy/sms/forwarder/fragment/ClientFragment.kt | 12 +++++++----- .../idormy/sms/forwarder/utils/HttpServerUtils.kt | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) 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 f146d2fe..b1648552 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 @@ -38,7 +38,6 @@ import com.xuexiang.xui.widget.dialog.materialdialog.MaterialDialog import com.xuexiang.xutil.XUtil import com.xuexiang.xutil.data.ConvertTools - @Suppress("PrivatePropertyName", "PropertyName") @Page(name = "主动控制·客户端") class ClientFragment : BaseFragment(), View.OnClickListener, RecyclerViewHolder.OnItemClickListener { @@ -88,7 +87,12 @@ class ClientFragment : BaseFragment(), View.OnClickListe override fun performAction(view: View) { XToastUtils.success(getString(R.string.exit_pure_client_mode)) SettingUtils.enablePureClientMode = false - XUtil.exitApp() + try { + Thread.sleep(500) //延迟500毫秒，避免退出时enablePureClientMode还没保存 + XUtil.exitApp() + } catch (e: InterruptedException) { + e.printStackTrace() + } } }) } else { @@ -290,9 +294,7 @@ class ClientFragment : BaseFragment(), View.OnClickListe var requestMsg: String = Gson().toJson(msgMap) Log.i(TAG, "requestMsg:$requestMsg") - val postRequest = XHttp.post(requestUrl) - .keepJson(true) - .timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s + val postRequest = XHttp.post(requestUrl).keepJson(true).timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s .cacheMode(CacheMode.NO_CACHE).timeStamp(true) when (HttpServerUtils.clientSafetyMeasures) { diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt index c373e37b..c101bf65 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt @@ -25,7 +25,7 @@ class HttpServerUtils private constructor() { companion object { //是否启用HttpServer开机自启 - var enableServerAutorun: Boolean by SharedPreference(SP_ENABLE_SERVER_AUTORUN, true) + var enableServerAutorun: Boolean by SharedPreference(SP_ENABLE_SERVER_AUTORUN, false) //服务端签名密钥 var serverSignKey: String by SharedPreference(SP_SERVER_SIGN_KEY, "") @@ -49,7 +49,7 @@ class HttpServerUtils private constructor() { var serverWebPath: String by SharedPreference(SP_SERVER_WEB_PATH, "") //服务地址 - var serverAddress: String by SharedPreference(SP_SERVER_ADDRESS, "") + var serverAddress: String by SharedPreference(SP_SERVER_ADDRESS, "http://127.0.0.1:5000") //服务地址历史记录 var serverHistory: String by SharedPreference(SP_SERVER_HISTORY, "")