扭橙模式BUG处理

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

@@ -161,6 +161,12 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
                         }
 
                         override fun onContentClick(wifiData: WifiData) {
+
+                            if (getNetAuthConnect()){
+                                GlobalToast.showToast("wifi 正在连接中")
+                                return
+                            }
+
                             val clickModel = wifiData
                             if (clickModel.isConnected) {
                                 GlobalToast.showToast(context.getString(com.develop.common.R.string.connected_successfully))
@@ -249,6 +255,9 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         }.setAlreadyConnectionCallback {
             dismissPlainDialog()
         }.setNetworkStateChangedListener {
+            //AUTHENTICATING
+
+            Log.e("TAG WIFI","STATE :"+it)
             dismissPlainDialog()
         }.build()
 
@@ -306,6 +315,21 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         binding.wifiRecycler.scrollY = deltaHeight
     }
 
+
+    private  fun  getNetAuthConnect(): Boolean {
+        var isContend = wifiHelp.isNetworkConnected(this)
+                Log.d("TAG wifi","isContend :"+isContend)
+
+//        var netState = wifiHelp.getDetailedState()
+//        Log.d("TAG wifi","state :"+netState)
+//        //判断是否网络正在连接中
+//        return NetworkInfo.DetailedState.AUTHENTICATING == netState
+//                ||  NetworkInfo.DetailedState.CONNECTING ==netState
+//                ||  NetworkInfo.DetailedState.OBTAINING_IPADDR ==netState
+
+        return  isContend
+    }
+
     //获取是否有涂鸦功能
 //    fun getDevInfo() {
 //        //已经有涂鸦功能，避免再次请求

BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -773,20 +773,23 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             }
         }
 
-
+        //devInfo.potCloverStatus 0是合盖，1是没盒盖
         //处理扭橙逻辑 一进来是扭橙盖，重新打开，重新闭合 没办法跳转到扭橙页面
         if (event.devInfo.potCloverStatus.toInt() == 1){
             isResetZero = event.devInfo.resetZero.toInt()
         }
+
+        //处理扭橙运行过程中打开盖子还倒计时，估要调用SDK stop方法
+        if (modeType==WorkModes.CITRUS_JUICER&&isClickType == DevStatus.RUNNING.toInt() &&event.devInfo.potCloverStatus.toInt() == 1){
+            stopClick()
+        }
+
         //处理扭橙问题 扭橙 resetZero ==1 //普通 resetZero ==0
         /**
          * 当扭橙的值不等于初始化的时候，就需要重新跳转ModesDetails
          * */
         if (event.devInfo.resetZero.toInt() == 1 && event.devInfo.resetZero.toInt() != isResetZero) {
-            //之前忘记判断在当前扭橙程序，不用重新跳转页面
-            if (modeType==WorkModes.CITRUS_JUICER){
-                return
-            }
+
 
 
             var modeName = if (sn.startsWith("011"))  {

libBase/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="com.develop.base">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
 </manifest>

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

@@ -244,6 +244,7 @@ class WifiHelp {
 
     fun removeSaveSSIDWifi(ssid: String) {
         val wifiConfigurationList = mWifiManager.configuredNetworks
+        mBuild?.mNetworkStateChangedListener?.invoke(NetworkInfo.DetailedState.FAILED)
         for (item in wifiConfigurationList) {
             if (item.SSID == addQuotationMarks(ssid)) {
                 mWifiManager.disconnect()
@@ -661,6 +662,14 @@ class WifiHelp {
             getActiveNetworkInfo()?.detailedState
         } else null
     }
+
+    fun isNetworkConnected (context: Context) :Boolean{
+        var connectivityManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        var activeNetworkInfo  = connectivityManager.activeNetworkInfo;
+        return activeNetworkInfo != null && activeNetworkInfo.isConnected;
+    }
+
     /**
      * 获取当前网络信息
      */