处理002，063修改语言

BusinessAirFryer/src/main/assets/config.json

@@ -375,7 +375,17 @@
       "icon": "ic_grid_weight",
       "devMode": "AIR_FRYER",
       "listShow": true
-    },  {
+    },
+    {
+      "type": "AF_SPECIAL_DIY_MODE",
+      "name": "af_special_diy_mode",
+      "bg": "af_diy_bg",
+      "icon": "af_diy",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+
+    {
       "type": "SM_DIY",
       "name": "sm_diy",
       "bg": "ic_special_diy_mode_bg",

BusinessAirFryer/src/main/assets/config_000.json

@@ -96,7 +96,7 @@
       "bg": "ic_mode_turbo",
       "icon": "ic_grid_turbo",
       "devMode": "SOUP",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "CITRUS_JUICER",
@@ -310,7 +310,7 @@
       "bg": "ic_sm_turbo_bg",
       "icon": "ic_sm_turbo",
       "devMode": "STAND_MIXER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "SM_WIGHT",

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

@@ -84,7 +84,8 @@ interface FoodRecipeDao {
         language: String = MMkvUtils.getString(CURRENT_LANGUAGE) ?: "EN"
     ): DevAccessory?
 
-    @Query("select * from cc_dev_recipe_category where lang = :language")
+    @Query("select * from cc_dev_recipe_category where lang = :language  order by  name asc")
+//    @Query("select * from cc_dev_recipe_category where lang = :language")
     fun queryCategory(
         language: String = MMkvUtils.getString(CURRENT_LANGUAGE) ?: "EN"
     ): List<DevRecipeCategory>

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

@@ -332,6 +332,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="af_mutton_chop">MUTTON CHOP</string>
 
     <string name="special_diy_mode"> SPECIAL DIY MODE </string>
+    <string name="af_special_diy_mode">AF SPECIAL DIY MODE</string>
     <string name="sm_diy">STAND MIXER DIY</string>
     <string name="sm_knead">KNEAD</string>
     <string name="sm_whisk">WHISK</string>

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

@@ -185,7 +185,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         if (CofarSDK.devInfo().devMode == DevModes.AIR_FRYER) {
             binding.clCookTemp.visibility = View.VISIBLE
             binding.clCookTime.visibility = View.VISIBLE
-
             //隐藏点击
             binding.clCookDirection.visibility = View.GONE;
             binding.clCookSpeed.visibility = View.GONE;
@@ -209,7 +208,10 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             binding.clCookDirection.visibility = View.VISIBLE;
             binding.clCookSpeed.visibility = View.VISIBLE;
             binding.clCookWater.visibility = View.GONE
-            //  binding.ivTurbo.visibility = View.VISIBLE
+            // 5067 厨师机，先隐藏点动
+            if (isModelNum == "5067") {
+                binding.ivTurbo.visibility = View.GONE
+            }
             binding.clCookWater.visibility = View.GONE
             binding.clTextView.visibility = View.GONE
 
@@ -224,7 +226,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             binding.clCookDirection.visibility = View.GONE;
             binding.clCookSpeed.visibility = View.VISIBLE;
             binding.clCookWater.visibility = View.GONE
-            //  binding.ivTurbo.visibility = View.VISIBLE
+            //这里的ivTurbo是注释掉的，因为厨师机的点动问题，估隐藏
+            binding.ivTurbo.visibility = View.INVISIBLE
+
             binding.clCookWater.visibility = View.GONE
             binding.clTextView.visibility = View.GONE
             //中间要有个占位
@@ -326,8 +330,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 //                    )
 //                ).into(binding.ivBanner)
             }
-        }else{
-            if (sn.startsWith("054A")){
+        } else {
+            if (sn.startsWith("054A")) {
                 binding.ivBanner.setImageResource(
                     resources.getIdentifier(
                         workMode?.bg,
@@ -573,7 +577,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 //            }
 
             //当前是turbo模式下
-            if (viewModel.modeType == ModesType.TURBO.name|| viewModel.modeType == ModesType.SM_TURBO.name) {
+            if (viewModel.modeType == ModesType.TURBO.name || viewModel.modeType == ModesType.SM_TURBO.name) {
                 turboDownEvent()
             } else {
                 if (pressStartTime == -1L) {
@@ -620,7 +624,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             return false
         }
         pressStartTime = -1L
-        if (!CofarSDK.devInfo().isWeightStatus && (viewModel.modeType != ModesType.TURBO.name || viewModel.modeType != ModesType.SM_TURBO.name)&& event.keyCode == PRESS_DOWN_KEY_CODE && canStart) {
+        if (!CofarSDK.devInfo().isWeightStatus && (viewModel.modeType != ModesType.TURBO.name || viewModel.modeType != ModesType.SM_TURBO.name) && event.keyCode == PRESS_DOWN_KEY_CODE && canStart) {
             //非turbo模式
             if (userChanging && currDevInfo.status.toByte() != DevStatus.STOP) {
                 //用户调节中
@@ -1189,13 +1193,22 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 //其他模式
                 changeCommonStep()
 
+
                 //运行情况初始化需要设置转速 ，不然以后会导致设置是0速度，设置后台回来以后会是currentMotorGer，在设置时间上面的话，会导致错误
                 if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
                     currentMotorGer = CofarSDK.devInfo().motorGear.toInt()
                 }
 
+                if (CofarSDK.devInfo().devMode == DevModes.STAND_MIXER) {
+                    //由于厨师机没有温度，估默认显示时间
+                    viewModel.changeStep(CookSettingType.TIME_SETTING)
+//            changeTimeSettingStep()
+                } else {
+                    viewModel.changeStep(CookSettingType.TEMP_SETTING)
+                }
+
+
 
-                viewModel.changeStep(CookSettingType.TEMP_SETTING)
                 this@ModesDetailActivity.isMotorDirectionGearChange =
                     baseMode.isMotorDirectionChange
                 if (CofarSDK.devInfo().status != DevStatus.PAUSE.toInt() && CofarSDK.devInfo().status != DevStatus.RUNNING.toInt()) {
@@ -1560,7 +1573,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 //            binding.ivTurbo.visibility = View.INVISIBLE
 //            binding.ivWeight.visibility = View.INVISIBLE
 //        }
-        if (viewModel.modeType == ModesType.WIGHT.name || viewModel.modeType == ModesType.TURBO.name|| viewModel.modeType == ModesType.SM_TURBO.name || viewModel.modeType == ModesType.AUTO_CLEAN.name) {
+        if (viewModel.modeType == ModesType.WIGHT.name || viewModel.modeType == ModesType.TURBO.name || viewModel.modeType == ModesType.SM_TURBO.name || viewModel.modeType == ModesType.AUTO_CLEAN.name) {
             binding.ivWeight.visibility = View.GONE
             binding.ivTurbo.visibility = View.GONE
             //设置鸡蛋
@@ -1600,7 +1613,10 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             visibilityEgg(View.VISIBLE)
         }
         turnDevModeUI()
+
+
         changeTempSettingStep()
+
     }
 
     /**切换到称重*/
@@ -2275,9 +2291,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             DevStatus.STOP -> {
                 binding.apply {
 
-                    if (viewModel.modeType == ModesType.CITRUS_JUICER.name
-                        || viewModel.modeType == ModesType.DICING.name
-                        || viewModel.modeType == ModesType.POTATO_PEELER.name
+                    if (viewModel.modeType == ModesType.CITRUS_JUICER.name || viewModel.modeType == ModesType.DICING.name || viewModel.modeType == ModesType.POTATO_PEELER.name
                     ) {
                         if (sn.startsWith("011")) {
                             binding.ivTurbo.visibility = View.INVISIBLE
@@ -2289,8 +2303,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                         }
 
                     } else {
-                        if (isModelNum == "5067" && viewModel.modeType == ModesType.SM_WIGHT.name) {
-                            ivWeight.visibility = View.GONE
+
+                        //isModelNum == "5067" && viewModel.modeType == ModesType.SM_WIGHT.name
+                        //由于5067 厨师机点动有问题，估先隐藏点动按钮
+                        if (isModelNum == "5067") {
+                            if (viewModel.modeType == ModesType.SM_WIGHT.name) {
+                                ivWeight.visibility = View.GONE
+                            }
                             ivTurbo.visibility = View.GONE
                         } else {
                             if (viewModel.modeType == ModesType.AUTO_CLEAN.name) {
@@ -2604,9 +2623,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         whereIndex = -1
         binding.clSetTime.stopAlphaAnim()
         modeChange = true
-        if (isModelNum == "5067"){
+        if (isModelNum == "5067" && CofarSDK.devInfo().devMode == DevModes.STAND_MIXER) {
             viewModel.modeType = ModesType.SM_TURBO.name
-        }else{
+        } else {
             viewModel.modeType = ModesType.TURBO.name
         }
 
@@ -2679,14 +2698,17 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 modeChange = false
                 Log.d("dddddd", "llTurboView===GONE")
                 binding.llTurboView.visibility = View.GONE
-                initModeData(modeType, cm == ModesType.WIGHT.name || cm == ModesType.TURBO.name)
+                initModeData(
+                    modeType,
+                    cm == ModesType.WIGHT.name || cm == ModesType.TURBO.name || cm == ModesType.SM_TURBO.name
+                )
                 //处理点击回来的时候切换按钮有个闪烁，估在这加多此判断
                 //快速点击，会导致转速12，估先注释掉
 //                updateBtn(CofarSDK.devInfo().status.toByte())
                 changeCommonStep()
             }
 
-        } else if (mRunningState != 0 && viewModel.modeType != ModesType.WIGHT.name && viewModel.modeType != ModesType.TURBO.name) {
+        } else if (mRunningState != 0 && viewModel.modeType != ModesType.WIGHT.name && !(viewModel.modeType == ModesType.TURBO.name || viewModel.modeType == ModesType.SM_TURBO.name)) {
             if (CofarSDK.devInfo().runningInstId == viewModel.modeType) backRequestDialog.showDialog(
                 supportFragmentManager, "backRequestDialog"
             )

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

@@ -117,7 +117,7 @@ class CookDetailSourceFragment :
 //                        }
 
                         if (sourceItems.isEmpty()){
-                            if (it.recipe.foodDescription.isNullOrEmpty()){
+                            if (!it.recipe.foodDescription.isNullOrEmpty()){
                                 getTvSource()
                             }
                         }

BusinessStep/src/main/java/com/develop/step/viewmodel/ModesViewMode.kt

@@ -47,6 +47,7 @@ class ModesViewMode : BaseViewModel() {
     /**关闭搅碎*/
     fun stopTurbo() {
         Log.d("dddddd","关闭切碎")
+//        if ()
         turboTimer?.cancel()
         turboTimer = null
     }
@@ -118,6 +119,13 @@ class ModesViewMode : BaseViewModel() {
             ModesType.TURBO.name -> {
                 resources.getString(R.string.turbo)
             }
+            ModesType.SM_TURBO.name -> {
+                resources.getString(R.string.turbo)
+            }
+            ModesType.SM_WIGHT.name -> {
+                resources.getString(R.string.wight)
+            }
+
             else -> {
                 resources.getString(R.string.adapted_cooking)
             }

app/build.gradle

@@ -10,6 +10,8 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'kotlinx-serialization'
+
+    id 'com.alibaba.arouter'
 }
 
 
@@ -18,10 +20,10 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-//    brandCode="011E"
-    brandCode = "000A"
-    model = "5037"
-//    model = "1039"
+//    brandCode="000A"
+    brandCode = "033H"
+//    model = "5067"
+    model = "1039"
 
 }
 
@@ -419,6 +421,7 @@ android {
             buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
         }
+
         brand032D {
             dimension "platform"
             applicationId "com.develop.foodcooking"
@@ -429,6 +432,21 @@ android {
             buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
         }
+        brand032ETuya {
+            manifestPlaceholders = [channelName: "brand032ETuya"]
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/Splash032DTheme")
+
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"032E\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+
+        }
+
         brand002DTuya {
             manifestPlaceholders = [channelName: "brand002DTuya"]
             dimension "platform"
@@ -481,10 +499,13 @@ android {
         }
 
         brand054ATuya {
+            manifestPlaceholders = [channelName: "brand054ATuya"]
             dimension "platform"
             applicationId "com.develop.foodcooking"
-            buildConfigField("String", "UpdatePlatform", "\"054A\"")
+            buildConfigField("String", "UpdatePlatform", "\"night\"")
             resValue("string", "app_theme", "@style/Splash054ATheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"054A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
             buildConfigField("String", "time","\"${getCurrentTime()}\"" )
@@ -651,13 +672,13 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 //
-            manifestPlaceholders = [channelName: "brand000ATuya"]
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"000A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//            manifestPlaceholders = [channelName: "brand000ATuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"000A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
 
 //            manifestPlaceholders = [channelName: "brand000ATuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
@@ -685,7 +706,7 @@ android {
 
 //            manifestPlaceholders = [channelName: "brand032DTuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-//            resValue("string", "app_theme", "@style/SplashTheme")
+//            resValue("string", "app_theme", "@style/Splash032DTheme")
 //            buildConfigField("String", "model", "\"1039\"")
 //            buildConfigField("String", "brandCode", "\"032D\"")
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
@@ -734,13 +755,13 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 //
-//            manifestPlaceholders = [channelName: "brand033FTuya"]
-//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"033F\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
+            manifestPlaceholders = [channelName: "brand033HTuya"]
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"033H\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
 
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
@@ -832,6 +853,14 @@ android {
 //            buildConfigField("String", "brandCode", "\"053A\"")
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
+
+//            manifestPlaceholders = [channelName: "brand054ATuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"night\"")
+//            resValue("string", "app_theme", "@style/Splash054ATheme")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+
         }
     }
 

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

@@ -216,7 +216,7 @@ fun getSN(): String {
 //        return "000A30150020123010190001"
 //     return "000A10390020123010170001"
 //     return "000A10390020123010190001"
-        return "054A10390020123010190001"
+//        return "054A10390020123010190001"
 //        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
@@ -259,7 +259,7 @@ fun getSN(): String {
 //        return  "000A10390020123010190023"
 //        return  "000A21050020123010190023"
 //        return "000A50670020123010190005"
-//        return  "033H19050020123010190001"
+        return  "033H19050020123010190001"
     } else {
         //通过反射获取sn号
         try {