处理030 涂鸦问题

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

@@ -277,13 +277,11 @@ class FoodContentView : ConstraintLayout {
                 }
 
             }
-            if (getNewTuya()){
-                if (foodSn.startsWith("011F")){
-                    binding.tvEasy.setTextColor(resources.getColor(R.color.color_A3A3A2))
-                }
+            if (getNewTuya()) {
+                binding.tvEasy.setTextColor(resources.getColor(R.color.color_A3A3A2))
                 binding.easyLayout.visibility = View.VISIBLE
+                binding.ivEasy.visibility = View.INVISIBLE
                 content.level.let {
-
                     binding.tvEasy.text = it
                 }
             }

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

@@ -115,19 +115,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:visibility="gone"
         >
-        <View
+        <ImageView
+            android:id="@+id/iv_easy"
             android:layout_width="@dimen/convert_40px"
             android:layout_height="@dimen/convert_40px"
             android:background="@drawable/ic_detail_easy"
 
             />
-        <TextView
+        <com.develop.common.widget.MarqueeTextView
             android:id="@+id/tv_easy"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/convert_60px"
             android:layout_height="wrap_content"
             android:textColor="@color/cook_detail_info"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:singleLine="true"
             android:textSize="@dimen/convert_26px"
 
             />

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

@@ -48,6 +48,7 @@ import com.develop.common.event.RefreshStarDataEvent
 import com.develop.common.router.Screens
 import com.develop.common.tag.*
 import com.develop.common.ui.CommonBVMFragment
+import com.develop.common.utils.CommonUtils
 import com.develop.common.utils.TimeUtil
 import com.develop.common.widget.*
 import com.develop.main.R
@@ -62,7 +63,9 @@ import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevModes
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevCommonEvent
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -1164,6 +1167,19 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             }
         }
 
+//        appGlobalScope.launch(Dispatchers.IO) {
+//            //处理历史记录本地收藏
+//            var foodContentList = CommonUtils.getHistoryRecipes()
+//            foodContentList.forEach {
+//                if (event.recipeNumber == it.foodId){
+//                    it.isLike = event.isLike
+//                }
+//            }
+//            CommonUtils.saveHistoryRecipes(foodContentList)
+//        }
+
+
+
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

BusinessMain/src/main/java/com/develop/main/viewmodel/HomeViewModel.kt

@@ -301,14 +301,18 @@ class HomeViewModel : BaseViewModel() {
                             var makeHours = cookTime / 3600;
                             var makeMinutes = (cookTime % 3600) / 60;
                             var startCount = userTag?.starCount ?: 0
+                            val level = it.easyLevelDesc
+                                ?.takeUnless { it.isEmpty() }  // 非空且非空字符串时保留原值
+                                ?: globalApp().getString(com.develop.common.R.string.easy)
+
+
                             foodContentList.add(
                                 FoodContentModel(
                                     it.mainImg,
                                     it.name,
                                     startCount,
                                     getTime(makeHours ?: 0, makeMinutes ?: 0),
-                                    it.easyLevelDesc
-                                        ?: globalApp().getString(com.develop.common.R.string.easy),
+                                        level,
                                     false,
                                     false,
                                     it.isStar ?: false,

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

@@ -73,29 +73,31 @@ class TuyaActivity : CommonBindingActivity<ActivityTuyaBinding>() {
             binding.tvTitle.updateText(getString(com.develop.common.R.string.tuya_app_title))
             binding.tvContent.updateText(getString(com.develop.common.R.string.tuya_app_content))
 //            getQrUrl()
-            if (TuyaUtilsSo.getInstance().shorturl != "") {
-                performBackgroundTaskAndUpdateUI(TuyaUtilsSo.getInstance().shorturl)
-            } else {
-                getQrUrl()
-            }
+
             //  TuyaUtils.qrcodeUrl != "" && !TuyaUtils.init 以前图标
-//            if(TuyaUtilsSo.getInstance().shorturl != "" && !TuyaUtilsSo.getInstance().tuyaNetwork){
-//                //init关乎是否有其他手机连接
-//                //有设备连接需要显示cancelBtn按钮
+            if(TuyaUtilsSo.getInstance().shorturl != "" && !TuyaUtilsSo.getInstance().tuyaNetwork){
+                //init关乎是否有其他手机连接
+                //有设备连接需要显示cancelBtn按钮
 //                performBackgroundTaskAndUpdateUI(TuyaUtilsSo.getInstance().shorturl)
-//
-////                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{
-//                    TuyaUtilsSo.getInstance().tuyaRemove()
-////                    TuyaUtils.cancelBind()
+
+                if (TuyaUtilsSo.getInstance().shorturl != "") {
+                    performBackgroundTaskAndUpdateUI(TuyaUtilsSo.getInstance().shorturl)
+                } else {
+                    getQrUrl()
+                }
+
+//                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{
+                    TuyaUtilsSo.getInstance().tuyaRemove()
+//                    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))

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

@@ -954,7 +954,7 @@ abstract class CookStepBaseActivity :
                  FoodContentModel(
                     it.photoPath ?: "", it.name ?: "", score.toInt(),
                     getTime(it.makeHours ?: 0, it.makeMinutes ?: 0), it.difficultyLevel ?: "",
-                    true, false, isLike, recipeNumber ?: "", it.edition, useNum.toInt()
+                    false, false, isLike, recipeNumber ?: "", it.edition, useNum.toInt()
                 )
             )
 

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

@@ -430,7 +430,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         } else {
             binding.tvMoreDelete.setGone()
         }
-        if (sn.startsWith("010F") || sn.startsWith("011") || sn.startsWith("033")) {
+        if (sn.startsWith("010F")  || sn.startsWith("033") || getNewTuya()) {
             binding.tvMoreShare.setGone()
         }
     }

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

@@ -425,6 +425,11 @@ class CookDetailViewModel : BaseViewModel() {
             }
             desc = descBuilder.toString()
         }
+
+        val level = t.easyLevelDesc
+            ?.takeUnless { it.isEmpty() }  // 非空且非空字符串时保留原值
+            ?: globalApp().getString(com.develop.common.R.string.easy)
+
         var devRecipe = DevRecipe(
             t.id.toString(),
             t.id.toString(),
@@ -439,7 +444,7 @@ class CookDetailViewModel : BaseViewModel() {
             0,
             0,
             number,
-            t.easyLevelDesc,
+            level,
             "",
             t.name,
             desc,