011 换肤，062换肤

BusinessAirFryer/src/main/assets/config_010.json

@@ -15,7 +15,7 @@
       "bg": "cm_icon_roast",
       "icon": "cm_icon_roast",
       "devMode": "SOUP",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "ROAST",
@@ -23,7 +23,7 @@
       "bg": "cm_icon_roast",
       "icon": "cm_icon_roast",
       "devMode": "SOUP",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "STEAM",

BusinessCommon/src/main/java/com/develop/common/food_sdk/FloatWindowManager.kt

@@ -91,7 +91,8 @@ object FloatWindowManager {
                     if (isMode){
                         ivFood?.load(coverPath)
                     }else{
-                        ivFood?.load( FoodDataProvider.getResourcePath(coverPath as String))
+
+                        ivFood?.load( FoodDataProvider.getResourcePath(coverPath.toString()),R.drawable.bg_cook_session)
 
                     }
                 }
@@ -164,14 +165,18 @@ object FloatWindowManager {
         isMode = event.isMode
         modeName = event.modeName
         ivFood?.apply {
-            if (coverPath is String){
+            if(isNightTheme()){
+                ivFood?.circleBackgroundColor = Color.BLACK
+            }
+            if(coverPath is Int){
+                ivFood?.src = coverPath as Int
+            }else{
                 if (isMode){
-                    this.load(coverPath)
+                    ivFood?.load(coverPath)
                 }else{
-                    this.load(FoodDataProvider.getResourcePath(coverPath as String))
+                    ivFood?.load( FoodDataProvider.getResourcePath(coverPath as String),R.drawable.bg_cook_session)
+
                 }
-            } else {
-                src = coverPath as Int
             }
         }
 //        ivFood?.load(coverPath)

BusinessCommon/src/main/java/com/develop/common/utils/ConfigUtils.kt

@@ -57,6 +57,7 @@ object ConfigUtils {
             null
         }
     }
+
     fun loadCookConfig(): CfConfig? {
         return try {
             var sn = getSN()
@@ -65,7 +66,13 @@ object ConfigUtils {
             val fileList = GlobalApp().assets.list("") ?: arrayOf()
             var inputStream: InputStream? = null
 
-                inputStream = GlobalApp().assets.open("config.json")
+//            if (fileList.contains("config_${brandNum}.json")) {
+//                inputStream = GlobalApp().assets.open("config_${brandNum}.json")
+//            } else {
+//                inputStream = GlobalApp().assets.open("config.json")
+//            }
+
+            inputStream = GlobalApp().assets.open("config.json")
 //            inputStream = GlobalApp().assets.open("config_036.json")
 
             val size = inputStream.available()
@@ -140,11 +147,12 @@ object ConfigUtils {
         return loadConfig()?.workModes?.find { it.type == type }?.copy()
     }
 
-     fun getErrCodeStr(context: Context, code: Int): String {
+    fun getErrCodeStr(context: Context, code: Int): String {
         var str = when (code) {
             7 -> {
                 context.getString(com.develop.common.R.string.e7_errCode)
             }
+
             8 -> {
                 context.getString(com.develop.common.R.string.e8_errCode)
             }
@@ -181,6 +189,7 @@ object ConfigUtils {
             16 -> {
                 context.getString(com.develop.common.R.string.e16_errCode)
             }
+
             else -> {
                 ""
             }
@@ -188,9 +197,10 @@ object ConfigUtils {
 
         return str
     }
-    fun getBooleanErrCode(code: Int):Boolean{
+
+    fun getBooleanErrCode(code: Int): Boolean {
         //客户要求 errorCode 15 (彩屏错误提示) 跳过判断
-        return code==7||code==8||code==9||code==10||code==11||code==12||code==13||code==14||code==16
+        return code == 7 || code == 8 || code == 9 || code == 10 || code == 11 || code == 12 || code == 13 || code == 14 || code == 16
     }
 
 }

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

@@ -116,15 +116,15 @@ class FoodContentView : ConstraintLayout {
                                          */
 
 
-//                                        FoodDataProvider.getDatabase().runInTransaction {
+                                        FoodDataProvider.getDatabase().runInTransaction {
 //                                            val recipeDao =
 //                                                FoodDataProvider.getDatabase().recipeDao()
 //                                            val recipes = recipeDao.queryRecipe(foodId)
 //                                            recipes?.apply {
 //                                                recipeDao.deleteRecipe(this)
 //                                            }
-//                                            FoodDataProvider.deleteRecipeResource(foodId)
-//                                        }
+                                            FoodDataProvider.deleteRecipeResource(foodId)
+                                        }
                                         EventBus.getDefault().post(RefreshDataEvent())
                                     }
 

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

@@ -61,7 +61,7 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
         homeOrBackType = type
         if (type == HomeOrBack.Home) {
             binding.ivFunction.background_drawable = R.drawable.ic_home
-            binding.functionName.text = resources.getString(R.string.home)
+            binding.functionName.text = resources.getString(R.string.home)+"  "
         } else {
             if (isNightTheme()){
                 binding.ivFunction.background_drawable = R.drawable.ic_night_white_back
@@ -69,7 +69,7 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
                 binding.ivFunction.background_drawable = R.drawable.ic_night_white_back
             }
 
-            binding.functionName.text = resources.getString(R.string.back)
+            binding.functionName.text = resources.getString(R.string.back)+"  "
         }
     }
 

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_checked_062" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_unselected" android:state_checked="false"/>
+</selector>

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

@@ -8,7 +8,7 @@
 
     <RelativeLayout
         android:id="@+id/mode_layout"
-        android:layout_width="@dimen/convert_260px"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:background="@color/home_tab">
 
@@ -25,6 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:layout_marginRight="@dimen/convert_10px"
             android:layout_marginStart="@dimen/convert_24px"
             android:layout_toEndOf="@id/iv_function"
             android:textColor="@color/home_function_name"

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

@@ -33,4 +33,8 @@
         <item name="android:layout_margin">8dp</item>
         <item name="android:dropDownSelector">@android:color/white</item>
     </style>
+
+    <style name="checkbox">
+        <item name="android:button">@drawable/lock_time_selector</item>
+    </style>
 </resources>

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

@@ -406,11 +406,11 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.tvAppName.text = "FoodCooking_Android"
         var appName = AppUtils.getAppVersionName()
-        var (name , code) = appName.split("_")
-        var appCodeName = name + "_V"+ getAppCode()+"_"+code
-//        binding.tvAppVersion.text = "v${AppUtils.getAppVersionName()}"
+        var (mode , code,version) = appName.split(".")
+//        var appCodeName = code+mode + "_V"+ getAppCode()+"_"+version
+//        binding.tvAppVersion.text = appCodeName
+        binding.tvAppVersion.text = "v${AppUtils.getAppVersionName()}"
 
-        binding.tvAppVersion.text = appCodeName
         viewModel.devInfoLiveData.observe(this) {
 
             updateApkUrl = it?.apkUrl ?: ""

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

@@ -11,6 +11,7 @@ import android.view.LayoutInflater
 import android.widget.SeekBar
 import androidx.annotation.RequiresApi
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.setVisible
 import com.develop.base.ext.updateText
 import com.develop.base.util.MMkvUtils
@@ -39,6 +40,11 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
         binding.ivClose.setOnClickListener {
             finish()
         }
+
+        binding.rb3Min.text =  "   " + resources.getString(com.develop.common.R.string.time_5min)
+        binding.rb10Min.text =  "   " + resources.getString(com.develop.common.R.string.time_10min)
+        binding.rb30Min.text =  "   " + resources.getString(com.develop.common.R.string.time_30min)
+
         binding.ivClose.setVisible()
         binding.ivClose.setImageResource( com.develop.common.R.drawable.ic_close)
         setScreenManualMode()

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

@@ -93,8 +93,9 @@
             android:id="@+id/rb_3_min"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:button="@drawable/lock_time_selector"
+            android:drawableLeft="@drawable/lock_time_selector"
             android:gravity="center_vertical"
+            android:button="@null"
             android:text="@string/time_5min"
             android:checked="true"
             android:paddingStart="@dimen/convert_26px"
@@ -106,8 +107,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/convert_102px"
-            android:button="@drawable/lock_time_selector"
+            android:drawableLeft="@drawable/lock_time_selector"
             android:gravity="center_vertical"
+            android:button="@null"
             android:text="@string/time_10min"
             android:paddingStart="@dimen/convert_26px"
             android:textColor="@color/brightness_content"
@@ -118,7 +120,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/convert_102px"
-            android:button="@drawable/lock_time_selector"
+            android:button="@null"
+            android:drawableLeft="@drawable/lock_time_selector"
             android:gravity="center_vertical"
             android:paddingStart="@dimen/convert_26px"
             android:text="@string/Min20"

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

@@ -11,6 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.LogUtils
+import com.blankj.utilcode.util.ToastUtils
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.getSN
@@ -108,7 +109,7 @@ class CookStepActivity : CookStepBaseActivity() {
             //隐藏点击
             binding.controller.clCookDirection.visibility = View.GONE;
             binding.controller.clCookSpeed.visibility = View.GONE;
-            binding.controller.clCookWater.visibility = View.VISIBLE
+//            binding.controller.clCookWater.visibility = View.VISIBLE
             binding.controller.clCookWater.visibility = View.GONE
             //中间要有个占位
             binding.controller.clTextView.visibility = View.INVISIBLE
@@ -420,7 +421,7 @@ class CookStepActivity : CookStepBaseActivity() {
                 }
                 photoPath = it.source.photoVideoFilePath;
                 if (photoPath == null || photoPath == "") {
-                    photoPath = viewModel.recipe?.photoPath;
+                    photoPath = viewModel.recipe?.photoPath
                 }
                 binding.ivCookBg.load(
                     FoodDataProvider.getResourcePath(photoPath),
@@ -440,6 +441,8 @@ class CookStepActivity : CookStepBaseActivity() {
 
         }
         var ctx = this
+
+
         backRequestDialog.apply {
             title = ctx.getString(R.string.keep_cooking_in_the_background)
             onDialogClickListener = object : CancelConfirmDialog.OnDialogClickListener {
@@ -569,6 +572,7 @@ class CookStepActivity : CookStepBaseActivity() {
 
             //没有食谱步骤
             if (viewModel.allSteps.size == 0) {
+                ToastUtils.showShort("null~")
                 finish()
                 return
             }
@@ -604,7 +608,6 @@ class CookStepActivity : CookStepBaseActivity() {
         whereIndex = -1
         binding.controller.clSetTime.stopAlphaAnim()
         binding.controller.llStepComplete.setGone()
-        //062设计图需要隐藏加号减号按钮
         binding.controller.jiahao.setVisible()
         binding.controller.jianhao.setVisible()
 

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

@@ -371,9 +371,9 @@ abstract class CookStepBaseActivity :
 
     fun changeTurboPanel() {
         changeTempSettingPanel()
-        binding.controller.tempRingView.visibility = View.GONE
-        binding.controller.tvRingTempText.visibility = View.GONE
-        binding.ivTurboView.visibility = View.VISIBLE
+        binding.controller.tempRingView.visibility = View.VISIBLE
+        binding.controller.tvRingTempText.visibility = View.VISIBLE
+        binding.ivTurboView.visibility = View.GONE
     }
 
     fun changeTempSettingPanel() {

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

@@ -24,6 +24,7 @@ class CookStepStatus(
     }
 
     fun isManualStep(): Boolean {
-        return isWeightMode() || isTurboMode()
+        return  isWeightMode()
+//        return isWeightMode() || isTurboMode()
     }
 }

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

@@ -130,7 +130,10 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     }
 
     private fun initView() {
-        if (getSN().startsWith("017A")) {
+        if (is062){
+            binding.tvEasy.visibility = View.VISIBLE
+        }
+        if (getSN().startsWith("017A")|| getSN().startsWith("062A")) {
             binding.tvJarCount.visibility = View.VISIBLE
         } else {
             binding.tvJarCount.visibility = View.INVISIBLE

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

@@ -79,6 +79,7 @@ class CookDetailViewModel : BaseViewModel() {
             }.catch {
                 ToastUtils.showShort(it.message)
             }
+
             if (FoodDataProvider.isResourceDownload(number)) {
                 downloadResource.value = Resource(100, Resource.Status.SUCCESS)
             }
@@ -229,6 +230,18 @@ class CookDetailViewModel : BaseViewModel() {
                         var lang = it.lang ?:"EN"
                         deleteNumAndLangRecipe(number,lang)
                     }
+                    //删除步骤 和其他一些
+                    recipeNumber?.let {
+                        deleteDevRecipeAccessorys(it)
+                        deleteDevRecipeCookingSteps(it)
+                        deleteDevRecipeFoods(it)
+                        deleteDevRecipeNutritions(it)
+                        deleteDevRecipeRelTags(it)
+                        deleteDevRecipePortionSizes(it)
+                    }
+
+
+
 //                    deleteRecipe(recipeNumber)
                     insertDevAccessorys(contentData.devAccessorys)
                     insertHotTags(contentData.devHotTags)

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

@@ -119,7 +119,7 @@
             <TextView
                 app:layout_constraintTop_toTopOf="parent"
                 android:id="@+id/tv_step_name"
-                android:layout_width="@dimen/convert_679px"
+                android:layout_width="@dimen/convert_479px"
                 android:layout_height="0dp"
                 android:layout_marginStart="@dimen/convert_20px"
                 android:layout_marginTop="@dimen/convert_140px"

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

@@ -452,7 +452,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.develop.common.widget.CookCardView
-
+            android:visibility="gone"
             android:id="@+id/cl_cook_water"
             android:layout_width="@dimen/convert_280px"
             android:layout_height="@dimen/convert_140px"

app/build.gradle

@@ -13,7 +13,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode = "063A"
+    brandCode = "062A"
     model = "1039"
 
 }
@@ -33,7 +33,7 @@ android {
         minSdk 21
         targetSdk 31
         versionCode project.ext.versionCode
-        versionName "${project.ext.brandCode}${project.ext.model}_${project.ext.versionCode}"
+        versionName  "${project.ext.model}.${project.ext.brandCode}.${project.ext.versionCode}"
         archivesBaseName = "cofar-cooking_${versionName}"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -228,7 +228,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", "\"063A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
@@ -306,21 +306,20 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 ////            buildConfigField("String", "appCode", "\"2.01\"")
 
-//            resValue("string", "app_theme", "@style/Splash062ATheme")
-//            buildConfigField("String", "UpdatePlatform", "\"062A\"")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"062A\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
+            resValue("string", "app_theme", "@style/Splash062ATheme")
+            buildConfigField("String", "UpdatePlatform", "\"062A\"")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"062A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
 
 
+//             resValue("string", "app_theme", "@style/SplashTheme")
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-//            resValue("string", "app_theme", "@style/SplashTheme")
 //            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"062A\"")
+//            buildConfigField("String", "brandCode", "\"030A\"")
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
-////            buildConfigField("String", "appCode", "\"2.01\"")
 
 //             buildConfigField("String", "UpdatePlatform", "\"011A\"")
 //            resValue("string", "app_theme", "@style/Splash011A5037Theme")
@@ -330,12 +329,12 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
 
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"063A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"063A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
         }
     }
 

app/src/main/assets/help/TR/help-white-a.html

@@ -219,7 +219,7 @@
   <h3>Pişirme işlemi sırasında yemek taşıyor.</h3>
   <p>Çözüm: Bu durum, haznedeki sıvı ve yiyeceğin yüksek sıcaklıkta olmasından kaynaklanır, bu da
     hazne içindeki basıncı artırır ve taşmaya neden olur. Bu durumu önlemek için sıcaklığı
-    düşürün veya pişirme kapağı yerine cam </p>
+    düşürün veya pişirme kapağı yerine cam kapaklı büyük bir buhar önleyici kapak kullanın.</p>
 </div>
 </body>
 

app/src/main/assets/help/TR/help-white.html

@@ -211,7 +211,7 @@
   <h3>Pişirme işlemi sırasında yemek taşıyor.</h3>
   <p>Çözüm: Bu durum, haznedeki sıvı ve yiyeceğin yüksek sıcaklıkta olmasından kaynaklanır, bu da
     hazne içindeki basıncı artırır ve taşmaya neden olur. Bu durumu önlemek için sıcaklığı
-    düşürün veya pişirme kapağı yerine cam </p>
+    düşürün veya pişirme kapağı yerine cam kapaklı büyük bir buhar önleyici kapak kullanın.</p>
 </div>
 </body>
 

app/src/main/assets/help/TR/help.html

@@ -228,7 +228,7 @@
     <h3>Pişirme işlemi sırasında yemek taşıyor.</h3>
     <p>Çözüm: Bu durum, haznedeki sıvı ve yiyeceğin yüksek sıcaklıkta olmasından kaynaklanır, bu da
         hazne içindeki basıncı artırır ve taşmaya neden olur. Bu durumu önlemek için sıcaklığı
-        düşürün veya pişirme kapağı yerine cam </p>
+        düşürün veya pişirme kapağı yerine cam kapaklı büyük bir buhar önleyici kapak kullanın.</p>
 </div>
 </body>
 

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

@@ -201,6 +201,9 @@ fun getModelNum(): String {
  */
 fun getSN(): String {
     var serial: String
+//    //由于063 需要写死SN 估在这加
+//    return  "063A21050020123010190001"
+
     if (BuildConfig.DEBUG) {
 //        return "045A21030020123010190001"
 //    return "000A30150020123010190001"
@@ -217,13 +220,13 @@ fun getSN(): String {
 //        return "030A10390020123010190001"
 //    return  "017A20060020123010190001"
 //        return  "017A10390020123010190001"
-    return "010D10390020123010190001"
+//    return "010D10390020123010190001"
 //    return "000A10390020123010190009"
 //        return "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //    return  "030A10390020123010190002"
 //        return "029C21010020123010190001"
-//        return  "062A10390020123010190002"
+        return  "062A10390020123010190002"
 //        return  "063A10390020123010190001"
 //        return "000A50370020123010190018"
 //        return  "000A10390020123010190023"

skin-blue/src/main/res/drawable/ic_star_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="false" android:drawable="@drawable/ic_star_unselected"/>
+    <item android:state_selected="true" android:drawable="@drawable/ic_star_selected"/>
+</selector>