Browse Source

全局配置使用涂鸦功能

zhangshenjie 2 weeks ago
parent
commit
784b131ab4

+ 3 - 4
BusinessCommon/src/main/java/com/develop/common/utils/AppVersionUtil.kt

@@ -12,6 +12,7 @@ import com.azhon.appupdate.util.LogUtil
 import com.blankj.utilcode.util.FileUtils
 import com.blankj.utilcode.util.ToastUtils
 import com.blankj.utilcode.util.ZipUtils
+import com.develop.base.ext.getNewTuya
 import com.develop.base.ext.getOtaFileMd5
 import com.develop.base.ext.getSN
 import com.develop.base.ext.getUpdateRecipeTime
@@ -64,8 +65,7 @@ object AppVersionUtil {
 
 
     fun checkRecipeUpdate(shoNoUpdateDialog: Boolean = false) {
-        var sn = getSN()
-        if (sn.startsWith("011D")){
+        if (getNewTuya()){
             //由于涂鸦云食谱,估不检测平台食谱
             return
         }
@@ -218,8 +218,7 @@ object AppVersionUtil {
 
 
     fun checkAboutRecipeUpdate(shoNoUpdateDialog: Boolean = false) {
-        var sn = getSN()
-        if (sn.startsWith("011D")){
+        if (getNewTuya()){
             //由于涂鸦云食谱,估不检测平台食谱
             return
         }

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

@@ -277,7 +277,7 @@ class FoodContentView : ConstraintLayout {
                 }
 
             }
-            if (foodSn.startsWith("011")){
+            if (getNewTuya()){
                 if (foodSn.startsWith("011F")){
                     binding.tvEasy.setTextColor(resources.getColor(R.color.color_A3A3A2))
                 }

+ 2 - 1
BusinessStep/src/main/java/com/develop/step/ui/FoodListActivity.kt

@@ -4,6 +4,7 @@ package com.develop.step.ui
 import android.os.Bundle
 import android.view.LayoutInflater
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.getNewTuya
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.setGone
 import com.develop.base.ext.setVisible
@@ -101,7 +102,7 @@ class FoodListActivity : CommonBVMActivity<ActivityFoodListBinding, FoodListView
 
         binding.ivDelete.setOnClickListener {
             safeGlobalScope.launch(Dispatchers.IO) {
-                if (baseSn.startsWith("011D")) {
+                if (getNewTuya()) {
                     MMkvUtils.save(HISTORYRECIPES, "")
                     viewModel.refreshData()
                 } else {

+ 2 - 1
BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -20,6 +20,7 @@ import androidx.databinding.ViewDataBinding
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.bumptech.glide.Glide
 import com.develop.base.ext.getModelNum
+import com.develop.base.ext.getNewTuya
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand062
@@ -3296,7 +3297,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             }
 
             //新版本涂鸦,需要SOURCE_TAG 都传 local ,不然 开始按钮会变 下载
-            if (baseSn.startsWith("011D")) {
+            if (getNewTuya()) {
                 navigateTo(Screens.Cook.COOK_DETAIL) {
                     withString(
                         SOURCE_TAG, "local"

+ 6 - 5
BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -18,6 +18,7 @@ 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.getNewTuya
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
@@ -646,7 +647,7 @@ class CookStepActivity : CookStepBaseActivity() {
             val result = FoodDataProvider.getUserDatabase().userInfoDao()
                 .queryFavoriteRecipes(CURRENT_USER_ID, it.number ?: "")
 
-            if (baseSn.startsWith("011D")){
+            if (getNewTuya()){
                 if (isLike) {
                     binding.ivAddToFav.src = R.drawable.ic_like
                 } else {
@@ -666,7 +667,7 @@ class CookStepActivity : CookStepBaseActivity() {
         }
 
         viewModel.addLikeLiveData.observe(this) {
-            if (baseSn.startsWith("011")) {
+            if (getNewTuya()) {
                 recipesloadingDialog.removeSelf()
             }
 
@@ -682,7 +683,7 @@ class CookStepActivity : CookStepBaseActivity() {
 
 
         viewModel.deleteLikeLiveData.observe(this) {
-            if (baseSn.startsWith("011")) {
+            if (getNewTuya()) {
                 recipesloadingDialog.removeSelf()
             }
 
@@ -1961,7 +1962,7 @@ class CookStepActivity : CookStepBaseActivity() {
     private fun recordRecipes() {
         if (!isHistory) {
             isHistory = true
-            if (baseSn.startsWith("011")) {
+            if (getNewTuya()) {
                 recordRecipes = true
 
             } else {
@@ -2099,7 +2100,7 @@ class CookStepActivity : CookStepBaseActivity() {
             }
 
             //新版本涂鸦,需要SOURCE_TAG 都传 local ,不然 开始按钮会变 下载
-            if (baseSn.startsWith("011D")){
+            if (getNewTuya()){
                 navigateTo(Screens.Cook.COOK_DETAIL) {
                     withString(
                         SOURCE_TAG, "local"

+ 2 - 1
BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepBaseActivity.kt

@@ -24,6 +24,7 @@ import androidx.databinding.ViewDataBinding
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.launcher.ARouter
 import com.develop.base.ext.background_drawable
+import com.develop.base.ext.getNewTuya
 import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
@@ -792,7 +793,7 @@ abstract class CookStepBaseActivity :
             CofarSDK.updateScene("");
         }
         super.onDestroy()
-        if (recordRecipes&&baseSn.startsWith("011D")){
+        if (recordRecipes&& getNewTuya()){
             saveCookRecipes()
         }
         isWidget = false

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

@@ -736,7 +736,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         binding.tvFoodName.movementMethod = ScrollingMovementMethod.getInstance()
         binding.tvFoodName.isScrollbarFadingEnabled = false
         val timeDescBuilder = StringBuilder()
-        if (!sn.startsWith("011D")){
+        if (!getNewTuya()){
             if (isLike){
                 binding.viewLike.src = com.develop.common.R.drawable.ic_like
             }else{

+ 2 - 1
BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailToolsFragment.kt

@@ -4,6 +4,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import com.develop.base.ext.getNewTuya
 import com.develop.base.ext.getSN
 import com.develop.base.ext.load
 import com.develop.base.ext.updateText
@@ -49,7 +50,7 @@ class CookDetailToolsFragment :
         viewModel.getRecipeLiveData().observe(viewLifecycleOwner) {
             val sourceItems = mutableListOf<CookToolItem>()
             for (accessory in it.accessory) {
-                val path =     if (sn.startsWith("011D")){
+                val path =     if (getNewTuya()){
                     viewModel.tuyaAccessoryPhoto(accessory.number)
                 }else{
                     FoodDataProvider.getResourcePath(accessory.photoPath)