011 涂鸦优化

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

@@ -725,31 +725,34 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         binding.tvFoodName.movementMethod = ScrollingMovementMethod.getInstance()
         binding.tvFoodName.isScrollbarFadingEnabled = false
         val timeDescBuilder = StringBuilder()
-        timeDescBuilder.append(
-            if (sn.startsWith("011")) " " + getString(com.develop.common.R.string.preparation_011) else getString(
-                com.develop.common.R.string.preparation
-            )
-        )
-        timeDescBuilder.append(" ")
-        if (detail.recipe.prepareHours.isPositive()) {
-            timeDescBuilder.append(detail.recipe.prepareHours)
+        if (!sn.startsWith("011D")){
             timeDescBuilder.append(
-                if (sn.startsWith("011")) " " + getString(com.develop.common.R.string.hours_011) else getString(
-                    com.develop.common.R.string.hours
+                if (sn.startsWith("011")) " " + getString(com.develop.common.R.string.preparation_011) else getString(
+                    com.develop.common.R.string.preparation
                 )
             )
             timeDescBuilder.append(" ")
-        }
-        if (detail.recipe.prepareMinutes.isPositive()) {
-            timeDescBuilder.append(detail.recipe.prepareMinutes)
-            timeDescBuilder.append(
-                if (sn.startsWith("011")) " " + getString(com.develop.common.R.string.min_011) else getString(
-                    com.develop.common.R.string.min
+            if (detail.recipe.prepareHours.isPositive()) {
+                timeDescBuilder.append(detail.recipe.prepareHours)
+                timeDescBuilder.append(
+                    if (sn.startsWith("011")) " " + getString(com.develop.common.R.string.hours_011) else getString(
+                        com.develop.common.R.string.hours
+                    )
+                )
+                timeDescBuilder.append(" ")
+            }
+            if (detail.recipe.prepareMinutes.isPositive()) {
+                timeDescBuilder.append(detail.recipe.prepareMinutes)
+                timeDescBuilder.append(
+                    if (sn.startsWith("011")) " " + getString(com.develop.common.R.string.min_011) else getString(
+                        com.develop.common.R.string.min
+                    )
                 )
-            )
 
+            }
+            timeDescBuilder.append("\n")
         }
-        timeDescBuilder.append("\n")
+
         timeDescBuilder.append(
             if (sn.startsWith("011")) getString(com.develop.common.R.string.ready_in_011) else getString(
                 com.develop.common.R.string.ready_in

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

@@ -92,7 +92,7 @@ class CookDetailViewModel : BaseViewModel() {
                         var devRecipeCookingStep = mutableListOf<DevRecipeCookingStep>()
 
                         //步骤
-                        devRecipeCookingStep.addAll(getListStep(t.cookStepInfoVOList,number))
+                        devRecipeCookingStep.addAll(getListStep(t.cookStepInfoVOList,number,lang))
 
                         //食谱
                         val detailInfo = getTuyaRecipes(t,number, lang)
@@ -173,7 +173,7 @@ class CookDetailViewModel : BaseViewModel() {
 
     }
     //涂鸦转换步骤
-    fun getListStep(listStep: List<RecipesBean.CookStepInfoVOListBean>,number:String) :MutableList<DevRecipeCookingStep> {
+    fun getListStep(listStep: List<RecipesBean.CookStepInfoVOListBean>,number:String,langs: String) :MutableList<DevRecipeCookingStep> {
         var devStepList = mutableListOf<DevRecipeCookingStep>()
         listStep.forEach {
             //判断有没有  有cookArgs是模式 ，没有就是描述
@@ -307,10 +307,16 @@ class CookDetailViewModel : BaseViewModel() {
                 }
             }
             numbers = it.step.toString()
-            it.langInfos.forEach { langInfosBean ->
-                description = langInfosBean.desc
-                lang = langInfosBean.lang
+            if (it.langInfos==null){
+                description = ""
+                lang = langs
+            }else{
+                it.langInfos.forEach { langInfosBean ->
+                    description = langInfosBean.desc
+                    lang = langInfosBean.lang
+                }
             }
+
             /**
              *   val code: String,
              *   val recipeNumber: String?,

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

@@ -160,7 +160,7 @@
             <TextView
                 app:layout_constraintTop_toTopOf="parent"
                 android:id="@+id/tv_step_name"
-                android:layout_width="@dimen/convert_479px"
+                android:layout_width="@dimen/convert_440px"
                 android:layout_height="0dp"
                 app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="@dimen/convert_30px"
@@ -174,7 +174,7 @@
                 android:scrollbarThumbVertical="@color/sliding_bar"
                 android:text="Step1:Peel 3 onions(180g)and2garlic cloves,halve the onions andput both in the blender jug."
                 android:textColor="#fff"
-                android:textSize="@dimen/convert_32px"
+                android:textSize="@dimen/convert_30px"
                 app:layout_constraintBottom_toTopOf="@id/iv_prev_step"
 
                 />

app/src/brand011DTuya/res/values-pl/strings.xml

@@ -385,6 +385,6 @@
     <string name="turn_left_011">Lewo</string>
     <string name="turn_right_011">Prawo</string>
     <string name="preparation_011">Przygotowanie:</string>
-    <string name="ready_in_011">Czas gotowania:</string>
+    <string name="ready_in_011">Czas przygotowania/gotowania</string>
 
 </resources>