提交人：jtm

提交内容:使用glide

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -346,6 +346,13 @@ object DataFactory {
         R.string.manual_cooking,
         R.string.download_new_recipes
     )
+    private var title2StrIds = mutableListOf<Int>(
+        R.string.Automatic_recipes,
+        R.string.Automatic_programmes,
+        R.string.Manual_cooking,
+        R.string.Download_new_recipes
+    )
+
 
     private var typeList = mutableListOf<EntranceType>(
         EntranceType.automatic_recipes,
@@ -357,7 +364,15 @@ object DataFactory {
     fun getEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds.indices) {
-            dataList.add(EntranceData(bgResIds[i], iconResIds[i], titleStrIds[i], typeList[i]))
+            dataList.add(
+                EntranceData(
+                    bgResIds[i],
+                    iconResIds[i],
+                    titleStrIds[i],
+                    title2StrIds[i],
+                    typeList[i]
+                )
+            )
         }
         return dataList
     }

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

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.appcompat.widget.AppCompatTextView
-import coil.load
+import com.develop.base.ext.load
 import com.blankj.utilcode.util.ScreenUtils.getScreenHeight
 import com.blankj.utilcode.util.ScreenUtils.getScreenWidth
 import com.develop.base.ext.globalApp

BusinessCommon/src/main/java/com/develop/common/tag/CommonTag.kt

@@ -10,6 +10,7 @@ const val WIFI_FROM_MAIN_SETTING = "WIFI_FROM_MAIN_SETTING"
 const val POLICY_FROM_MAIN_SETTING = "POLICY_FROM_MAIN_SETTING"
 const val MODE_ENTRANCE = "MODE_ENTRANCE"
 const val RECIPES_TYPE = "RECIPES_TYPE"
+const val HOME_TITLE = "HOME_TITLE"
 const val MODE_TYPE = "mode_type"
 const val LANGUAGE_FROM_SETTING = "LANGUAGE_FROM_SETTING"
 const val SCREENSAVER = "ScreenSaver"

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -168,7 +168,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     }
 
     override fun getResources(): Resources {
-     // AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources())
+        AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources())
         return super.getResources()
     }
 

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

@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
-import coil.load
+import com.develop.base.ext.load
 import com.develop.base.ext.updateText
 import com.develop.common.R
 import com.develop.common.databinding.ItemEntranceViewBinding
@@ -38,6 +38,7 @@ data class EntranceData(
     var bgResId: Int,
     var iconResId: Int,
     var titleStrId: Int,
+    var title2StrId: Int,
     var type: EntranceType
 )
 

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

@@ -4,8 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.RelativeLayout
-import coil.load
-import coil.transform.RoundedCornersTransformation
+import com.develop.base.ext.load
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.updateText
@@ -88,9 +87,7 @@ class FoodContentView : RelativeLayout {
             }
         }
         binding.apply {
-            ivCover.load(cover) {
-                transformations(RoundedCornersTransformation(dp10, dp10, 0f, 0f))
-            }
+            ivCover.load(cover)
             tvFoodName.updateText(content.foodName)
             starView.apply {
                 setStarCount(content.starCount)

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

@@ -5,13 +5,13 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
 import android.widget.RelativeLayout
-import coil.load
+import com.develop.base.ext.load
 import com.develop.base.R.*
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.updateText
 import com.develop.common.R
 import com.develop.common.databinding.HomeFunctionTopBarViewBinding
-import com.develop.common.data_repo.db.FunType
+import com.develop.common.data_repo.db.RecipesType
 
 
 class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
@@ -24,10 +24,9 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
     ) {
     }
 
-    private var funType = FunType.LocalRecipes
     var onHomeFunctionClickListener: OnHomeFunctionClickListener? = null
 
-    private var tempFunType = FunType.LocalRecipes
+    private var recipesType = RecipesType.LOCAL
     private var homeOrBackType = HomeOrBack.Home
 
     init {

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

@@ -8,7 +8,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import com.develop.base.ext.load
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.updateText
 import com.develop.common.R

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

@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
-import coil.load
+import com.develop.base.ext.load
 import com.develop.base.ext.updateText
 import com.develop.common.R
 import com.develop.common.databinding.StarViewBinding

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

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tool="http://schemas.android.com/tools"
     android:id="@+id/content_layout"
     android:layout_width="match_parent"
     android:layout_height="@dimen/convert_330px">
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/iv_cover"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_180px"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        app:shapeAppearanceOverlay="@style/topRightCornerStyle" />
 
     <RelativeLayout
         android:id="@+id/like_layout"
@@ -28,11 +30,11 @@
     </RelativeLayout>
 
     <RelativeLayout
-        android:paddingStart="@dimen/convert_22px"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/iv_cover"
-        android:layout_alignParentBottom="true">
+        android:layout_alignParentBottom="true"
+        android:paddingStart="@dimen/convert_22px">
 
 
         <ImageView

BusinessCommon/src/main/res/values-en/strings.xml

@@ -141,4 +141,8 @@
     <string name="home">HOME</string>
     <string name="back">BACK</string>
     <string name="historical_search">Historical search</string>
+    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
+    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
+    <string name="Manual_cooking">MANUAL COOKING</string>
+    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
 </resources>

BusinessCommon/src/main/res/values-fr/strings.xml

@@ -141,4 +141,8 @@
     <string name="home">HOME</string>
     <string name="back">BACK</string>
     <string name="historical_search">Historical search</string>
+    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
+    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
+    <string name="Manual_cooking">MANUAL COOKING</string>
+    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
 </resources>

BusinessCommon/src/main/res/values-ja/strings.xml

@@ -141,4 +141,8 @@
     <string name="home">HOME</string>
     <string name="back">BACK</string>
     <string name="historical_search">Historical search</string>
+    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
+    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
+    <string name="Manual_cooking">MANUAL COOKING</string>
+    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
 </resources>

BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -141,4 +141,8 @@
     <string name="home">HOME</string>
     <string name="back">BACK</string>
     <string name="historical_search">Historical search</string>
+    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
+    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
+    <string name="Manual_cooking">MANUAL COOKING</string>
+    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
 </resources>

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

@@ -216,4 +216,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="home">HOME</string>
     <string name="back">BACK</string>
     <string name="historical_search">Historical search</string>
+
+    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
+    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
+    <string name="Manual_cooking">MANUAL COOKING</string>
+    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
 </resources>

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

@@ -16,4 +16,11 @@
     <style name="bottomSheetStyleWrapper" parent="Widget.Design.BottomSheet.Modal">
         <item name="android:background">@android:color/transparent</item>
     </style>
+
+    <!-- 右上角圆角图片 -->
+    <style name="topRightCornerStyle">
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerSizeTopRight">@dimen/convert_10px</item>
+        <item name="cornerSizeTopLeft">@dimen/convert_10px</item>
+    </style>
 </resources>

BusinessMain/src/main/java/com/develop/main/adapter/HomeBannerAdapter.kt

@@ -1,76 +0,0 @@
-package com.develop.main.adapter
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.RelativeLayout
-import androidx.recyclerview.widget.RecyclerView
-import coil.load
-import coil.transform.RoundedCornersTransformation
-import com.develop.base.ext.globalApp
-import com.develop.base.ext.navigateTo
-import com.develop.base.ext.resId2Dimension
-import com.develop.common.data_repo.db.HomeBannerModel
-import com.develop.common.router.Screens
-import com.develop.common.tag.Downloaded
-import com.develop.common.tag.FOOD_LIST_TYPE
-import com.develop.common.tag.FOOL_LIST_TITLE
-import com.develop.main.R
-import com.develop.main.ui.HomeActivity
-
-import com.youth.banner.adapter.BannerAdapter
-
-class HomeBannerAdapter(var bannerDataList: MutableList<HomeBannerModel>) :
-    BannerAdapter<HomeBannerModel, HomeBannerAdapter.ViewHolder>(bannerDataList) {
-
-
-    private lateinit var context: Context
-
-
-    var onBannerItemClickListener: OnBannerItemClickListener? = null
-
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        var ivBanner: ImageView = itemView.findViewById(R.id.iv_banner)
-        val netRecipesLayout: RelativeLayout = itemView.findViewById(R.id.net_recipes_layout)
-        var downloadLayout: RelativeLayout = itemView.findViewById(R.id.download_layout)
-
-    }
-
-    override fun onCreateHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        context = parent.context
-        return ViewHolder(
-            LayoutInflater.from(context).inflate(R.layout.item_home_banner, parent, false)
-        )
-    }
-
-    override fun onBindView(holder: ViewHolder, data: HomeBannerModel, position: Int, size: Int) {
-        holder.ivBanner.load(data.cover){
-            transformations(RoundedCornersTransformation(dp30,dp30,dp30,dp30))
-        }
-        holder.downloadLayout.setOnClickListener {
-            (context as HomeActivity).navigateTo(Screens.Cook.FOOD_LIST) {
-                val bundle = Bundle()
-                bundle.putString(
-                    FOOL_LIST_TITLE,
-                    globalApp().getString(com.develop.common.R.string.download)
-                )
-                bundle.putInt(FOOD_LIST_TYPE, Downloaded)
-                with(bundle)
-            }
-        }
-        holder.netRecipesLayout.setOnClickListener {
-            onBannerItemClickListener?.onNetRecipesClick(data)
-        }
-    }
-
-    interface OnBannerItemClickListener {
-        fun onNetRecipesClick(bannerModel: HomeBannerModel)
-    }
-
-    companion object {
-        var dp30 = (com.develop.base.R.dimen.convert_30px).resId2Dimension()
-    }
-}

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

@@ -76,11 +76,19 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
     }
 
     private fun initFragment(intent: Intent?, isFromNewIntent: Boolean = false) {
-        currModeEntrance = intent?.extras?.getInt(MODE_ENTRANCE) ?: Recipes
-        if ((intent?.extras?.getInt(RECIPES_TYPE) ?: LocalFood) == LocalFood) {
-            viewModel.recipesType = RecipesType.LOCAL
+        val extras = intent?.extras
+        currModeEntrance = extras?.getInt(MODE_ENTRANCE) ?: Recipes
+        binding.functionTopBar.setTitle(extras?.getString(HOME_TITLE) ?: "")
+        if ((extras?.getInt(RECIPES_TYPE) ?: LocalFood) == LocalFood) {
+            viewModel.apply {
+                recipesType = RecipesType.LOCAL
+                isFromDownloadNewRecipesEntrance = false
+            }
         } else {
-            viewModel.recipesType = RecipesType.ONLINE
+            viewModel.apply {
+                recipesType = RecipesType.ONLINE
+                isFromDownloadNewRecipesEntrance = true
+            }
         }
         binding.functionTopBar.setHomeOrBack(HomeOrBack.Home)
         if (currModeEntrance == Recipes) {
@@ -118,7 +126,9 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
                         finish()
                     } else {
                         //搜索后，返回后当前还是onLine的菜谱，还是显示返回，可以返回本地菜谱
-                        if (viewModel.recipesType == RecipesType.ONLINE && viewModel.isSearch) {
+                        if (viewModel.recipesType == RecipesType.ONLINE && viewModel.isSearch
+                            && !viewModel.isFromDownloadNewRecipesEntrance
+                        ) {
                             binding.functionTopBar.setHomeOrBack(HomeOrBack.Back)
                         } else {
                             binding.functionTopBar.setHomeOrBack(HomeOrBack.Home)
@@ -162,8 +172,7 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
         binding.favouriteLayout.setOnClickListener {
             val bundle = Bundle()
             bundle.putString(
-                FOOL_LIST_TITLE,
-                getString(com.develop.common.R.string.favourite_recipes)
+                FOOL_LIST_TITLE, getString(com.develop.common.R.string.favourite_recipes)
             )
             bundle.putInt(FOOD_LIST_TYPE, Favourite)
             navigateTo(Screens.Cook.FOOD_LIST) {

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

@@ -50,12 +50,14 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                 }
                 R.id.entrance_item.onClick {
                     val clickModel = getModel<EntranceData>()
+                    val title = getString(clickModel.title2StrId)
                     when (clickModel.type) {
                         EntranceType.automatic_recipes -> {
                             if (FoodDataProvider.checkDataExit()) {
                                 val bundle = Bundle()
                                 bundle.putInt(MODE_ENTRANCE, Recipes)
                                 bundle.putInt(RECIPES_TYPE, LocalFood)
+                                bundle.putString(HOME_TITLE, title)
                                 navigateTo(Screens.Main.HOME) {
                                     with(bundle)
                                 }
@@ -70,6 +72,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                         EntranceType.manual_cooking -> {
                             val bundle = Bundle()
                             bundle.putInt(MODE_ENTRANCE, Mode)
+                            bundle.putString(HOME_TITLE, title)
                             navigateTo(Screens.Main.HOME) {
                                 with(bundle)
                             }
@@ -79,6 +82,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                             val bundle = Bundle()
                             bundle.putInt(MODE_ENTRANCE, Recipes)
                             bundle.putInt(RECIPES_TYPE, NetFood)
+                            bundle.putString(HOME_TITLE, title)
                             navigateTo(Screens.Main.HOME) {
                                 with(bundle)
                             }

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

@@ -1,19 +1,16 @@
 package com.develop.main.ui
 
-import android.graphics.Rect
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.recyclerview.widget.LinearSnapHelper
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import com.develop.base.ext.load
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.updateText
-import com.develop.base.mvvm.BaseBVMFragment
 import com.develop.common.data_repo.db.DataFactory
 import com.develop.common.data_repo.db.ModelsModel
 import com.develop.common.data_repo.db.ModesType
@@ -23,7 +20,6 @@ import com.develop.common.ui.CommonBVMFragment
 import com.develop.main.R
 import com.develop.main.databinding.FragmentModesBinding
 import com.develop.main.viewmodel.HomeViewModel
-import com.drake.brv.utils.grid
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.setup
 import kotlin.math.abs

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

@@ -22,7 +22,6 @@ import com.develop.common.tag.*
 import com.develop.common.ui.CommonBVMFragment
 import com.develop.common.widget.*
 import com.develop.main.R
-import com.develop.main.adapter.HomeBannerAdapter
 import com.develop.main.databinding.ItemFilterAndSortViewBinding
 import com.develop.main.viewmodel.HomeViewModel
 import com.drake.brv.BindingAdapter
@@ -100,7 +99,6 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         super.onPostCreateView()
         initView()
         initLiveDataCallback()
-        viewModel.getOnLineCategoryList()
     }
 
     override fun onResume() {
@@ -247,7 +245,6 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                 getOnLineCategoryList()
                 recipesType = RecipesType.ONLINE
                 netFoodLiveData.postValue(true)
-                postEmptyOnlineRecipes()
                 homeOrBackLiveData.postValue(HomeOrBack.Back)
             }
         }
@@ -441,7 +438,6 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     private fun refreshOnLineOrLocalRecipes() {
         if (viewModel.recipesType == RecipesType.ONLINE) {
             viewModel.apply {
-                postEmptyOnlineRecipes()
                 getOnLineCategoryList()
             }
         } else {

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

@@ -33,6 +33,7 @@ class HomeViewModel : BaseViewModel() {
 
     var currCategoryName = ""
     var recipesType = RecipesType.LOCAL
+    var isFromDownloadNewRecipesEntrance = false
     var currentPage = 1
     var currentPageSize = 10
     var totalPageSize = 1

BusinessMain/src/main/res/layout/item_entrance.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.develop.common.widget.EntranceItemView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="@dimen/convert_640px"
     android:id="@+id/entrance_item"
-    android:layout_height="wrap_content" />
+    android:layout_height="@dimen/convert_400px" />

BusinessSetting/src/main/java/com/develop/setting/adapter/ScreenBannerAdapter.kt

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import com.develop.base.ext.load
 import com.develop.setting.R
 import com.youth.banner.adapter.BannerAdapter
 

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

@@ -6,8 +6,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.cardview.widget.CardView
-import coil.load
+import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.LanguageUtils
 import com.develop.base.ext.navigateTo
@@ -29,7 +28,6 @@ import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
-import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
 

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

@@ -8,9 +8,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.ImageView
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension

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

@@ -4,17 +4,15 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
-import coil.load
+import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.setGone
 import com.develop.base.ext.setVisible
-import com.develop.base.ext.toJson
 import com.develop.base.ext.updateText
 import com.develop.base.util.MusicBackPlayerUtil
 import com.develop.base.util.ThreadUtils
 import com.develop.common.router.Screens
 import com.develop.common.widget.TimePickerView
-import com.develop.step.BuildConfig
 import com.develop.step.CookSettingType
 import com.develop.common.R
 import com.develop.common.data_repo.FoodDataProvider
@@ -142,10 +140,8 @@ class CookStepActivity : CookStepBaseActivity() {
                 binding.ivPrevStep.setVisible()
                 binding.ivNextStep.setVisible()
             }
-            binding.ivCookBg.load(FoodDataProvider.getResourcePath(it.source.photoVideoFilePath)) {
-                error(R.drawable.bg_cook_session)
-                transformations()
-            }
+            binding.ivCookBg.load(FoodDataProvider.getResourcePath(it.source.photoVideoFilePath),
+                R.drawable.bg_cook_session)
             updateUiSetting(it)
             playStepAudio(it.source.audioFilePath)
             tryConsumePendingCookStep(it)

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

@@ -5,7 +5,7 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import coil.load
+import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
@@ -13,7 +13,6 @@ import com.blankj.utilcode.util.ToastUtils
 import com.develop.base.ext.*
 import com.develop.base.util.ThreadUtils
 import com.develop.common.data_repo.FoodDataProvider
-import com.develop.common.data_repo.db.entity.UserFavoriteRecipes
 import com.develop.common.dialog.AmountSelectDialog
 import com.develop.common.dialog.RecipeDeleteConfirmDialog
 import com.develop.common.router.Screens

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

@@ -1,12 +1,10 @@
 package com.develop.step.ui.recipes_detail
 
-import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import coil.load
+import com.develop.base.ext.load
 import com.develop.base.ext.updateText
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.ui.CommonBVMFragment

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

@@ -8,8 +8,10 @@ import android.graphics.drawable.Drawable
 import android.os.Build
 import android.text.TextUtils
 import android.util.Patterns
+import android.widget.ImageView
 import androidx.annotation.DimenRes
 import androidx.core.content.ContextCompat
+import com.bumptech.glide.Glide
 import com.develop.base.app.BaseApp
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -164,4 +166,15 @@ fun getSN(): String {
         serial = "03403015888888"
     }
     return serial
+}
+
+fun ImageView.load(data: Any?) {
+    Glide.with(this.context).load(data)
+        .into(this)
+}
+
+fun ImageView.load(data: Any?, error: Int) {
+    Glide.with(this.context).load(data)
+        .placeholder(error)
+        .into(this)
 }

libThirdPart/build.gradle

@@ -54,7 +54,7 @@ dependencies {
     api 'com.tencent:mmkv-static:1.2.10'
     api 'com.blankj:utilcodex:1.31.0'
     api 'com.github.smarxpan:NotchScreenTool:0.0.1'
-    api "io.coil-kt:coil:2.2.1" //图片加载
+   // api "io.coil-kt:coil:2.2.1" //图片加载
     api "com.youth.banner:banner:2.1.0"
     api 'com.google.android.flexbox:flexbox:3.0.0'
     api 'com.yanzhenjie:permission:2.0.3'
@@ -71,5 +71,6 @@ dependencies {
     api 'com.google.zxing:core:3.3.3'
     //屏幕适配
     api "me.jessyan:autosize:1.2.1"
+    api 'com.github.bumptech.glide:glide:4.12.0'
 
 }