优化:允许不填写服务端地址直接进入 主动控制·客户端 -> 一键换新机 -> 离线模式

This commit is contained in:
pppscn 2022-06-14 11:59:00 +08:00
parent 9c63910369
commit f9a3608500
2 changed files with 12 additions and 1 deletions

View File

@ -132,7 +132,7 @@ class ClientFragment : BaseFragment<FragmentClientBinding?>(),
override fun onItemClick(itemView: View, item: PageInfo, position: Int) { override fun onItemClick(itemView: View, item: PageInfo, position: Int) {
try { try {
if (!CommonUtils.checkUrl(HttpServerUtils.serverAddress)) { if (item.name != ResUtils.getString(R.string.api_clone) && !CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
XToastUtils.error(getString(R.string.invalid_service_address)) XToastUtils.error(getString(R.string.invalid_service_address))
serverConfig = null serverConfig = null
return return

View File

@ -18,6 +18,7 @@ import com.idormy.sms.forwarder.core.BaseFragment
import com.idormy.sms.forwarder.databinding.FragmentClientCloneBinding import com.idormy.sms.forwarder.databinding.FragmentClientCloneBinding
import com.idormy.sms.forwarder.entity.CloneInfo import com.idormy.sms.forwarder.entity.CloneInfo
import com.idormy.sms.forwarder.server.model.BaseResponse import com.idormy.sms.forwarder.server.model.BaseResponse
import com.idormy.sms.forwarder.utils.CommonUtils
import com.idormy.sms.forwarder.utils.HttpServerUtils import com.idormy.sms.forwarder.utils.HttpServerUtils
import com.idormy.sms.forwarder.utils.SettingUtils import com.idormy.sms.forwarder.utils.SettingUtils
import com.idormy.sms.forwarder.utils.XToastUtils import com.idormy.sms.forwarder.utils.XToastUtils
@ -220,6 +221,11 @@ class CloneFragment : BaseFragment<FragmentClientCloneBinding?>(), View.OnClickL
//推送配置 //推送配置
private fun pushData() { private fun pushData() {
if (!CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
XToastUtils.error(getString(R.string.invalid_service_address))
return
}
pushCountDownHelper?.start() pushCountDownHelper?.start()
val requestUrl: String = HttpServerUtils.serverAddress + "/clone/push" val requestUrl: String = HttpServerUtils.serverAddress + "/clone/push"
@ -273,6 +279,11 @@ class CloneFragment : BaseFragment<FragmentClientCloneBinding?>(), View.OnClickL
//拉取配置 //拉取配置
private fun pullData() { private fun pullData() {
if (!CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
XToastUtils.error(getString(R.string.invalid_service_address))
return
}
exportCountDownHelper?.start() exportCountDownHelper?.start()
val requestUrl: String = HttpServerUtils.serverAddress + "/clone/pull" val requestUrl: String = HttpServerUtils.serverAddress + "/clone/pull"