隐藏电阀门，wifi 调整显示，添加涂鸦 sn号

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -249,6 +249,16 @@
       "uid": "uuidc326da3f310fff6f",
       "ak": "btaFeNF4KP9UxWajlOitBUiqM2xrL3P4"
     },
+    "000A21050020123010190007": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuidaf7156cd378a8758",
+      "ak": "nWiq30QVeum2AmvKgwn331YLHhiJh8YE"
+    },
+    "000A21050020123010190008": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuidca3e4bd9890267d9",
+      "ak": "wzQfUANv5YAkNwl3AUNtFvoIm4GIVFou"
+    },
     "011A50370020123010190002": {
       "pid": "o0qxz32qigce6kpk",
       "uid": "uuid1ed716f65a8fc8c6",

BusinessCommon/src/main/java/com/develop/common/utils/CofarUtils.java

@@ -1,5 +1,7 @@
 package com.develop.common.utils;
 
+import android.net.wifi.WifiInfo;
+
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK;
 
 public class CofarUtils {

BusinessCommon/src/main/java/com/develop/common/widget/WifiContentView.kt

@@ -73,7 +73,7 @@ class WifiContentView : RelativeLayout {
         }
         binding.tvWifiState.text = if (model.isSavePwd && model.ipAddress.isNullOrEmpty()) {
             context.getString(R.string.network_wifi_status_saved)
-        } else if (model.isConnected) {
+        } else if (model.isConnected&&!model.ipAddress.isNullOrEmpty()&&!model.ipAddress.equals("0.0.0.0")) {
             context.getString(R.string.network_wifi_status_connected)
         } else {
             context.getString(R.string.off_line)

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

@@ -201,11 +201,14 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
                 curWifiData = wifiHelp.getConnectionWifi()
             }
         }.setScanCallback {
+
             it?.apply {
                 wifiDataList.clear()
                 wifiDataList.addAll(it)
                 binding.wifiRecycler.models = wifiDataList
                 selectedPosition = -2
+
+
                 //重连机制
 //                countDownTimer()
             }

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -135,10 +135,15 @@ class CookStepActivity : CookStepBaseActivity() {
             binding.viewChangeCrush.src = R.drawable.ic_cooking_weight
             binding.viewNote.setVisible()
         }
-        if (!getSN().startsWith("000")) {
-            binding.tvCount.setGone()
-            binding.ivPotCover.setGone()
-        }
+        //2023.12.13  000客户需要隐藏
+//        if (!getSN().startsWith("000")) {
+//            binding.tvCount.setGone()
+//            binding.ivPotCover.setGone()
+//        }
+
+        binding.tvCount.setGone()
+        binding.ivPotCover.setGone()
+
 
         binding.controller.clSetTime.onTimePickerCallback =
             object : TimePickerView.OnTimePickerCallback {
@@ -752,7 +757,7 @@ class CookStepActivity : CookStepBaseActivity() {
                         if (currentBgId == R.drawable.pot_clover_ele_unlock) {
                             binding.tvCount.setGone()
                         } else {
-                            binding.tvCount.setVisible()
+                            binding.tvCount.setGone()
                             potCloverInterval = Interval(0, 1, TimeUnit.SECONDS, 5).life(this)
                                 .subscribe {
                                     binding.tvCount.updateText(it.toString())
@@ -769,7 +774,7 @@ class CookStepActivity : CookStepBaseActivity() {
                         if (currentBgId == com.develop.common.R.drawable.pot_clover_ele_lock) {
                             binding.tvCount.setGone()
                         } else {
-                            binding.tvCount.setVisible()
+                            binding.tvCount.setGone()
                             potCloverInterval = Interval(0, 1, TimeUnit.SECONDS, 5).life(this)
                                 .subscribe {
                                     binding.tvCount.updateText(it.toString())

BusinessStep/src/main/res/layout/activity_mode_detail.xml

@@ -56,7 +56,7 @@
                 android:layout_toStartOf="@id/iv_pot_cover"
                 android:textColor="@color/color_92cf40"
                 android:textSize="@dimen/convert_50px"
-                android:visibility="invisible" />
+                android:visibility="gone" />
 
 
             <ImageView
@@ -66,7 +66,7 @@
                 android:layout_marginTop="@dimen/convert_24px"
                 android:layout_marginEnd="@dimen/convert_40px"
                 android:background="@drawable/pot_clover_ele_unlock"
-                android:visibility="visible" />
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/iv_eggs"

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -188,6 +188,7 @@ fun getSN(): String {
 
 //    return "045A10220020123010120023"
 //    return "000A30150020123010190001"
+//     return "000A10390020123010190001"
 //    return "010D30150020123010190001"
 //    return "011A30150020123010190001"
 //    return "007D20020020123010190001"

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

@@ -9,10 +9,8 @@ import android.net.*
 import android.net.NetworkInfo.DetailedState
 import android.net.wifi.*
 import android.os.Parcelable
+import android.util.Log
 import com.develop.base.ext.appGlobalScope
-import com.develop.base.ext.toJson
-import com.develop.base.manager.ConnectWifiUtils.WifiConnectCallback
-import com.develop.base.scop.safeGlobalScope
 import com.develop.base.util.TimeDownUtil
 import kotlinx.coroutines.*
 
@@ -190,7 +188,6 @@ class WifiHelp {
     }
 
 
-
     /**
      * 断开当前连接的网络
      */
@@ -314,7 +311,7 @@ class WifiHelp {
                     formatLevel(scanResult.level),
                     scanResult.BSSID,
                     "",
-                    securityType(scanResult.capabilities), configuration != null
+                    securityType(scanResult.capabilities), configuration != null, isConnected = isConnected(scanResult.SSID)
                 )
                 wifiList.add(wifiData)
             }
@@ -333,6 +330,19 @@ class WifiHelp {
         return wifiList
     }
 
+    open fun isConnected(ssid: String): Boolean {
+
+        val wifiInfo = mWifiManager.connectionInfo ?: return false
+        return when (wifiInfo.supplicantState) {
+            SupplicantState.AUTHENTICATING, SupplicantState.ASSOCIATING, SupplicantState.ASSOCIATED, SupplicantState.FOUR_WAY_HANDSHAKE, SupplicantState.GROUP_HANDSHAKE, SupplicantState.COMPLETED -> wifiInfo.ssid.replace(
+                "\"",
+                ""
+            ) == ssid
+
+            else -> false
+        }
+    }
+
     /**
      * 获取当前连接的WiFi网络
      */
@@ -360,11 +370,23 @@ class WifiHelp {
         appGlobalScope.launch(Dispatchers.IO) {
             val list = getScanDevice()
             val connectionWifi = getConnectionWifi()
+
+            val wifiList = mWifiManager.scanResults
+            wifiList.forEach {
+                Log.e("TAG wifi", it.toString())
+            }
+
+            list.forEach {
+                Log.e("TAG wifi list", it.toString())
+            }
+
             withContext(Dispatchers.Main) {
                 timeDownUtil?.cancel()
                 mBuild?.mScanCallback?.invoke(list)
                 mBuild?.mAlreadyConnectionCallback?.invoke(connectionWifi)
 
+
+
                 //重连机制
                 var isWifiConnected = false
                 list.forEach {
@@ -375,7 +397,7 @@ class WifiHelp {
 
 
                 var reconnectWifi =
-                    if (!isWifiConnected) list.filter { filter -> !filter.isConnected && filter.isSavePwd } else null
+                    if (!isWifiConnected) list.filter { filter -> filter.isConnected && filter.isSavePwd } else null
 
                 if (reconnectWifi!!.isNotEmpty()) {
                     initWork()
@@ -570,7 +592,7 @@ class WifiHelp {
                      * 当第一次连接的时候，会导致密码正确，但isSavaPwd 返回false，固加多个password 不为空的情况下，也不清除
                      * */
                     currWifiData?.apply {
-                        if (this.isSavePwd||this.password.isNotEmpty()) {
+                        if (this.isSavePwd || this.password.isNotEmpty()) {
                         } else {
                             removeSaveWifi(this)
                         }
@@ -626,6 +648,7 @@ class WifiHelp {
             getActiveNetworkInfo()?.detailedState
         } else null
     }
+
     /**
      * 获取当前网络信息
      */