036改动，涂鸦功能新增

BusinessAirFryer/src/main/assets/config.json

@@ -227,6 +227,115 @@
       "icon": "dehydrate",
       "devMode": "AIR_FRYER",
       "listShow": true
+    },
+
+
+
+
+
+    {
+      "type": "AF_DIY",
+      "name": "af_diy",
+      "bg": "af_diy_bg",
+      "icon": "af_diy",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_AIR_FRYER",
+      "name": "af_air_fryer",
+      "bg": "af_air_fryer_bg",
+      "icon": "af_air_fryer",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_BAKE",
+      "name": "af_bake",
+      "bg": "af_bake_bg",
+      "icon": "af_bake",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_DRUMSTICKS",
+      "name": "af_drumsticks",
+      "bg": "af_drumsticks_bg",
+      "icon": "af_drumsticks",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_EGG_TART",
+      "name": "af_egg_tart",
+      "bg": "af_egg_tart_bg",
+      "icon": "af_egg_tart",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_PIZZA",
+      "name": "af_pizza",
+      "bg": "af_pizza_bg",
+      "icon": "af_pizza",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_DEHYDRATE",
+      "name": "af_dehydrate",
+      "bg": "af_dehydrate_bg",
+      "icon": "af_dehydrate",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_REHEAT",
+      "name": "af_reheat",
+      "bg": "af_reheat_bg",
+      "icon": "af_reheat",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_CHICKEN_WING",
+      "name": "af_chicken_wing",
+      "bg": "af_chicken_wing_bg",
+      "icon": "af_chicken_wing",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_STEAK",
+      "name": "af_steak",
+      "bg": "af_steak_bg",
+      "icon": "af_steak",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_SEA_FOOD",
+      "name": "af_sea_food",
+      "bg": "af_sea_food_bg",
+      "icon": "af_sea_food",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_VEGETABLE",
+      "name": "af_vegetable",
+      "bg": "af_vegetable_bg",
+      "icon": "af_vegetable",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_MUTTON_CHOP",
+      "name": "af_mutton_chop",
+      "bg": "af_mutton_chop_bg",
+      "icon": "af_mutton_chop",
+      "devMode": "AIR_FRYER",
+      "listShow": false
     }
   ]
 }

BusinessAirFryer/src/main/assets/config_036.json

@@ -1,6 +1,14 @@
 {
   "baseQrUrl": "https://icook.schneiderconsumer.com/h5/index.html",
   "workModes": [
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking",
+      "bg": "ic_mode_diy",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": false
+    },
     {
       "type": "KNEAD_TOUGH",
       "name": "knead_dough",

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -25,6 +25,21 @@
       "uid": "uuid0686e96fe0e49ef4",
       "ak": "Vvys7wDcOiOeSpAmSCzI0jgB5g7cXr5W"
     },
+    "036I21060020123010190007": {
+      "pid": "dquk8axtyy72c1ap",
+      "uid": "uuidb5ce9b399f31f1a3",
+      "ak": "8ZMZRFA5msXgKU2O9vg9bCfcDEQNWmsd"
+    },
+    "036I21060020123010190008": {
+      "pid": "dquk8axtyy72c1ap",
+      "uid": "uuid6eb31de7249f43bb",
+      "ak": "jdVt2ajMrZu4x9OYlZjCML4C0nSRMBsZ"
+    },
+    "036I21060020123010190009": {
+      "pid": "dquk8axtyy72c1ap",
+      "uid": "uuid211a96507a9e4897",
+      "ak": "akVi86YxPUyUF8pDU7Gir7BfKXUD5w4r"
+    },
     "011A10390020123010190001": {
       "pid": "qgdd3xgte8ia75pp",
       "uid": "uuidcfb66c9f9dcea3dc",

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

@@ -24,12 +24,13 @@ object DataFactory {
 
 
     fun createLanguageDataV2(resource: Resources): List<ConfigUtils.Lang> {
-        return ConfigUtils.loadLangConfig()?.langs?.filter {  it.show == true } ?: Collections.emptyList();
+        return ConfigUtils.loadLangConfig()?.langs?.filter { it.show == true }
+            ?: Collections.emptyList();
     }
 
     fun createLanguageData(resource: Resources): MutableList<LanguageModel> {
         val languageList = mutableListOf<LanguageModel>()
-        val strList = if (isNightTheme()|| isBrand036I()) {
+        val strList = if (isNightTheme() || isBrand036I()) {
             mutableListOf<String>(
 //            resource.getString(R.string.chinese),
                 resource.getString(R.string.france),
@@ -42,7 +43,7 @@ object DataFactory {
 //            resource.getString(R.string.japan)
             )
         }
-        val iconList = if (isNightTheme()|| isBrand036I()) {
+        val iconList = if (isNightTheme() || isBrand036I()) {
             mutableListOf<Int>(
 //
 //            R.drawable.ic_chinese,
@@ -55,7 +56,7 @@ object DataFactory {
 //            R.drawable.ic_japan
             )
         }
-        val typeList = if (isNightTheme()|| isBrand036I()) {
+        val typeList = if (isNightTheme() || isBrand036I()) {
             mutableListOf<LanguageType>(
 //            LanguageType.Chinese,
                 LanguageType.France
@@ -173,7 +174,7 @@ object DataFactory {
 //            R.drawable.ic_setting_folder,
             R.drawable.ic_setting_reset,
             R.drawable.ic_setting_about,
-            )
+        )
 
         val nameList = mutableListOf(
             resource.getString(R.string.language), resource.getString(R.string.wifi),
@@ -192,24 +193,25 @@ object DataFactory {
         )
 
 
-        var isTuya = MMkvUtils.getBool(ISTUYA,false)
-        if (isTuya){
-            settingTypeList.add(SettingType.TUYA)
-            nameList.add(resource.getString(R.string.tuya))
-            resIdList.add(R.drawable.ic_setting_tuya)
-        }
-//        var tuyaConfig =  ConfigUtils.loadTuyaConfig()
-//        if(tuyaConfig != null){
+//        var isTuya = MMkvUtils.getBool(ISTUYA, false)
+//        if (isTuya) {
 //            settingTypeList.add(SettingType.TUYA)
 //            nameList.add(resource.getString(R.string.tuya))
 //            resIdList.add(R.drawable.ic_setting_tuya)
 //        }
 
+        // 2024.3.20 涂鸦新需求，不管有没有涂鸦功能都显示出来
+        settingTypeList.add(SettingType.TUYA)
+        nameList.add(resource.getString(R.string.tuya))
+        resIdList.add(R.drawable.ic_setting_tuya)
+
+
         for (i in resIdList.indices) {
             result.add(SettingModel(resIdList[i], nameList[i], settingTypeList[i]))
         }
         return result
     }
+
     fun genSetting032DModesList(resource: Resources): MutableList<SettingModel> {
         val result = mutableListOf<SettingModel>()
         val resIdList = mutableListOf(
@@ -249,6 +251,13 @@ object DataFactory {
 //            resIdList.add(R.drawable.ic_setting_tuya)
 //        }
 
+        // 2024.3.20 涂鸦新需求，不管有没有涂鸦功能都显示出来
+        settingTypeList.add(SettingType.TUYA)
+        nameList.add(resource.getString(R.string.tuya))
+        resIdList.add(R.drawable.ic_setting_tuya)
+
+
+
         for (i in resIdList.indices) {
             result.add(SettingModel(resIdList[i], nameList[i], settingTypeList[i]))
         }
@@ -286,12 +295,10 @@ object DataFactory {
             SettingType.RESTORE_FACTORY_SETTINGS, SettingType.ABOUT
         )
 
-        var isTuya = MMkvUtils.getBool(ISTUYA,false)
-        if (isTuya){
-            settingTypeList.add(SettingType.TUYA)
-            nameList.add(resource.getString(R.string.tuya))
-            resIdList.add(R.drawable.ic_setting_tuya)
-        }
+        // 2024.3.20 涂鸦新需求，不管有没有涂鸦功能都显示出来
+        settingTypeList.add(SettingType.TUYA)
+        nameList.add(resource.getString(R.string.tuya))
+        resIdList.add(R.drawable.ic_setting_tuya)
 
 
 //        var tuyaConfig =  ConfigUtils.loadTuyaConfig()
@@ -306,6 +313,7 @@ object DataFactory {
         }
         return result
     }
+
     fun genSetting010DModesList(resource: Resources): MutableList<SettingModel> {
         val result = mutableListOf<SettingModel>()
         val resIdList = mutableListOf(
@@ -336,13 +344,10 @@ object DataFactory {
 //            SettingType.STORAGE,
             SettingType.RESTORE_FACTORY_SETTINGS, SettingType.ABOUT
         )
-
-        var isTuya = MMkvUtils.getBool(ISTUYA,false)
-        if (isTuya){
-            settingTypeList.add(SettingType.TUYA)
-            nameList.add(resource.getString(R.string.tuya))
-            resIdList.add(R.drawable.ic_setting_tuya)
-        }
+        // 2024.3.20 涂鸦新需求，不管有没有涂鸦功能都显示出来
+        settingTypeList.add(SettingType.TUYA)
+        nameList.add(resource.getString(R.string.tuya))
+        resIdList.add(R.drawable.ic_setting_tuya)
 
 //        var tuyaConfig =  ConfigUtils.loadTuyaConfig()
 //        if(tuyaConfig != null){
@@ -357,7 +362,11 @@ object DataFactory {
         return result
     }
 
-    fun genLocalRecipes(categoryName: String, recipesList: MutableList<DevRecipe>, favoriteRecipes: MutableList<UserFavoriteRecipes>, sortedType: SortedType
+    fun genLocalRecipes(
+        categoryName: String,
+        recipesList: MutableList<DevRecipe>,
+        favoriteRecipes: MutableList<UserFavoriteRecipes>,
+        sortedType: SortedType
     ): MutableList<Any> {
         val result = mutableListOf<Any>()
         val homeHeader = HomeHeader()
@@ -709,6 +718,7 @@ object DataFactory {
         }
         return dataList
     }
+
     fun get011AEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds.indices) {
@@ -720,6 +730,7 @@ object DataFactory {
         }
         return dataList
     }
+
     //当时没弄清楚需求，弄多一个了5037，（以为客户要区分1039 5037） 后面主页面用同一个，所以前面的没有删除
     fun get011A5037EntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
@@ -732,6 +743,7 @@ object DataFactory {
         }
         return dataList
     }
+
     fun get054AEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds.indices) {
@@ -743,6 +755,7 @@ object DataFactory {
         }
         return dataList
     }
+
     fun get045AEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds.indices) {
@@ -754,6 +767,7 @@ object DataFactory {
         }
         return dataList
     }
+
     fun get002DEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds.indices) {
@@ -784,7 +798,11 @@ object DataFactory {
         for (i in iconResIds1.indices) {
             dataList.add(
                 EntranceData(
-                    bg032DResIds[i], icon032DResIds[i], titleStrIds32[i], titleStrIds32[i], typeList[i]
+                    bg032DResIds[i],
+                    icon032DResIds[i],
+                    titleStrIds32[i],
+                    titleStrIds32[i],
+                    typeList[i]
                 )
             )
         }

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

@@ -60,8 +60,19 @@ class CancelConfirmDialog(
             layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL)
             binding.tvCancel.layoutParams = layoutParams
         }
+        //监听旋钮点击回调
+        setOnKeyFun(object : onKeyFun {
+            override fun onType() {
+                if (binding.tvYes.visibility == View.VISIBLE) {
+                    binding.tvYes.performClick() //默认点击控件
+                } else if (binding.tvCancel.visibility == View.VISIBLE) {
+                    binding.tvCancel.performClick()
+                }
 
 
+            }
+        })
+
 
         return binding.root
     }
@@ -69,7 +80,6 @@ class CancelConfirmDialog(
         binding.tvYes.callOnClick()
     }
 
-
     interface OnDialogClickListener {
         fun onConfirm()
         fun onCancel()

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

@@ -29,6 +29,9 @@ class CancelConfirmImageDialog(
         binding = DialogCancelConfirmImageBinding.inflate(
             inflater, container, false
         )
+
+
+
         binding.tvYes.setOnClickListener {
             onDialogClickListener?.onConfirm()
             removeSelf()
@@ -63,10 +66,24 @@ class CancelConfirmImageDialog(
         }
 
 
+        //监听旋钮点击回调
+        setOnKeyFun(object : onKeyFun {
+            override fun onType() {
+                if (binding.tvYes.visibility == View.VISIBLE) {
+                    binding.tvYes.performClick() //默认点击控件
+                } else if (binding.tvCancel.visibility == View.VISIBLE) {
+                    binding.tvCancel.performClick()
+                }
+
+
+            }
+        })
+
 
         return binding.root
     }
-    fun onConfirmClick(){
+
+    fun onConfirmClick() {
         binding.tvYes.callOnClick()
     }
 

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

@@ -22,6 +22,15 @@ class PotCoverUnlockedDialog: FullScreenTransparentDialog() {
         binding.ivCancel.setOnClickListener {
             removeSelf()
         }
+
+        //监听旋钮点击回调
+        setOnKeyFun(object : onKeyFun {
+            override fun onType() {
+                binding.ivCancel.performClick()
+            }
+        })
+
+
         return binding.root
     }
 

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

@@ -27,6 +27,7 @@ class PwdDialog(
         binding = DialogPwdBinding.inflate(
             inflater, container, false
         )
+
         binding.tvYes.setOnClickListener {
             val pwd = binding.etPwd.text.toString()
             onDialogClickListener?.onConfirm(pwd)

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

@@ -0,0 +1,30 @@
+package com.develop.common.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.RelativeLayout
+import com.develop.common.R
+import com.develop.common.databinding.PopEggsViewBinding
+import com.develop.common.databinding.PopPwdBinding
+import com.develop.common.dialog.PwdDialog
+
+class PwdLayout :FrameLayout {
+    private var binding: PopPwdBinding
+
+    constructor(context: Context) : super(context) {}
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {}
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    )
+
+    init {
+        val root = View.inflate(context, R.layout.pop_pwd, this)
+        binding = PopPwdBinding.bind(root)
+    }
+
+
+}

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

@@ -0,0 +1,81 @@
+<?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"
+    >
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#4D000000"
+    >
+    <RelativeLayout
+        android:layout_centerInParent="true"
+        android:layout_width="@dimen/convert_500px"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/bg_white_button_round10px"
+        android:paddingBottom="@dimen/convert_64px">
+
+        <TextView
+            android:id="@+id/pwd_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/convert_30px"
+            android:gravity="center"
+            android:text="Please input password"
+            android:textColor="#F30101"
+            android:textSize="@dimen/convert_30px" />
+
+
+        <EditText
+            android:id="@+id/pwd_et_pwd"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_80px"
+            android:layout_below="@id/pwd_title"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="20dp"
+            android:paddingStart="@dimen/convert_24px"
+            android:paddingEnd="@dimen/convert_24px"
+            android:background="@drawable/shape_10pxf4a12e_stoke"
+            android:inputType="textPassword"
+            android:singleLine="true" />
+
+
+        <TextView
+            android:id="@+id/pwd_tv_yes"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/pwd_et_pwd"
+            android:layout_marginStart="@dimen/convert_90px"
+            android:layout_marginTop="@dimen/convert_40px"
+            android:background="@drawable/bg_ee8f08_button"
+            android:gravity="center"
+            android:paddingLeft="@dimen/convert_32px"
+            android:paddingRight="@dimen/convert_32px"
+            android:text="@string/yes"
+            android:textColor="#fff"
+            android:textSize="@dimen/convert_30px" />
+
+        <TextView
+            android:id="@+id/pwd_tv_cancel"
+            android:layout_width="@dimen/convert_140px"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/pwd_et_pwd"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/convert_40px"
+            android:layout_marginEnd="@dimen/convert_90px"
+            android:background="@drawable/bg_ee8f08_stoke"
+            android:elevation="@dimen/convert_15px"
+            android:gravity="center"
+            android:paddingLeft="@dimen/convert_32px"
+            android:paddingRight="@dimen/convert_32px"
+            android:text="@string/no"
+            android:textColor="@color/no_color"
+            android:textSize="@dimen/convert_30px" />
+
+    </RelativeLayout>
+</RelativeLayout>
+</FrameLayout>

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

@@ -56,6 +56,12 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="reset">RESTORE FACTORY SETTINGS</string>
     <string name="about">ABOUT</string>
     <string name="tuya">App  Download</string>
+
+    <string name="tuya_app_title">With Tuya</string>
+    <string name="tuya_app_content">Please use app (with Tuya ) to scan the QR code</string>
+    <string name="tuya_sn_title">Cobotmix</string>
+    <string name="tuya_sn_content">Please use cobotmix app to scan the QR code</string>
+
     <string name="weight">WEIGHT</string>
     <string name="local_recipes">Local recipes</string>
     <string name="download">Download</string>

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

@@ -61,6 +61,11 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="reset">RESTORE FACTORY SETTINGS</string>
     <string name="about">ABOUT</string>
     <string name="tuya">TUYA</string>
+
+    <string name="tuya_app_title">With Tuya</string>
+    <string name="tuya_app_content">Please use app (with Tuya ) to scan the QR code</string>
+    <string name="tuya_sn_title">Cobotmix</string>
+    <string name="tuya_sn_content">Please use cobotmix app to scan the QR code</string>
     <string name="weight">WEIGHT</string>
     <string name="local_recipes">Local recipes</string>
     <string name="download">Download</string>

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

@@ -41,6 +41,8 @@ import java.lang.reflect.Method
 @Route(path = Screens.Main.HOME)
 class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
 
+    private var isKeyUP = false // 处理用户长按点击finish 页面，会重新调用keyup
+
     private val modesFragment by lazy {
         ModesFragment()
     }
@@ -353,15 +355,12 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
             when (event.keyCode) {
                 //旋转+
                 TURN_UP_KEY_CODE -> {
-                    Log.d("TAG aaaaaa", "TURN_UP_KEY_CODE : ${event.keyCode}")
                     viewModel.positionRecycle.postValue("TURN_UP_KEY_CODE")
                     // 创建一个新的KeyEvent对象，并设置新的keyCode值
 
                 }
                 //旋转-
                 TURN_DOWN_KEY_CODE -> {
-                    Log.d("TAG aaaaaa", "TURN_DOWN_KEY_CODE : ${event.keyCode}")
-
                     viewModel.positionRecycle.postValue("TURN_DOWN_KEY_CODE")
                 }
             }
@@ -369,6 +368,28 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
         return super.dispatchKeyEvent(event)
     }
 
+    override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+        if (keyCode == PRESS_DOWN_KEY_CODE) {
+            if (isKeyUP){
+                isKeyUP = false
+            }else{
+                viewModel.positionRecycle.postValue("PRESS_DOWN_KEY_CODE")
+            }
+            return  false
+        }
+        return super.onKeyUp(keyCode, event)
+
+    }
+
+
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == 50) {
+            //处理长按和正常返回的逻辑
+            isKeyUP = data?.getBooleanExtra("type",false) ?:false
+        }
+    }
 
     class HomeBackClickEvent(showOnline: Boolean)
 

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

@@ -9,8 +9,10 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSnapHelper
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.getBrandNum
 import com.develop.base.ext.getModelNum
@@ -36,6 +38,7 @@ import com.develop.main.R
 import com.develop.main.databinding.FragmentModesBinding
 import com.develop.main.viewmodel.HomeViewModel
 import com.drake.brv.utils.linear
+import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.CommonEventTypes
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevModes
@@ -62,6 +65,9 @@ class  ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>()
     private var devMode = ""
     private var isDevModes = true
     private var isModelNum = ""
+    private var recyclePosition = 1
+    private var recycleTouch = false
+    private var modes :List<WorkMode>  ?= null
     override fun createViewModel(): HomeViewModel {
         return getViewModelOfActivity(HomeViewModel::class.java)
     }
@@ -109,8 +115,8 @@ class  ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>()
         if (configJson?.workModes?.size == 0) {
             return
         }
+         modes = configJson?.workModes?.filter { it.devMode == devMode && it.listShow == true }
 
-        var modes = configJson?.workModes?.filter { it.devMode == devMode && it.listShow == true }
 
         binding.galleryRecycle.apply {
 
@@ -273,11 +279,85 @@ class  ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>()
                         child.alpha = alpha
                     }
                 }
+
+                override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                    super.onScrollStateChanged(recyclerView, newState)
+                    when (newState) {
+                        RecyclerView.SCROLL_STATE_IDLE -> {
+                            //判断是否是旋钮滑动，旋钮滑动不变，若是手动滑动，position 需要重新获取
+                            if (recycleTouch){
+                                val layoutManager = recyclerView.layoutManager as LinearLayoutManager?
+                                // 获取当前显示的第一个Item的位置
+                                val firstVisiblePosition = layoutManager!!.findFirstVisibleItemPosition()
+                                recyclePosition = firstVisiblePosition
+                            }
+                            recycleTouch = true
+                        }
+
+                    }
+                }
             })
 
         }
+
+        /**
+         * 旋转物理键
+         */
+        viewModel.positionRecycle.observe(viewLifecycleOwner) {
+
+            if (it.equals("TURN_UP_KEY_CODE")) {
+                //向右
+                if (recyclePosition>=binding.galleryRecycle.models?.size!!-1){
+                    recyclePosition = binding.galleryRecycle.models?.size!!-1
+
+
+                }else{
+                    recyclePosition +=1
+
+                }
+            } else if (it.equals("TURN_DOWN_KEY_CODE")) {
+                //向左
+
+                if (recyclePosition == 0) {
+                    recyclePosition = 0
+                } else {
+                    if (recyclePosition<1){
+                        recyclePosition = 0
+                    }else{
+                        recyclePosition -= 1;
+                    }
+                }
+            }else if (it.equals("PRESS_DOWN_KEY_CODE")){
+                //点击旋钮
+                modeStartAc()
+
+            }
+
+            recycleTouch = false
+            binding.galleryRecycle.smoothScrollToPosition(recyclePosition)
+        }
+
+    }
+    private  fun  modeStartAc(){
+        val devInfo = CofarSDK.devInfo();
+
+        if (devInfo.status != DevStatus.STOP.toInt() && devInfo.runningInstId != modes?.get(
+                recyclePosition
+            )?.type
+        ) {
+            runningWeightTips()
+            return
+        }
+        navigateTo(Screens.Cook.COOK_MODES,50) {
+            val bundle = Bundle()
+            bundle.putString(MODE_TYPE, modes?.get(recyclePosition)?.type)
+            with(bundle)
+        }
+
     }
 
+
+
     private val runningTipsDialog: CancelConfirmDialog = CancelConfirmDialog()
 
 

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

@@ -1,37 +1,37 @@
 package com.develop.setting.ui
 
-import android.app.Activity
 import android.app.PendingIntent
 import android.content.*
 import android.content.pm.PackageInstaller
-import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.ResultReceiver
 import android.provider.Settings
-import android.util.DisplayMetrics
-import android.util.Log
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
+import android.view.WindowManager
+import android.widget.EditText
+import android.widget.FrameLayout
 import android.widget.LinearLayout
-import android.widget.Toast
+import android.widget.PopupWindow
 import android.widget.RelativeLayout
-import androidx.core.content.FileProvider
+import android.widget.TextView
+import android.widget.Toast
+import androidx.databinding.ViewDataBinding
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.azhon.appupdate.listener.OnDownloadListener
 import com.blankj.utilcode.util.AppUtils
-import com.develop.base.R
+import com.blankj.utilcode.util.KeyboardUtils
+import com.blankj.utilcode.util.KeyboardUtils.hideSoftInput
 import com.develop.base.ext.dimenRes
-import com.develop.base.ext.getAppCode
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isBrand054A
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.setVisible
-import com.develop.base.ext.toJson
 import com.develop.base.ext.updateText
 import com.develop.base.util.GlobalToast
+import com.develop.base.widgets.CommonPopupWindow
 import com.develop.common.dialog.CancelConfirmDialog
 import com.develop.common.dialog.CommonDialog
 import com.develop.common.dialog.PwdDialog
@@ -41,6 +41,7 @@ import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBVMActivity
 import com.develop.common.utils.AppVersionUtil
 import com.develop.common.utils.UpdateUtil
+import com.develop.common.widget.PwdLayout
 import com.develop.setting.databinding.ActivityAboutBinding
 import com.develop.setting.ui.viewmodel.AboutViewModel
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
@@ -48,7 +49,6 @@ import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
 import org.greenrobot.eventbus.Subscribe
 import java.io.*
-import java.nio.charset.Charset
 
 
 @Route(path = Screens.Setting.ABOUT)
@@ -84,6 +84,131 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         RecipeUpdateDialog()
     }
 
+    //由于PwdDilaog的数字输入不了，估换了pop来紫萼
+    private val pwdPopupWindow by lazy {
+        CommonPopupWindow.ViewBuilder<PwdLayout>()
+            .width(FrameLayout.LayoutParams.MATCH_PARENT)
+            .height(FrameLayout.LayoutParams.MATCH_PARENT)
+            .outsideTouchable(false).focusable(true).alpha(0.8f)
+            .view(PwdLayout(this)).intercept { popupWindow, view ->
+            }.onShowBefore { popupWindow, view ->
+                var titile = view.findViewById<TextView>(com.develop.common.R.id.pwd_title)
+                titile.text = getString(com.develop.common.R.string.password)
+                var edit = view.findViewById<EditText>(com.develop.common.R.id.pwd_et_pwd)
+                var yes = view.findViewById<TextView>(com.develop.common.R.id.pwd_tv_yes)
+                var cancel = view.findViewById<TextView>(com.develop.common.R.id.pwd_tv_cancel)
+                yes.setOnClickListener {
+                    confirmPwd(edit.text.toString(), popupWindow)
+                    edit.setText("")
+                }
+                cancel.setOnClickListener {
+                    popupWindow.dismiss()
+                }
+
+            }.onDismissListener {
+            }.build<ViewDataBinding>(this)
+    }
+    private val appPopupWindow by lazy {
+        CommonPopupWindow.ViewBuilder<PwdLayout>()
+            .width(FrameLayout.LayoutParams.MATCH_PARENT)
+            .height(FrameLayout.LayoutParams.MATCH_PARENT)
+            .outsideTouchable(false).focusable(true).alpha(0.8f)
+            .view(PwdLayout(this)).intercept { popupWindow, view ->
+            }.onShowBefore { popupWindow, view ->
+                var titile = view.findViewById<TextView>(com.develop.common.R.id.pwd_title)
+                titile.text = getString(com.develop.common.R.string.password)
+                var edit = view.findViewById<EditText>(com.develop.common.R.id.pwd_et_pwd)
+                var yes = view.findViewById<TextView>(com.develop.common.R.id.pwd_tv_yes)
+                var cancel = view.findViewById<TextView>(com.develop.common.R.id.pwd_tv_cancel)
+                yes.setOnClickListener {
+                    if ("12345678".equals(edit.text.toString())) {
+                        if (isAdbDebuggingEnabled(this)) {
+                            Toast.makeText(this, "adb disable", Toast.LENGTH_SHORT).show()
+                            toggleAdbDebugging(this, false)
+                        } else {
+                            Toast.makeText(this, "adb enable", Toast.LENGTH_SHORT).show()
+                            toggleAdbDebugging(this, true)
+                        }
+
+                        popupWindow.dismiss()
+
+                    } else {
+                        GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
+                    }
+                    edit.setText("")
+                }
+                cancel.setOnClickListener {
+                    popupWindow.dismiss()
+                }
+            }.onDismissListener {
+            }.build<ViewDataBinding>(this)
+    }
+
+    private val tvFirmPopupWindow by lazy {
+        CommonPopupWindow.ViewBuilder<PwdLayout>()
+            .width(FrameLayout.LayoutParams.MATCH_PARENT)
+            .height(FrameLayout.LayoutParams.MATCH_PARENT)
+            .outsideTouchable(false).focusable(true).alpha(0.8f)
+            .view(PwdLayout(this)).intercept { popupWindow, view ->
+            }.onShowBefore { popupWindow, view ->
+                var titile = view.findViewById<TextView>(com.develop.common.R.id.pwd_title)
+                titile.text = getString(com.develop.common.R.string.password)
+                var edit = view.findViewById<EditText>(com.develop.common.R.id.pwd_et_pwd)
+                var yes = view.findViewById<TextView>(com.develop.common.R.id.pwd_tv_yes)
+                var cancel = view.findViewById<TextView>(com.develop.common.R.id.pwd_tv_cancel)
+                yes.setOnClickListener {
+                    if ("12345678".equals(edit.text.toString())) {
+                        togglePointerLocation(this)
+                        popupWindow.dismiss()
+                    } else {
+                        GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
+                    }
+                    edit.setText("")
+                }
+                cancel.setOnClickListener {
+                    popupWindow.dismiss()
+                }
+
+            }.onDismissListener {
+            }.build<ViewDataBinding>(this)
+    }
+
+    private val devPopupWindow by lazy {
+        CommonPopupWindow.ViewBuilder<PwdLayout>()
+            .width(FrameLayout.LayoutParams.MATCH_PARENT)
+            .height(FrameLayout.LayoutParams.MATCH_PARENT)
+            .outsideTouchable(false).focusable(true).alpha(0.8f)
+            .view(PwdLayout(this)).intercept { popupWindow, view ->
+            }.onShowBefore { popupWindow, view ->
+                var titile = view.findViewById<TextView>(com.develop.common.R.id.pwd_title)
+                titile.text = getString(com.develop.common.R.string.password)
+                var edit = view.findViewById<EditText>(com.develop.common.R.id.pwd_et_pwd)
+                var yes = view.findViewById<TextView>(com.develop.common.R.id.pwd_tv_yes)
+                var cancel = view.findViewById<TextView>(com.develop.common.R.id.pwd_tv_cancel)
+                yes.setOnClickListener {
+                    if ("12345678".equals(edit.text.toString())) {
+                        // 创建启动目标活动的Intent
+                        val intent = Intent()
+                        intent.component = ComponentName(
+                            "com.zavier.androidrk3326functiontest",
+                            "com.zavier.androidrk3326functiontest.MainFunctionActivity"
+                        )
+                        // 启动目标活动
+                        startActivity(intent)
+                        popupWindow.dismiss()
+                    } else {
+                        GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
+                    }
+                    edit.setText("")
+                }
+                cancel.setOnClickListener {
+                    popupWindow.dismiss()
+                }
+
+            }.onDismissListener {
+            }.build<ViewDataBinding>(this)
+    }
+
     @Subscribe
     fun onDevStateEvent(event: DevStatusEvent) {
         GlobalDevEvent.globalWeightEvent(event)
@@ -189,46 +314,9 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             weightAlignCount++
             if (weightAlignCount >= 7) {
                 weightAlignCount = 0
-
-                //2023年06月29日14:16:18 处理密码弹出
-                val pwdDialog = PwdDialog()
-                pwdDialog.title = getString(com.develop.common.R.string.password)
-                pwdDialog.showDialog(supportFragmentManager, "pwdDialog")
-                pwdDialog.onDialogClickListener = object : PwdDialog.OnDialogClickListener {
-
-                    override fun onConfirm(pwd: String) {
-                        if ("12345678".equals(pwd)) {
-                            pwdDialog.removeSelf()
-                            cancelConfirmDialog.title =
-                                getString(com.develop.common.R.string.change_lang_tips)
-                            cancelConfirmDialog.showCancel = false
-                            cancelConfirmDialog.onDialogClickListener =
-                                object : CancelConfirmDialog.OnDialogClickListener {
-                                    override fun onConfirm() {
-
-                                    }
-
-                                    override fun onCancel() {
-                                    }
-
-                                }
-                            if (CofarSDK.devInfo().runningStatus == DevStatus.RUNNING) {
-                                cancelConfirmDialog.showDialog(supportFragmentManager, "confirm")
-                            } else {
-                                //进入称重标定模式
-                                CofarSDK.startWeightAlign()
-                                GlobalDevEvent.weight = true
-                            }
-
-                        } else {
-                            GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
-                        }
-                    }
-
-                    override fun onCancel() {
-
-                    }
-                }
+                pwdPopupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
+                pwdPopupWindow.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+                pwdPopupWindow.showAtLocation(binding.aboutLayout, Gravity.CENTER, 0, 0)
 
 
             }
@@ -304,32 +392,9 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             adbCount++
             if (adbCount >= 7) {
                 adbCount = 0
-
-                val ctx = this
-                //2023年06月29日14:16:18 处理密码弹出
-                val pwdDialog = PwdDialog()
-                pwdDialog.title = getString(com.develop.common.R.string.password)
-                pwdDialog.showDialog(supportFragmentManager, "pwdDialog")
-                pwdDialog.onDialogClickListener = object : PwdDialog.OnDialogClickListener {
-
-                    override fun onConfirm(pwd: String) {
-                        if ("12345678".equals(pwd)) {
-                            if (isAdbDebuggingEnabled(ctx)) {
-                                Toast.makeText(ctx, "adb disable", Toast.LENGTH_SHORT).show()
-                                toggleAdbDebugging(ctx, false)
-                            } else {
-                                Toast.makeText(ctx, "adb enable", Toast.LENGTH_SHORT).show()
-                                toggleAdbDebugging(ctx, true)
-                            }
-                        } else {
-                            GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
-                        }
-                    }
-
-                    override fun onCancel() {
-
-                    }
-                }
+                appPopupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
+                appPopupWindow.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+                appPopupWindow.showAtLocation(binding.aboutLayout, Gravity.CENTER, 0, 0)
 
 
             }
@@ -341,25 +406,9 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 tpCount = 0
 
 
-                val ctx = this
-                //2023年06月29日14:16:18 处理密码弹出
-                val pwdDialog = PwdDialog()
-                pwdDialog.title = getString(com.develop.common.R.string.password)
-                pwdDialog.showDialog(supportFragmentManager, "pwdDialog")
-                pwdDialog.onDialogClickListener = object : PwdDialog.OnDialogClickListener {
-
-                    override fun onConfirm(pwd: String) {
-                        if ("12345678".equals(pwd)) {
-                            togglePointerLocation(ctx)
-                        } else {
-                            GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
-                        }
-                    }
-
-                    override fun onCancel() {
-
-                    }
-                }
+                tvFirmPopupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
+                tvFirmPopupWindow.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+                tvFirmPopupWindow.showAtLocation(binding.aboutLayout, Gravity.CENTER, 0, 0)
 
 
             }
@@ -373,32 +422,9 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             if (testCount >= 7) {
                 testCount = 0
 
-                //2023年06月29日14:16:18 处理密码弹出
-                val pwdDialog = PwdDialog()
-                pwdDialog.title = getString(com.develop.common.R.string.password)
-                pwdDialog.showDialog(supportFragmentManager, "pwdDialog")
-                pwdDialog.onDialogClickListener = object : PwdDialog.OnDialogClickListener {
-
-                    override fun onConfirm(pwd: String) {
-                        if ("12345678".equals(pwd)) {
-                            // 创建启动目标活动的Intent
-                            val intent = Intent()
-                            intent.component = ComponentName(
-                                "com.zavier.androidrk3326functiontest",
-                                "com.zavier.androidrk3326functiontest.MainFunctionActivity"
-                            )
-
-                            // 启动目标活动
-                            startActivity(intent)
-                        } else {
-                            GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
-                        }
-                    }
-
-                    override fun onCancel() {
-
-                    }
-                }
+                devPopupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
+                devPopupWindow.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+                devPopupWindow.showAtLocation(binding.aboutLayout, Gravity.CENTER, 0, 0)
 
 
             }
@@ -406,7 +432,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.tvAppName.text = "FoodCooking_Android"
         var appName = AppUtils.getAppVersionName()
-        var (mode , code,version) = appName.split(".")
+        var (mode, code, version) = appName.split(".")
 //        var appCodeName = code+mode + "_V"+ getAppCode()+"_"+version
 //        binding.tvAppVersion.text = appCodeName
         binding.tvAppVersion.text = "v${AppUtils.getAppVersionName()}"
@@ -482,6 +508,34 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         }
     }
 
+    private fun confirmPwd(pwd: String, popupWindow: PopupWindow) {
+        if ("12345678".equals(pwd)) {
+            popupWindow.dismiss()
+            cancelConfirmDialog.title =
+                getString(com.develop.common.R.string.change_lang_tips)
+            cancelConfirmDialog.showCancel = false
+            cancelConfirmDialog.onDialogClickListener =
+                object : CancelConfirmDialog.OnDialogClickListener {
+                    override fun onConfirm() {
+
+                    }
+
+                    override fun onCancel() {
+                    }
+
+                }
+            if (CofarSDK.devInfo().runningStatus == DevStatus.RUNNING) {
+                cancelConfirmDialog.showDialog(supportFragmentManager, "confirm")
+            } else {
+                //进入称重标定模式
+                CofarSDK.startWeightAlign()
+                GlobalDevEvent.weight = true
+            }
+
+        } else {
+            GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
+        }
+    }
 
     fun togglePointerLocation(context: Context) {
         val currentSetting = Settings.System.getInt(context.contentResolver, "pointer_location", 0)

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

@@ -234,7 +234,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             MMkvUtils.save(CURRENT_LANGUAGE, l.value)
             if (isFromSetting){
                 //系统变化语言
-                  updateLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
+//                  updateLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
             }
             LanguageUtils.applyLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
         }

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

@@ -14,6 +14,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.ToastUtils
+import com.develop.base.ext.getGoneLogin
 import com.develop.base.ext.getSN
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
@@ -58,20 +59,27 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         return ActivitySettingMainBinding.inflate(layoutInflater)
     }
 
+    ///sn.startsWith("032D") || sn.startsWith("011A") || sn.startsWith("030A")|| sn.startsWith("010F")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         var ctx = this
         isTuya = MMkvUtils.getBool(ISTUYA, false)
         dataList = if (getSN().startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (getSN().startsWith("032D")) {
+        } else if (getGoneLogin()) {
             DataFactory.genSetting032DModesList(resources)
-        } else if (getSN().startsWith("011A") || getSN().startsWith("030A")) {
-            DataFactory.genSetting011AModesList(resources)
-        } else {
+        }  else {
             DataFactory.genSettingModesList(resources)
         }
 
+        if (!getNetwork()){
+            dataList.forEach { settingModel ->
+                if (settingModel.type== SettingType.TUYA){
+                    settingModel.resId= com.develop.common.R.drawable.ic_setting_tuya_no
+                }
+            }
+        }
+
 
         binding.tvTitle.updateText(getString(com.develop.common.R.string.settings))
         binding.ivClose.setVisible()
@@ -152,7 +160,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                                 ) {
                                     navigateTo(Screens.Setting.TUYA)
                                 } else {
-                                    navigateTo(Screens.Setting.WIFI) {
+                                    navigateTo(Screens.Setting.WIFI, 200) {
                                         val bundle = Bundle()
                                         bundle.putBoolean(WIFI_FROM_MAIN_SETTING, true)
                                         with(bundle)
@@ -267,6 +275,18 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         } else {
             DataFactory.genSettingModesList(resources)
         }
+
+        if (!getNetwork()){
+            dataList.forEach { settingModel ->
+                if (settingModel.type== SettingType.TUYA){
+                    settingModel.resId= com.develop.common.R.drawable.ic_setting_tuya_no
+                }
+            }
+        }
+
+
+
+
         binding.mainSettingRecycler.bindingAdapter._data = dataList
         binding.mainSettingRecycler.bindingAdapter.notifyDataSetChanged()
     }

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

@@ -4,9 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.getSN
+import com.develop.base.ext.getSNUrl
 import com.develop.base.ext.updateText
+import com.develop.base.util.MMkvUtils
 import com.develop.base.util.ThreadUtils
 import com.develop.common.router.Screens
+import com.develop.common.tag.ISTUYA
 import com.develop.common.ui.CommonBindingActivity
 import com.develop.common.utils.QRCodeUtils
 import com.develop.common.utils.TuyaUtils
@@ -46,22 +50,40 @@ class TuyaActivity : CommonBindingActivity<ActivityTuyaBinding>() {
         binding.ivTuyaClose.setOnClickListener {
             finish()
         }
-        binding.tvTitle.updateText(getString(com.develop.common.R.string.tuya))
 
-        if(TuyaUtils.qrcodeUrl != "" && !TuyaUtils.init){
-            ThreadUtils.runOnMainThread {
-                val bitmap = QRCodeUtils.createQRCodeBitmap(TuyaUtils.qrcodeUrl, 500, 500)
-                binding.tuyaQrcode.setImageBitmap(bitmap)
-                binding.tuyaQrcode.visibility = View.VISIBLE
-            }
-        }else{
+        var isTuya = MMkvUtils.getBool(ISTUYA, false)
+        if (isTuya){
+            binding.tvTitle.updateText(getString(com.develop.common.R.string.tuya_app_title))
+            binding.tvContent.updateText(getString(com.develop.common.R.string.tuya_app_content))
+
+
+            if(TuyaUtils.qrcodeUrl != "" && !TuyaUtils.init){
+                ThreadUtils.runOnMainThread {
+                    val bitmap = QRCodeUtils.createQRCodeBitmap(TuyaUtils.qrcodeUrl, 500, 500)
+                    binding.tuyaQrcode.setImageBitmap(bitmap)
+                    binding.tuyaQrcode.visibility = View.VISIBLE
+                }
+            }else{
                 binding.cancelWrapper.visibility = View.VISIBLE
                 binding.cancelBtn.setOnClickListener{
                     TuyaUtils.cancelBind()
                 }
+            }
+        }else{
+            binding.tvTitle.updateText(getString(com.develop.common.R.string.tuya_sn_title))
+            binding.tvContent.updateText(getString(com.develop.common.R.string.tuya_sn_content))
+
+            ThreadUtils.runOnMainThread {
+                val bitmap = QRCodeUtils.createQRCodeBitmap(getSNUrl(), 500, 500)
+                binding.tuyaQrcode.setImageBitmap(bitmap)
+                binding.tuyaQrcode.visibility = View.VISIBLE
+            }
+
+
         }
 
 
+
     }
 
 

BusinessSetting/src/main/res/layout/activity_about.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:id="@+id/about_layout"
     android:background="@color/bg_color"
     android:layout_height="match_parent">
 

BusinessSetting/src/main/res/layout/activity_tuya.xml

@@ -69,6 +69,15 @@
     </RelativeLayout>
 
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/convert_80px"
+        android:textColor="@color/common_title"
+        android:textSize="@dimen/convert_32px" />
 
 
 

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

@@ -2,6 +2,7 @@ package com.develop.step.ui
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.util.Log
@@ -474,10 +475,10 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         } else if (mRunningState == DevStatus.RUNNING.toInt() || currDevInfo.status == DevStatus.PAUSE.toInt()) {
             stopClick()
         } else if (mRunningState == DevStatus.STOP.toInt()) {
+            setResult(50, Intent().putExtra("type",true))
             finish()
 //            startClick()
         }
-
         return super.onKeyLongPress(keyCode, event)
     }
 

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

@@ -1539,10 +1539,13 @@ class CookStepActivity : CookStepBaseActivity() {
              * */
             //potCoverType 0 是汤锅 1是空炸
             if (event.devInfo.potCloverType.toInt() == 1 && CofarSDK.devInfo().devMode == DevModes.SOUP) {
+
                 CofarSDK.changeDevModeFocus(DevModes.AIR_FRYER)
+                initStepData()
                 return
             } else if (event.devInfo.potCloverType.toInt() == 0 && CofarSDK.devInfo().devMode == DevModes.AIR_FRYER) {
                 CofarSDK.changeDevModeFocus(DevModes.SOUP)
+                initStepData()
                 return
             }
 

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

@@ -20,7 +20,7 @@ class CookStepStatus(
     }
 
     fun isDescription():Boolean {
-        return  workMode == "DESCRIPTION";
+        return  workMode == "DESCRIPTION" || workMode =="AF_DESCRIPTION"
     }
 
     fun isManualStep(): Boolean {

BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -224,8 +224,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.tvMoreDelete.setVisible()
         }else{
             binding.tvMoreDelete.setGone()
-
         }
+        if (getSN().startsWith("010F")){
+            binding.tvMoreShare.setGone()
+        }
+
     }
 
     private fun initListener() {

app/build.gradle

@@ -12,9 +12,9 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-//    brandCode="036I"
-    brandCode = "000A"
-    model = "5037"
+    brandCode="014A"
+//    brandCode = "000A"
+    model = "1039"
 
 }
 
@@ -117,7 +117,7 @@ android {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
             buildConfigField("String", "model", "\"1039\"")
             buildConfigField("String", "brandCode", "\"014A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
@@ -160,6 +160,7 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"036I\"")
             resValue("string", "app_theme", "@style/Splash036IDTheme")
+
         }
 
         brand036ITuya {
@@ -167,6 +168,10 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"036I\"")
             resValue("string", "app_theme", "@style/Splash036IDTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"036I\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
         }
 
 
@@ -174,8 +179,8 @@ android {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "model", "\"1039\"")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            buildConfigField("String", "model", "\"2002\"")
             buildConfigField("String", "brandCode", "\"033F\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
@@ -198,6 +203,15 @@ android {
             buildConfigField("String", "UpdatePlatform", "\"night\"")
             resValue("string", "app_theme", "@style/Splash010DTheme")
 
+        }
+        brand010F {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"night\"")
+            resValue("string", "app_theme", "@style/Splash010DTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"000A\"")
+
         }
 
         brand030A {
@@ -350,12 +364,12 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
-             resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            buildConfigField("String", "model", "\"5037\"")
-            buildConfigField("String", "brandCode", "\"000A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//             resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            buildConfigField("String", "model", "\"5037\"")
+//            buildConfigField("String", "brandCode", "\"000A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
 
 //             buildConfigField("String", "UpdatePlatform", "\"011A\"")
 //            resValue("string", "app_theme", "@style/Splash011A5037Theme")
@@ -372,6 +386,14 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
+//            buildConfigField("String", "UpdatePlatform", "\"night\"")
+//            resValue("string", "app_theme", "@style/Splash010DTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"010D\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+
+
 //            buildConfigField("String", "UpdatePlatform", "\"011A\"")
 //            resValue("string", "app_theme", "@style/Splash011ATheme")
 //            buildConfigField("String", "model", "\"1039\"")
@@ -380,6 +402,31 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
+//            buildConfigField("String", "UpdatePlatform", "\"036I\"")
+//            resValue("string", "app_theme", "@style/Splash036IDTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"036I\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+
+
+
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"014A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+
+
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+//            buildConfigField("String", "model", "\"2002\"")
+//            buildConfigField("String", "brandCode", "\"033F\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+
+
         }
     }
 

app/src/main/java/com/develop/foodcooking/FoodCookingApp.kt

@@ -62,7 +62,6 @@ import javax.net.ssl.TrustManager
 class FoodCookingApp : BaseApp() {
 
 
-
     companion object {
         init {
             Config.getInstance().skinMode = Config.SkinMode.REPLACE_ALL
@@ -78,7 +77,7 @@ class FoodCookingApp : BaseApp() {
     var mWakeLock: PowerManager.WakeLock? = null
     private lateinit var pm: PowerManager
     var minute = 0
-    private  var heartBeatInterval :Interval?=null
+    private var heartBeatInterval: Interval? = null
     var ledLock = false
     override fun onCreate() {
         hookWebView()
@@ -101,30 +100,29 @@ class FoodCookingApp : BaseApp() {
         setIsBrand062(is062)
 
 
-        if (is062){
+        if (is062) {
             ResourceUtils.copyFileFromAssets(
                 ASSETS_BLUE_SKIN_PACK,
                 SKIN_PACK_PATH + BLUE_SKIN_PACK_NAME
             )
         }
-        if (is011){
+        if (is011) {
             ResourceUtils.copyFileFromAssets(
                 ASSETS_ZERO_ONE_ONE_SKIN_PACK,
                 SKIN_PACK_PATH + ZERO_ONE_ONE_SKIN_PACK_NAME
             )
         }
-       if (isNight){
-           ResourceUtils.copyFileFromAssets(
-               ASSETS_NIGHT_SKIN_PACK,
-               SKIN_PACK_PATH + NIGHT_SKIN_PACK_NAME
-           )
-       }
-
-
+        if (isNight) {
+            ResourceUtils.copyFileFromAssets(
+                ASSETS_NIGHT_SKIN_PACK,
+                SKIN_PACK_PATH + NIGHT_SKIN_PACK_NAME
+            )
+        }
 
 
         //切换主题，theme=0 night= false 是0000的主题，而且需要AndroidManifest.xml主题设置为  android:theme="@style/SplashTheme"
-        ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else if (is062) 2 else if (is011)3 else 0)
+        ThemeSkinService.getInstance()
+            .switchThemeSkin(if (isNight) 1 else if (is062) 2 else if (is011) 3 else 0)
         setNightTheme(isNight)
         CofarSDK.init(getBrandNum())
         SerialPortUtils.init()
@@ -151,9 +149,9 @@ class FoodCookingApp : BaseApp() {
         val uri: Uri = Settings.System
             .getUriFor(Settings.System.SCREEN_OFF_TIMEOUT)
         contentResolver.notifyChange(uri, null)
-        heartBeatInterval = Interval(1,1,TimeUnit.SECONDS,5).finish {
+        heartBeatInterval = Interval(1, 1, TimeUnit.SECONDS, 5).finish {
             //设备不通讯异常
-           EventBus.getDefault().post(
+            EventBus.getDefault().post(
                 DevPromptEvent.builder()
                     .showCancelBtn(false)
                     .msg("dev_error")
@@ -210,8 +208,6 @@ class FoodCookingApp : BaseApp() {
     }
 
 
-
-
     override fun createRequestInterceptor(): RequestInterceptor {
         return FoodRequestInterceptor()
     }
@@ -238,7 +234,7 @@ class FoodCookingApp : BaseApp() {
 
     @SuppressLint("InvalidWakeLockTag")
     @Subscribe
-    fun onTuyaEvent(event: TuyaEvent){
+    fun onTuyaEvent(event: TuyaEvent) {
 
         TuyaUtils.uploadData()
         heartBeatInterval?.cancel()
@@ -262,6 +258,12 @@ class FoodCookingApp : BaseApp() {
 
     }
 
+//    @Subscribe
+//    fun onCookDevMsgEvent(event: DevPromptEvent) {
+//
+//
+//    }
+
     @SuppressLint("InvalidWakeLockTag")
     @Subscribe
     @Synchronized
@@ -363,7 +365,7 @@ class OptionFactory : IOptionFactory {
         return when (theme) {
             1 -> NightOption()
             2 -> BlueOption()
-            3 ->ZeroOneOneOption()
+            3 -> ZeroOneOneOption()
             else -> null
         }
     }

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

@@ -216,17 +216,17 @@ fun getSN(): String {
 //        return "011A50370020123010190003"
 //        return "011A50370020123010190004"
 //    return "007D20020020123010190001"
-//    return "036I21060020123010190003"
+//        return "036I21060020123010190007"
 //        return "030A10390020123010190001"
 //    return  "017A20060020123010190001"
 //        return  "017A10390020123010190001"
 //    return "010D10390020123010190001"
 //    return "000A10390020123010190009"
 //        return "032D21060020123010190001"
-        return "000A50370020123010190011"
+//        return "000A50370020123010190011"
 //         return  "030A10390020123010190002"
-//        return  "033F10390020123010190001"
-//        return  "014A10390020123010190001"
+//        return  "033F20020020123010190001"
+        return  "014A19050020123010190001"
 
 //        return "029C21010020123010190001"
 //        return  "062A10390020123010190001"
@@ -257,9 +257,11 @@ fun getSN(): String {
 
 fun getGoneLogin(): Boolean {
     var sn = getSN()
-    return sn.startsWith("032D") || sn.startsWith("011A") || sn.startsWith("030A")
+    return sn.startsWith("032D") || sn.startsWith("011A") || sn.startsWith("030A")|| sn.startsWith("010F")
+}
+fun getSNUrl():String {
+    return "https://icook.cofarcn.com/ext/devInfo?sn="+ getSN()
 }
-
 fun ImageView.load(data: Any?) {
     Glide.with(this.context).load(data)
         .diskCacheStrategy(DiskCacheStrategy.RESOURCE)

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

@@ -56,4 +56,13 @@ fun Fragment.navigateTo(
     params: (Postcard.() -> Unit)? = null
 ) {
     requireActivity().navigateTo(path, params)
-}
+}
+
+fun Fragment.navigateTo(
+    path: String,requestCode :Int,
+    params: (Postcard.() -> Unit)? = null
+) {
+    val postcard = ARouter.getInstance().build(path)
+    params?.let { postcard.it() }
+    requireActivity().navigateTo(path,requestCode,params)
+}

libBase/src/main/java/com/develop/base/mvvm/FullScreenTransparentDialog.kt

@@ -1,5 +1,7 @@
 package com.develop.base.mvvm
 
+import android.content.DialogInterface
+import android.content.DialogInterface.OnKeyListener
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
@@ -12,7 +14,8 @@ import org.greenrobot.eventbus.EventBus
 
 abstract class FullScreenTransparentDialog : DialogFragment() {
 
-     var isShow = false
+    var isShow = false
+    var onKey: onKeyFun? = null
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -32,9 +35,36 @@ abstract class FullScreenTransparentDialog : DialogFragment() {
                 WindowManager.LayoutParams.MATCH_PARENT
             )
         }
-        dialog?.setOnKeyListener { dialogInterface, i, keyEvent ->
-            i == KeyEvent.KEYCODE_BACK
-        }
+//        dialog?.setOnKeyListener { dialogInterface, i, keyEvent ->
+//            i == KeyEvent.KEYCODE_BACK
+//        }
+
+
+        //处理弹窗点击旋钮问题
+        dialog?.setOnKeyListener(object : OnKeyListener {
+            override fun onKey(
+                dialogInterface: DialogInterface?,
+                i: Int,
+                keyEvent: KeyEvent?
+            ): Boolean {
+                if (i == KeyEvent.KEYCODE_BACK) {
+                    removeSelf()
+                    return false
+                } else {
+                    //点击旋钮
+                    if (keyEvent?.action== KeyEvent.ACTION_UP && i == KeyEvent.KEYCODE_ENTER) {
+                        onKey.let {
+                            it?.onType()
+                        }
+                        return false
+                    }
+                    return true
+                }
+
+            }
+
+        })
+
     }
 
     class CloseDialogEvent {}
@@ -46,6 +76,10 @@ abstract class FullScreenTransparentDialog : DialogFragment() {
         }
     }
 
+    fun setOnKeyFun(onKeyFun: onKeyFun) {
+        this.onKey = onKeyFun
+    }
+
 
     fun showDialog(fragmentManager: FragmentManager, tag: String) {
         if (!isShow) {
@@ -55,4 +89,8 @@ abstract class FullScreenTransparentDialog : DialogFragment() {
             fragmentTransaction.commitAllowingStateLoss()
         }
     }
+
+    interface onKeyFun {
+        fun onType()
+    }
 }

skin-zeroOneOne/build/outputs/logs/manifest-merger-release-report.txt

@@ -1,37 +0,0 @@
-manifest
-ADDED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-	package
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-		ADDED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-	android:versionName
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-		ADDED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-	android:versionCode
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-		ADDED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:1-6:12
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-	xmlns:android
-		ADDED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml:2:11-69
-uses-sdk
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-	android:targetSdkVersion
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-		ADDED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-	android:minSdkVersion
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-		ADDED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml
-		INJECTED from D:\KYProject\FoodCooking_LandScape\FoodCooking_LandScape\skin-zeroOneOne\src\main\AndroidManifest.xml

skin-zeroOneOne/build/outputs/sdk-dependencies/release/sdkDependencies.txt

@@ -1,70 +0,0 @@
-# List of SDK dependencies of this app, this information is also included in an encrypted form in the APK.
-# For more information visit: https://d.android.com/r/tools/dependency-metadata
-
-library {
-  maven_library {
-    groupId: "org.jetbrains.kotlin"
-    artifactId: "kotlin-stdlib-jdk8"
-    version: "1.7.10"
-  }
-  digests {
-    sha256: "\212\257\335`\311OEL\222\345\006m&j^\325>\314c\307\217b;?\331\333V\376\244\003(s"
-  }
-}
-library {
-  maven_library {
-    groupId: "org.jetbrains.kotlin"
-    artifactId: "kotlin-stdlib"
-    version: "1.7.10"
-  }
-  digests {
-    sha256: "\347q\376t%\n\224>\217cFq2\001\377\035\214\271\\:]\032\221\242+e\251\340Oj\211\001"
-  }
-}
-library {
-  maven_library {
-    groupId: "org.jetbrains.kotlin"
-    artifactId: "kotlin-stdlib-jdk7"
-    version: "1.7.10"
-  }
-  digests {
-    sha256: "T\366\023Q\261\223j\330\217NS\005\237\347\201\347#\352\345\035x\355\236t\"\330\264\003WN\306\202"
-  }
-}
-library {
-  maven_library {
-    groupId: "org.jetbrains.kotlin"
-    artifactId: "kotlin-stdlib-common"
-    version: "1.7.10"
-  }
-  digests {
-    sha256: "\031\361\002\357\351b\237\216\253\3068S\255\025\3053\344|G\371\037\312\t(\\[\336\206\345\237\221\324"
-  }
-}
-library {
-  maven_library {
-    groupId: "org.jetbrains"
-    artifactId: "annotations"
-    version: "13.0"
-  }
-  digests {
-    sha256: "\254\342\241\r\310\342\325\3754\222^\312\300>I\210\262\300\370Qe\f\224\270\316\364\233\241\275\021\024x"
-  }
-}
-library_dependencies {
-  library_dep_index: 1
-  library_dep_index: 2
-}
-library_dependencies {
-  library_index: 1
-  library_dep_index: 3
-  library_dep_index: 4
-}
-library_dependencies {
-  library_index: 2
-  library_dep_index: 1
-}
-module_dependencies {
-  module_name: "base"
-  dependency_index: 0
-}

skin-zeroOneOne/build/reports/lint-results-release-fatal.html

@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Lint Report</title>
-<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
- <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.blue-indigo.min.css" />
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
-<script defer src="https://code.getmdl.io/1.2.0/material.min.js"></script>
-<style>
-section.section--center {
-    max-width: 860px;
-}
-.mdl-card__supporting-text + .mdl-card__actions {
-    border-top: 1px solid rgba(0, 0, 0, 0.12);
-}
-main > .mdl-layout__tab-panel {
-  padding: 8px;
-  padding-top: 48px;
-}
-
-.mdl-card__actions {
-    margin: 0;
-    padding: 4px 40px;
-    color: inherit;
-}
-.mdl-card > * {
-    height: auto;
-}
-.mdl-card__actions a {
-    color: #00BCD4;
-    margin: 0;
-}
-.error-icon {
-    color: #bb7777;
-    vertical-align: bottom;
-}
-.warning-icon {
-    vertical-align: bottom;
-}
-.mdl-layout__content section:not(:last-of-type) {
-  position: relative;
-  margin-bottom: 48px;
-}
-
-.mdl-card .mdl-card__supporting-text {
-  margin: 40px;
-  -webkit-flex-grow: 1;
-      -ms-flex-positive: 1;
-          flex-grow: 1;
-  padding: 0;
-  color: inherit;
-  width: calc(100% - 80px);
-}
-div.mdl-layout__drawer-button .material-icons {
-    line-height: 48px;
-}
-.mdl-card .mdl-card__supporting-text {
-    margin-top: 0px;
-}
-.chips {
-    float: right;
-    vertical-align: middle;
-}
-
-pre.errorlines {
-    background-color: white;
-    font-family: monospace;
-    border: 1px solid #e0e0e0;
-    line-height: 0.9rem;
-    font-size: 0.9rem;    padding: 1px 0px 1px; 1px;
-    overflow: scroll;
-}
-.prefix {
-    color: #660e7a;
-    font-weight: bold;
-}
-.attribute {
-    color: #0000ff;
-    font-weight: bold;
-}
-.value {
-    color: #008000;
-    font-weight: bold;
-}
-.tag {
-    color: #000080;
-    font-weight: bold;
-}
-.comment {
-    color: #808080;
-    font-style: italic;
-}
-.javadoc {
-    color: #808080;
-    font-style: italic;
-}
-.annotation {
-    color: #808000;
-}
-.string {
-    color: #008000;
-    font-weight: bold;
-}
-.number {
-    color: #0000ff;
-}
-.keyword {
-    color: #000080;
-    font-weight: bold;
-}
-.caretline {
-    background-color: #fffae3;
-}
-.lineno {
-    color: #999999;
-    background-color: #f0f0f0;
-}
-.error {
-    display: inline-block;
-    position:relative;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4AwCFR4T/3uLMgAAADxJREFUCNdNyLERQEAABMCjL4lQwIzcjErpguAL+C9AvgKJDbeD/PRpLdm35Hm+MU+cB+tCKaJW4L4YBy+CAiLJrFs9mgAAAABJRU5ErkJggg==) bottom repeat-x;
-}
-.warning {
-    text-decoration: none;
-    background-color: #f6ebbc;
-}
-.overview {
-    padding: 10pt;
-    width: 100%;
-    overflow: auto;
-    border-collapse:collapse;
-}
-.overview tr {
-    border-bottom: solid 1px #eeeeee;
-}
-.categoryColumn a {
-     text-decoration: none;
-     color: inherit;
-}
-.countColumn {
-    text-align: right;
-    padding-right: 20px;
-    width: 50px;
-}
-.issueColumn {
-   padding-left: 16px;
-}
-.categoryColumn {
-   position: relative;
-   left: -50px;
-   padding-top: 20px;
-   padding-bottom: 5px;
-}
-</style>
-<script language="javascript" type="text/javascript">
-<!--
-function reveal(id) {
-if (document.getElementById) {
-document.getElementById(id).style.display = 'block';
-document.getElementById(id+'Link').style.display = 'none';
-}
-}
-function hideid(id) {
-if (document.getElementById) {
-document.getElementById(id).style.display = 'none';
-}
-}
-//-->
-</script>
-</head>
-<body class="mdl-color--grey-100 mdl-color-text--grey-700 mdl-base">
-<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
-  <header class="mdl-layout__header">
-    <div class="mdl-layout__header-row">
-      <span class="mdl-layout-title">Lint Report: No errors or warnings</span>
-      <div class="mdl-layout-spacer"></div>
-      <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Thu Mar 14 15:33:59 CST 2024      </nav>
-    </div>
-  </header>
-  <div class="mdl-layout__drawer">
-    <span class="mdl-layout-title">Issue Types</span>
-    <nav class="mdl-navigation">
-      <a class="mdl-navigation__link" href="#overview"><i class="material-icons">dashboard</i>Overview</a>
-    </nav>
-  </div>
-  <main class="mdl-layout__content">
-    <div class="mdl-layout__tab-panel is-active"><section class="section--center mdl-grid mdl-grid--no-spacing mdl-shadow--2dp" id="NoIssuesCard" style="display: block;">
-            <div class="mdl-card mdl-cell mdl-cell--12-col">
-  <div class="mdl-card__title">
-    <h2 class="mdl-card__title-text">No Issues Found</h2>
-  </div>
-              <div class="mdl-card__supporting-text">
-Congratulations!            </div>
-            </div>
-          </section>    </div>
-  </main>
-</div>
-</body>
-</html>

skin-zeroOneOne/build/reports/lint-results-release-fatal.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.2">
-
-</issues>