From 628b704d020fee8e78380dfd53ee1c6a898674bc Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Tue, 7 Jun 2022 19:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AB=AF=E5=9C=B0=E5=9D=80=E4=B8=8D=E9=99=90=E5=88=B6=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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