提交人：jtm

提交内容:bug fix

BusinessCommon/src/main/java/com/develop/common/utils/AppVersionUtil.kt

@@ -196,14 +196,16 @@ object AppVersionUtil {
     private fun showRecipesUpdateDialog(recipeUpdateTime: Long?) {
         TopResumedAtyHolder.getCurrentActivity()?.apply {
             val minute = MMkvUtils.getInt(SCREENSAVER)
-            Settings.System.putInt(
-                contentResolver,
-                Settings.System.SCREEN_OFF_TIMEOUT,
-                1000 * 60 * minute
-            )
-            val uri: Uri = Settings.System
-                .getUriFor(Settings.System.SCREEN_OFF_TIMEOUT)
-            contentResolver.notifyChange(uri, null)
+            if (minute!=0){
+                Settings.System.putInt(
+                    contentResolver,
+                    Settings.System.SCREEN_OFF_TIMEOUT,
+                    1000 * 60 * minute
+                )
+                val uri: Uri = Settings.System
+                    .getUriFor(Settings.System.SCREEN_OFF_TIMEOUT)
+                contentResolver.notifyChange(uri, null)
+            }
             RecipeUpdateDialog().apply {
                 onDialogClickListener = object : RecipeUpdateDialog.OnDialogClickListener {
                     override fun onConfirm() {

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

@@ -8,7 +8,7 @@
     android:orientation="horizontal">
 
     <LinearLayout
-        android:layout_marginEnd="@dimen/convert_517px"
+        android:layout_marginEnd="@dimen/convert_417px"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_60px">
 

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

@@ -59,19 +59,19 @@ class HomeViewModel : BaseViewModel() {
 
     private var totalLocalSize = 0
     private var startSize = 0
-    private var endSize = 11
+    private var endSize = 12
 
     private var totalSearchLocalSize = 0
     private var searchLocalSize = 0
     private var foodSize = 0
     private var startSearchSize = 0
-    private var endSearchSize = 11
+    private var endSearchSize = 12
 
     private var startRecipesSearchSize = 0
-    private var endRecipesSearchSize = 11
+    private var endRecipesSearchSize = 12
 
     private var startFoodSearchSize = 0
-    private var endFoodSearchSize = 11
+    private var endFoodSearchSize = 12
 
     private var lastLocalRecipesShowList = mutableListOf<Any>()
     private var hasMoreLocal = false
@@ -103,7 +103,7 @@ class HomeViewModel : BaseViewModel() {
     fun queryLocalRecipes(categoryNum: String) {
         scope(Dispatchers.IO) {
             startSize = 0
-            endSize = 11
+            endSize = 12
             localFavoriteRecipesList =
                 FoodDataProvider.getUserDatabase().userInfoDao().queryFavoriteRecipes(userId)
                     .toMutableList()
@@ -237,11 +237,11 @@ class HomeViewModel : BaseViewModel() {
         val homeHeader = HomeHeader()
         homeHeader.filterSortModel = FilterSortModel("")
         startSearchSize = 0
-        endSearchSize = 11
+        endSearchSize = 12
         startFoodSearchSize = 0
-        endFoodSearchSize = 11
+        endFoodSearchSize = 12
         startRecipesSearchSize = 0
-        endRecipesSearchSize = 11
+        endRecipesSearchSize = 12
         totalSearchLocalRecipes.clear()
         searchLocalRecipes.clear()
         searchLocalFood.clear()

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

@@ -476,7 +476,9 @@ class CookStepActivity : CookStepBaseActivity() {
         viewModel.nextStep()
 
         initStepData() //初始化步骤参数
-
+        binding.controller.llStepComplete.setGone()
+        binding.controller.jiahao.setVisible()
+        binding.controller.jianhao.setVisible()
 
     }
 
@@ -684,6 +686,8 @@ class CookStepActivity : CookStepBaseActivity() {
         setStepTextIconEnable(false)
         binding.controller.btnStart.text = "START NEXT STEP"
         binding.controller.llStepComplete.setVisible()
+        binding.controller.jiahao.setGone()
+        binding.controller.jianhao.setGone()
         binding.controller.tempRingView.visibility = View.INVISIBLE
         binding.controller.speedRingView.visibility = View.INVISIBLE
         binding.controller.tvSpeedText.visibility = View.INVISIBLE

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

@@ -467,7 +467,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/convert_60px">
+        android:layout_marginTop="@dimen/convert_210px">
 
         <View
             android:layout_width="@dimen/convert_110px"