liangsheng8708
/
SmsForwarder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：服务端地址不限制域名后缀

This commit is contained in:
pppscn 2022-06-07 19:07:22 +08:00
parent 3887822962
commit 628b704d02
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,10 +15,7 @@ import com.idormy.sms.forwarder.core.BaseFragment
import com.idormy.sms.forwarder.databinding.FragmentClientBinding import com.idormy.sms.forwarder.databinding.FragmentClientBinding
import com.idormy.sms.forwarder.server.model.BaseResponse import com.idormy.sms.forwarder.server.model.BaseResponse
import com.idormy.sms.forwarder.server.model.ConfigData import com.idormy.sms.forwarder.server.model.ConfigData
import com.idormy.sms.forwarder.utils.CLIENT_FRAGMENT_LIST import com.idormy.sms.forwarder.utils.*
import com.idormy.sms.forwarder.utils.HttpServerUtils
import com.idormy.sms.forwarder.utils.SettingUtils
import com.idormy.sms.forwarder.utils.XToastUtils
import com.xuexiang.xaop.annotation.SingleClick import com.xuexiang.xaop.annotation.SingleClick
import com.xuexiang.xhttp2.XHttp import com.xuexiang.xhttp2.XHttp
import com.xuexiang.xhttp2.cache.model.CacheMode import com.xuexiang.xhttp2.cache.model.CacheMode
@ -35,7 +32,6 @@ import com.xuexiang.xui.utils.DensityUtils
import com.xuexiang.xui.utils.ResUtils import com.xuexiang.xui.utils.ResUtils
import com.xuexiang.xui.utils.WidgetUtils import com.xuexiang.xui.utils.WidgetUtils
import com.xuexiang.xui.widget.actionbar.TitleBar import com.xuexiang.xui.widget.actionbar.TitleBar
import com.xuexiang.xutil.net.NetworkUtils
@Suppress("PrivatePropertyName", "PropertyName") @Suppress("PrivatePropertyName", "PropertyName")
@Page(name = "主动控制·客户端") @Page(name = "主动控制·客户端")
@ -68,7 +64,7 @@ class ClientFragment : BaseFragment<FragmentClientBinding?>(),
widgetItemAdapter.setOnItemClickListener(this) widgetItemAdapter.setOnItemClickListener(this)
binding!!.recyclerView.adapter = widgetItemAdapter binding!!.recyclerView.adapter = widgetItemAdapter
if (NetworkUtils.isUrlValid(HttpServerUtils.serverAddress)) queryConfig(false) if (CommonUtils.checkUrl(HttpServerUtils.serverAddress)) queryConfig(false)
} }
override fun initTitle(): TitleBar? { override fun initTitle(): TitleBar? {
@ -110,7 +106,7 @@ class ClientFragment : BaseFragment<FragmentClientBinding?>(),
override fun onClick(v: View) { override fun onClick(v: View) {
when (v.id) { when (v.id) {
R.id.btn_server_test -> { R.id.btn_server_test -> {
if (!NetworkUtils.isUrlValid(HttpServerUtils.serverAddress)) { if (!CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
XToastUtils.error("请输入有效的服务地址") XToastUtils.error("请输入有效的服务地址")
return return
} }
@ -122,7 +118,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 (!NetworkUtils.isUrlValid(HttpServerUtils.serverAddress)) { if (!CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
XToastUtils.error("请输入有效的服务地址") XToastUtils.error("请输入有效的服务地址")
serverConfig = null serverConfig = null
return return