修改视频

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

@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.develop.base.ext.load
+import com.develop.base.ext.src
 import com.develop.setting.R
 import com.youth.banner.adapter.BannerAdapter
 
@@ -29,6 +30,6 @@ class ScreenBannerAdapter(dataList: MutableList<Int>) :
         size: Int
     ) {
 
-        holder.ivBanner.load(data)
+        holder.ivBanner.src = data
     }
 }

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

@@ -5,6 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setGone
 import com.develop.base.mvvm.BaseBindingActivity
 import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBindingActivity
@@ -49,6 +51,9 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
                 }
             }
         }.models = dataList
+        if (isNightTheme()){
+            binding.circleRecycler.setGone()
+        }
 
         binding.bannerView.apply {
             isAutoLoop(false)

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

@@ -69,6 +69,8 @@ class CookStepActivity : CookStepBaseActivity() {
     @Autowired(name = "portionSizelJson")
     var portionSizelJson: String? = null
 
+    private var titleName = ""
+
     private fun turnDevModeUI(){
 
         if(CofarSDK.devInfo().devMode == DevModes.AIR_FRYER){
@@ -241,14 +243,16 @@ class CookStepActivity : CookStepBaseActivity() {
         viewModel.queryRecipeCookStep(recipeNumber ?: "", currentStepIndex)
         viewModel.stepDisplay.observe(this) { it ->
             coverPath = FoodDataProvider.getImagePath(it.source.photoVideoFilePath)
-            if (it.workMode == "FINISH_DESC") {
+            if (it.workMode == "Final Step") {
                 val stepCount = viewModel.getStepCount()
                 val stepIndex = viewModel.allSteps.indexOf(it)
                 changeDescription()
                 cookProgressDrawable.setStepState(stepIndex, stepCount)
                 binding.tvStepName.text = getText(R.string.engjoy_your_meal)
                 binding.tvTitleStep.text = getText(R.string.recipe_complete)
-
+                binding.viewChangeCrush.setGone()
+                binding.viewChangeWeight.setGone()
+                binding.viewRemark.setGone()
                 if (stepCount == 1) {
                     binding.ivPrevStep.setGone()
                     binding.ivNextStep.setGone()
@@ -274,6 +278,10 @@ class CookStepActivity : CookStepBaseActivity() {
                     )
                 }
             } else {
+                binding.tvTitleStep.text = titleName
+                binding.viewChangeCrush.setVisible()
+                binding.viewChangeWeight.setVisible()
+                binding.viewRemark.setVisible()
                 if (CofarSDK.devInfo().status == DevStatus.STOP.toInt()) {
                     CofarSDK.changeModeWithoutCfg(
                         "$recipeNumber:${viewModel.stepIndex}",
@@ -416,6 +424,7 @@ class CookStepActivity : CookStepBaseActivity() {
             }
         }
         viewModel.recipeLiveData.observe(this) {
+            titleName = it.name.toString()
             binding.tvTitleStep.text = it.name
         }
     }
@@ -441,7 +450,13 @@ class CookStepActivity : CookStepBaseActivity() {
             configing = true;
             if (viewModel.allSteps.isNotEmpty()){
                 viewModel.allSteps.get(viewModel.stepIndex)?.let {
-
+                    if (it.workMode == "Final Step") {
+                        //享用美食页面
+                        notifyAllCookStepComplete()
+                        return
+                    } else {
+                        binding.llStepFinish.setGone()
+                    }
                     it.uiData.applyRecipeSetting(it.source)
 
                     if (!it.isWeightMode() && !it.isDescription()) {
@@ -994,13 +1009,13 @@ class CookStepActivity : CookStepBaseActivity() {
      * 所有步骤已经结束，展示结束页面
      */
     private fun notifyAllCookStepComplete() {
-        binding.controller.root.setGone()
-        binding.tvStepName.setGone()
-        binding.viewChangeCrush.setGone()
-        binding.viewChangeWeight.setGone()
-        binding.viewRemark.setGone()
-        binding.ivTurboView.setGone()
-        binding.llWeightView.setGone()
+//        binding.controller.root.setGone()
+//        binding.tvStepName.setGone()
+//        binding.viewChangeCrush.setGone()
+//        binding.viewChangeWeight.setGone()
+//        binding.viewRemark.setGone()
+//        binding.ivTurboView.setGone()
+//        binding.llWeightView.setGone()
         binding.llStepFinish.setVisible()
         binding.ivAddToFav.setOnClickListener {
             if (isLike) {
@@ -1010,10 +1025,10 @@ class CookStepActivity : CookStepBaseActivity() {
                         CURRENT_USER_ID, recipeNumber ?: ""
                     )
                 }
-                binding.ivAddToFav.background_drawable = R.drawable.ic_cook_fav
+                binding.ivAddToFav.src = R.drawable.ic_cook_fav
             } else {
                 isLike = true
-                binding.ivAddToFav.background_drawable = R.drawable.ic_like
+                binding.ivAddToFav.src = R.drawable.ic_like
                 FoodDataProvider.getUserDatabase().runInTransaction {
                     FoodDataProvider.getUserDatabase().userInfoDao().insertFavoriteRecipe(
                         UserFavoriteRecipes(CURRENT_USER_ID, recipeNumber ?: "")

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

@@ -54,6 +54,12 @@ class CookStepViewModel : BaseViewModel() {
                 allSteps.add(stepStatus)
                 dataCopy.add(stepStatus.uiData.newCopy())
             }
+
+            //默认添加最后一步享用美食
+            val finalStep = CookStepStatus("Final Step",cookSteps[0])
+            allSteps.add(finalStep)
+            dataCopy.add(finalStep.uiData.newCopy())
+
             stepIndex = currentStepIndex
             if (allSteps.isNotEmpty() && allSteps.size > currentStepIndex) {
                 allSteps[currentStepIndex].let {

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

@@ -82,21 +82,27 @@
         app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
-    <TextView
-        android:id="@+id/tv_step_name"
+
+    <ScrollView
         android:layout_width="@dimen/convert_679px"
         android:layout_height="@dimen/convert_580px"
-        android:text="Step1:Peel 3 onions(180g)and2garlic cloves,halve the onions andput both in the blender jug."
-        android:textColor="#fff"
         android:layout_marginStart="@dimen/convert_40px"
         android:layout_marginTop="@dimen/convert_40px"
         android:layout_marginEnd="@dimen/convert_99px"
-        android:textSize="@dimen/convert_26px"
-        android:lineSpacingExtra="@dimen/convert_10px"
-        android:ellipsize="end"
-        android:maxLines="5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
+        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar">
+
+        <TextView
+            android:id="@+id/tv_step_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/convert_10px"
+            android:text="Step1:Peel 3 onions(180g)and2garlic cloves,halve the onions andput both in the blender jug."
+
+            android:textColor="#fff"
+            android:textSize="@dimen/convert_26px" />
+    </ScrollView>
+
 
     <ImageView
         android:id="@+id/iv_prev_step"

app/src/main/java/com/develop/foodcooking/MainActivity.kt

@@ -2,17 +2,21 @@ package com.develop.foodcooking
 
 import android.content.res.Resources
 import android.os.Bundle
+import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.setNightTheme
+import com.develop.base.mvvm.BaseBindingActivity
 import com.develop.base.util.MMkvUtils
 import com.develop.common.router.Screens
 import com.develop.common.tag.FIRST_IN
+import com.develop.common.ui.CommonBindingActivity
+import com.develop.foodcooking.databinding.ActivityMainBinding
 import org.alee.component.skin.service.ThemeSkinService
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (MMkvUtils.getBool(FIRST_IN)) {
@@ -23,4 +27,8 @@ class MainActivity : AppCompatActivity() {
         finish()
     }
 
+    override fun createViewBinding(inflater: LayoutInflater): ActivityMainBinding {
+        return ActivityMainBinding.inflate(inflater)
+    }
+
 }

libThirdPart/build.gradle

@@ -92,6 +92,7 @@ dependencies {
     // 需要替换字体库时引入
     api 'com.github.CoderAlee.PaintedSkin:typeface-plugin:3.5.2.1'
     compile 'com.github.a-voyager:AutoInstaller:v1.0'
+    api 'net.lingala.zip4j:zip4j:2.11.5'