littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-03 17:37:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复：不能退出纯客户端模式

Browse Source
This commit is contained in:
pppscn 2023-01-29 09:50:53 +08:00
parent 5f55d20c83
commit 5387202e36
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt
View File

@ -38,7 +38,6 @@ import com.xuexiang.xui.widget.dialog.materialdialog.MaterialDialog
import com.xuexiang.xutil.XUtil import com.xuexiang.xutil.XUtil
import com.xuexiang.xutil.data.ConvertTools import com.xuexiang.xutil.data.ConvertTools
@Suppress("PrivatePropertyName", "PropertyName") @Suppress("PrivatePropertyName", "PropertyName")
@Page(name = "主动控制·客户端") @Page(name = "主动控制·客户端")
class ClientFragment : BaseFragment<FragmentClientBinding?>(), View.OnClickListener, RecyclerViewHolder.OnItemClickListener<PageInfo> { class ClientFragment : BaseFragment<FragmentClientBinding?>(), View.OnClickListener, RecyclerViewHolder.OnItemClickListener<PageInfo> {
@ -88,7 +87,12 @@ class ClientFragment : BaseFragment<FragmentClientBinding?>(), View.OnClickListe
override fun performAction(view: View) { override fun performAction(view: View) {
XToastUtils.success(getString(R.string.exit_pure_client_mode)) XToastUtils.success(getString(R.string.exit_pure_client_mode))
SettingUtils.enablePureClientMode = false SettingUtils.enablePureClientMode = false
try {
Thread.sleep(500) //延迟500毫秒，避免退出时enablePureClientMode还没保存
XUtil.exitApp() XUtil.exitApp()
} catch (e: InterruptedException) {
e.printStackTrace()
}
} }
}) })
} else { } else {
@ -290,9 +294,7 @@ class ClientFragment : BaseFragment<FragmentClientBinding?>(), View.OnClickListe
var requestMsg: String = Gson().toJson(msgMap) var requestMsg: String = Gson().toJson(msgMap)
Log.i(TAG, "requestMsg:$requestMsg") Log.i(TAG, "requestMsg:$requestMsg")
val postRequest = XHttp.post(requestUrl) val postRequest = XHttp.post(requestUrl).keepJson(true).timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s
.keepJson(true)
.timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s
.cacheMode(CacheMode.NO_CACHE).timeStamp(true) .cacheMode(CacheMode.NO_CACHE).timeStamp(true)
when (HttpServerUtils.clientSafetyMeasures) { when (HttpServerUtils.clientSafetyMeasures) {

4
app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt
View File

@ -25,7 +25,7 @@ class HttpServerUtils private constructor() {
companion object { companion object {
//是否启用HttpServer开机自启 //是否启用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, "") 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 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, "") var serverHistory: String by SharedPreference(SP_SERVER_HISTORY, "")