053处理

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -772,25 +772,7 @@ val dataSn = getSN()
         R.drawable.entrance_icon_2,
         R.drawable.entrance_icon_4
     )
-    private var titleStrIds = mutableListOf<Int>(
-        R.string.automatic_recipes,
-        R.string.automatic_programmes,
-        R.string.manual_cooking,
-        R.string.download_new_recipes
-    )
 
-    private var title002dStrIds = mutableListOf<Int>(
-        R.string.automatic_programmes,
-        R.string.manual_cooking,
-        R.string.automatic_recipes,
-        R.string.download_new_recipes
-    )
-    private var title2StrIds = mutableListOf<Int>(
-        R.string.Automatic_recipes,
-        R.string.Automatic_programmes,
-        R.string.Manual_cooking,
-        R.string.Download_new_recipes
-    )
 
 
     private var typeList = mutableListOf<EntranceType>(
@@ -846,6 +828,28 @@ val dataSn = getSN()
         R.drawable.entrance_icon_2,
         R.drawable.entrance_icon_4
     )
+    private var titleStrIds = mutableListOf<Int>(
+        R.string.automatic_recipes,
+        R.string.automatic_programmes,
+        R.string.manual_cooking,
+        R.string.download_new_recipes
+    )
+
+    private var title002dStrIds = mutableListOf<Int>(
+        R.string.automatic_programmes,
+        R.string.manual_cooking,
+        R.string.automatic_recipes,
+        R.string.download_new_recipes
+    )
+    private var title2StrIds = mutableListOf<Int>(
+        R.string.Automatic_recipes,
+        R.string.Automatic_programmes,
+        R.string.Manual_cooking,
+        R.string.Download_new_recipes
+    )
+
+
+
     private var titleStrIds1 = mutableListOf<Int>(
         R.string.automatic_recipes,
         R.string.manual_cooking,
@@ -853,6 +857,7 @@ val dataSn = getSN()
         R.string.download_new_recipes
     )
 
+
     private var titleStrIds011 = mutableListOf<Int>(
         R.string.automatic_recipes_011,
         R.string.automatic_programmes_011,
@@ -1058,8 +1063,8 @@ val dataSn = getSN()
                 EntranceData(
                     bg053AResIds[i],
                     iconResIds[i],
-                    titleStrIds1[i],
-                    titleStrIds1[i],
+                    titleStrIds[i],
+                    titleStrIds[i],
                     typeList[i]
                 )
             )

BusinessCommon/src/main/java/com/develop/common/dialog/SolenoidValveDialog.kt

@@ -0,0 +1,55 @@
+package com.develop.common.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import com.develop.base.mvvm.FullScreenTransparentDialog
+import com.develop.common.databinding.DialogSolenoidValveBinding
+
+class SolenoidValveDialog  : FullScreenTransparentDialog() {
+
+    lateinit var binding: DialogSolenoidValveBinding
+
+    var title = ""
+    var cancelStr = ""
+    var confirmStr = ""
+    var showConfirm = true
+    var showCancel = true
+    var onDialogClickListener: OnDialogClickListener? = null
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        binding = DialogSolenoidValveBinding.inflate(
+            inflater, container, false
+        )
+        binding.tvConfirm.setOnClickListener {
+            onDialogClickListener?.onConfirm()
+            removeSelf()
+        }
+
+
+//        监听旋钮点击回调
+        setOnKeyFun(object : onKeyFun {
+            override fun onType() {
+                onDialogClickListener?.onKey()
+//                if (binding.tvYes.visibility == View.VISIBLE) {
+//                    binding.tvYes.performClick() //默认点击控件
+//                } else if (binding.tvCancel.visibility == View.VISIBLE) {
+//                    binding.tvCancel.performClick()
+//                }
+            }
+        })
+
+
+
+        return binding.root
+    }
+
+    interface OnDialogClickListener {
+        fun onConfirm()
+        fun onCancel()
+        fun onKey()
+    }
+}

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -39,9 +39,11 @@ import com.develop.common.utils.NoScreenEvent
 import com.develop.common.utils.TimeDownUtil
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevPromptEvent
+import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 
 
 /**
@@ -53,7 +55,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     private var is062 = false
     private var screenReceiver: BroadcastReceiver? = null
 
-    public var baseSn = getSN()
+    var baseSn = getSN()
 
     protected var hasShowScreenSaver = false
     private var isModelNum = ""

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

@@ -196,7 +196,7 @@ class RingControlView @JvmOverloads constructor(
     fun setRange(min: Float, max: Float) {
         minPro = min
         maxPro = max
-    }
+    }   
 
     fun setCanTouch(touch: Boolean) {
         isCanTouch = touch

BusinessCommon/src/main/res/drawable/bg_solenoid_valve_count.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    android:useLevel="false"
+    android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <stroke android:color="@color/color_EE8F08"
+        android:width="@dimen/convert_4px"/>
+
+</shape>

BusinessCommon/src/main/res/layout/dialog_solenoid_valve.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="#000">
+
+    <RelativeLayout
+        android:layout_width="@dimen/convert_500px"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/bg_white_button_round10px"
+        android:paddingTop="@dimen/convert_60px"
+        android:paddingBottom="@dimen/convert_64px">
+        <ImageView
+            android:id="@+id/iv_pot_cover"
+            android:layout_width="@dimen/convert_160px"
+            android:layout_height="@dimen/convert_160px"
+            android:layout_centerHorizontal="true"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/pot_clover_ele_lock"
+            />
+        <TextView
+            android:id="@+id/tv_msg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginStart="@dimen/convert_50px"
+            android:layout_marginEnd="@dimen/convert_50px"
+            android:gravity="center"
+            android:layout_below="@+id/iv_pot_cover"
+            android:lineHeight="@dimen/convert_42px"
+            android:text="@string/solenoil_valve_msg_false"
+            android:textColor="#F30101"
+            android:textSize="@dimen/convert_30px" />
+
+        <TextView
+            android:id="@+id/tv_count"
+            android:layout_width="@dimen/convert_60px"
+            android:layout_height="@dimen/convert_60px"
+            android:background="@drawable/bg_solenoid_valve_count"
+            android:gravity="center"
+            android:layout_marginTop="@dimen/convert_30px"
+            android:layout_below="@+id/tv_msg"
+            android:text="5"
+            android:layout_centerHorizontal="true"
+            android:textColor="@color/color_EE8F08"
+            android:textSize="@dimen/convert_36px" />
+
+
+        <TextView
+            android:id="@+id/tv_confirm"
+            android:paddingLeft="@dimen/convert_30px"
+            android:paddingRight="@dimen/convert_30px"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/tv_msg"
+            android:layout_marginStart="@dimen/convert_90px"
+            android:layout_marginTop="@dimen/convert_30px"
+            android:visibility="gone"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/bg_ee8f08_button"
+            android:gravity="center"
+            android:text="@string/confirm"
+            android:textColor="#fff"
+            android:textSize="@dimen/convert_30px" />
+
+
+    </RelativeLayout>
+
+</FrameLayout>

BusinessCommon/src/main/res/values/strings.xml

@@ -208,6 +208,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="tare">TARE</string>
 
     <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
+    <string name="solenoil_valve_msg_false">Do not open the lid</string>
+    <string name="solenoil_valve_msg_true">Safe to open the lid</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">RESET</string>
     <string name="finish">Finish!</string>

BusinessMain/src/main/java/com/develop/main/ui/RecipesFragment.kt

@@ -563,8 +563,8 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     private var categoryTabSelectedCallback =
         object : CategoryTabViewLayout.OnCategoryTabSelectedListener {
             override fun onCurrentSelected(categoryType: CategoryType) {
-                loadingDialog.showDialog(childFragmentManager, "loadingDialog")
                 if (viewModel.recipesType == RecipesType.ONLINE) {
+                    loadingDialog.showDialog(childFragmentManager, "loadingDialog")
                     viewModel.getOnLineRecipeByHotWordsList(currentHotWord, categoryType)
                 } else {
                     viewModel.queryRecipesByHotWord(currentHotWord, categoryType)

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

@@ -68,7 +68,7 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
 
         }
         binding.tvYea.setOnClickListener {
-            if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
+            if (CofarSDK.devInfo().status != DevStatus.STOP.toInt()) {
                 cancelConfirmDialog.title = getString(com.develop.common.R.string.change_lang_tips)
                 cancelConfirmDialog.apply {
                     showCancel = false

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

@@ -115,7 +115,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
             DataFactory.genSetting011AModesList(resources)
         } else if (sn.startsWith("030A")||sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
-        } else if (sn.startsWith("036I")|| sn.startsWith("053A")|| sn.startsWith("058A") || sn.startsWith("058B")) {
+        } else if (sn.startsWith("036I")|| sn.startsWith("058A") || sn.startsWith("058B")) {
             DataFactory.genSetting036IModesList(resources)
         } else {
             DataFactory.genSettingModesList(resources)
@@ -501,7 +501,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
             DataFactory.genSetting011AModesList(resources)
         } else if (sn.startsWith("030A")||sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
-        } else if (sn.startsWith("036I")|| sn.startsWith("053A")|| sn.startsWith("058A") || sn.startsWith("058B")) {
+        } else if (sn.startsWith("036I")|| sn.startsWith("058A") || sn.startsWith("058B")) {
             DataFactory.genSetting036IModesList(resources)
         } else {
             DataFactory.genSettingModesList(resources)

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

@@ -864,7 +864,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onDevStateEvent(event: DevStatusEvent) {
-
+        Log.e("TAG onDevStateEvent","Modes onDevStateEvent  Modes Modes ")
         if (!initModeData) {
             return
         }

app/build.gradle

@@ -779,6 +779,7 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
 
+//            manifestPlaceholders = [channelName: "brand033FTuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
 //            buildConfigField("String", "model", "\"1039\"")

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

@@ -255,7 +255,7 @@ fun getSN(): String {
 //        return "063B21050020123010190001"
 //        return  "049B10390020123010190001"
 //        return "000A50370020123010190017"
-        return  "053A10390020123010190001"
+        return  "053A10390020123010190088"
 //        return  "000A10390020123010190023"
 //        return  "000A21050020123010190023"
 //        return "000A50670020123010190005"