提交人：jtm

提交内容:bug fixed

BusinessSetting/src/main/java/com/develop/setting/ui/WifiListActivity.kt

@@ -49,6 +49,8 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         return ActivityWifiListBinding.inflate(inflater)
     }
 
+    private var curWifiData: WifiData? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (!getWlanStatus()) {
@@ -170,7 +172,19 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         }
 
         wifiHelp = WifiHelp.Build(this).setErrorAuthenticating {
+
             dismissPlainDialog()
+            if (it == "ERROR") {
+                curWifiData?.apply {
+                    if (password.isNotEmpty()){
+                        wifiHelp.connect(this,password)
+                    } else {
+                        wifiHelp.connect(this)
+                    }
+                }
+            } else {
+                curWifiData = wifiHelp.getConnectionWifi()
+            }
         }.setScanCallback {
             it?.apply {
                 wifiDataList.clear()
@@ -204,13 +218,14 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
 
     override fun onResume() {
         super.onResume()
-        AndPermission.with(this).runtime().permission(
-            Permission.ACCESS_FINE_LOCATION,
-            Permission.ACCESS_BACKGROUND_LOCATION,
-            Permission.ACCESS_COARSE_LOCATION
-        ).onGranted {
-            wifiHelp.scan()
-        }.start()
+        wifiHelp.scan()
+//        AndPermission.with(this).runtime().permission(
+//            Permission.ACCESS_FINE_LOCATION,
+//            Permission.ACCESS_BACKGROUND_LOCATION,
+//            Permission.ACCESS_COARSE_LOCATION
+//        ).onGranted {
+//            wifiHelp.scan()
+//        }.start()
     }
 
     companion object {

libBase/src/main/java/com/develop/base/manager/WifiHelp.kt

@@ -511,7 +511,7 @@ class WifiHelp {
                     currWifiData?.apply {
                         removeSaveWifi(this)
                     }
-                    mBuild?.mErrorAuthenticating?.invoke("failed to connect")
+                    mBuild?.mErrorAuthenticating?.invoke("ERROR")
                     refreshWifiData()
                 }
             }