涂鸦改动

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

@@ -400,7 +400,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         binding.ivLogo.setOnClickListener {
 
 //            pageSize++
-//            getCook("4115812")
+            getCook("2159212")
 
             weightAlignCount++
             if (weightAlignCount >= 7) {
@@ -484,7 +484,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.tvAppVersion.setOnClickListener {
 
-//            getCook("3899112")
+            getCook("1894212")
 
 
             adbCount++
@@ -518,7 +518,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
 
         binding.devSn.setOnClickListener {
-//            getCook("1878112")
+            getCook("1891512")
 
 
             testCount++

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

@@ -312,7 +312,12 @@ class CookDetailViewModel : BaseViewModel() {
                 lang = langs
             }else{
                 it.langInfos.forEach { langInfosBean ->
-                    description = langInfosBean.desc
+                    //由于客户涂鸦步骤没有文字，会打空格，估这里去除空格做判断
+                    if (langInfosBean.desc.trim() == ""){
+                        description = ""
+                    }else{
+                        description = langInfosBean.desc
+                    }
                     lang = langInfosBean.lang
                 }
             }
@@ -373,6 +378,20 @@ class CookDetailViewModel : BaseViewModel() {
         var makeMinutes = (cookTime % 3600) / 60;
         var userNum = t.pv ?: 0
 
+        var desc = ""
+       //步骤描述，食谱详情的第二个按钮
+        if (t.menuStepInfoVOList!=null){
+            val descBuilder = StringBuilder()
+            t.menuStepInfoVOList.forEach {
+                it.langInfos.let {itlang->
+                    itlang.forEach {langinfo->
+                        descBuilder.append(langinfo.desc)
+                        descBuilder.append("\n")
+                    }
+                }
+            }
+            desc = descBuilder.toString()
+        }
         var devRecipe = DevRecipe(
             t.id.toString(),
             t.id.toString(),
@@ -390,7 +409,7 @@ class CookDetailViewModel : BaseViewModel() {
             t.easyLevelDesc,
             "",
             t.name,
-            t.desc,
+            desc,
             0.0,
             userNum.toLong(),
             t.gmtModified,