提交人：jtm

提交内容:优化显示内容

BusinessCommon/src/main/java/com/develop/common/router/Screens.kt

@@ -41,5 +41,6 @@ object Screens {
         // todo temp
         const val COOK_STEP2 = "$SCHEMA/cook_step2"
         const val COOK_EVALUATE = "$SCHEMA/cook_evaluate"
+        const val COOK_SOURCE = "$SCHEMA/cook_source"
     }
 }

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

@@ -6,10 +6,16 @@
     android:layout_height="match_parent"
     android:background="@color/bg_color"
     app:stateEnabled="true">
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv"
-        android:overScrollMode="never"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:overScrollMode="never" />
 
-</com.scwang.smart.refresh.layout.SmartRefreshLayout >
+    <com.scwang.smart.refresh.footer.ClassicsFooter
+        android:id="@+id/footer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:srlClassicsSpinnerStyle="Translate" />
+</com.scwang.smart.refresh.layout.SmartRefreshLayout>

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

@@ -1,6 +1,7 @@
 package com.develop.main.ui
 
 
+import android.graphics.Color
 import android.media.metrics.Event
 import android.os.Bundle
 import android.util.Log
@@ -278,6 +279,11 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             }
         }
 
+        if (isNightTheme()){
+            binding.footer.apply {
+                setPrimaryColor(Color.parseColor("#1A1A1A"))
+            }
+        }
 
     }
 

BusinessStep/src/main/AndroidManifest.xml

@@ -18,5 +18,7 @@
         <activity
             android:name=".ui.cook_step.CookStepActivity"
             android:screenOrientation="landscape" />
+        <activity android:name=".ui.recipes_detail.CookSourceActivity"
+            android:screenOrientation="landscape"/>
     </application>
 </manifest>

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

@@ -13,8 +13,10 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.navigateTo
 import com.develop.base.ext.setGone
 import com.develop.base.ext.setVisible
+import com.develop.base.ext.src
 import com.develop.base.ext.updateText
 import com.develop.base.util.MusicBackPlayerUtil
 import com.develop.base.util.ThreadUtils
@@ -83,8 +85,10 @@ class CookStepActivity : CookStepBaseActivity() {
         super.onCreate(savedInstanceState)
 
         //隐藏称重与电动
-//        binding.viewChangeCrush.setGone()
-//        binding.viewChangeWeight.setGone()
+        if (!isNightTheme()){
+            binding.viewChangeCrush.setGone()
+            binding.viewChangeWeight.setGone()
+        }
 
         if (!isNightTheme()){
             binding.viewChangeCrush.setBgColor(R.color.view_change)
@@ -92,6 +96,8 @@ class CookStepActivity : CookStepBaseActivity() {
         } else {
             binding.viewChangeCrush.setBgColor(R.color.white)
             binding.viewChangeWeight.setBgColor(R.color.white)
+            binding.viewChangeWeight.src = R.drawable.ic_detail_tab1
+            binding.viewChangeCrush.src = R.drawable.ic_cooking_weight
             binding.viewNote.setVisible()
         }
 
@@ -139,47 +145,76 @@ class CookStepActivity : CookStepBaseActivity() {
         }
 
         binding.viewChangeWeight.setOnClickListener {
-            if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
-                Toast.makeText(this, "Step is running!", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-            val weightSelected = binding.viewChangeWeight.isSelected
-            if (weightSelected) {
-                CofarSDK.stoptWeight()
-                viewModel.setDisplayStep(viewModel.stepIndex, force = true)
-            } else {
-                binding.ivPrevStep.setGone()
-                binding.ivNextStep.setGone()
-                CofarSDK.changeMode(
-                    "$recipeNumber:${viewModel.stepIndex}",
-                    CofarSDK.devMode("WEIGHT")
-                )
-                changeWeightPanel()
-                CofarSDK.stoptWeight()
-                CofarSDK.startWeight()
+            if (isNightTheme()){
+                //此主题下，点击显示食材
+                navigateTo(Screens.Cook.COOK_SOURCE)
+            }else{
+                if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
+                    Toast.makeText(this, "Step is running!", Toast.LENGTH_SHORT).show()
+                    return@setOnClickListener
+                }
+                val weightSelected = binding.viewChangeWeight.isSelected
+                if (weightSelected) {
+                    CofarSDK.stoptWeight()
+                    viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+                } else {
+                    binding.ivPrevStep.setGone()
+                    binding.ivNextStep.setGone()
+                    CofarSDK.changeMode(
+                        "$recipeNumber:${viewModel.stepIndex}",
+                        CofarSDK.devMode("WEIGHT")
+                    )
+                    changeWeightPanel()
+                    CofarSDK.stoptWeight()
+                    CofarSDK.startWeight()
+                }
             }
         }
         binding.viewChangeCrush.setOnClickListener {
-            if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
-                Toast.makeText(this, "Step is running!", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-            val turboSelected = binding.viewChangeCrush.isSelected
-            if (turboSelected) {
-                CofarSDK.stoptWeight()
-                viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+            if (isNightTheme()){
+                //此主题下，点餐是称重
+                if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
+                    Toast.makeText(this, "Step is running!", Toast.LENGTH_SHORT).show()
+                    return@setOnClickListener
+                }
+                val weightSelected = binding.viewChangeWeight.isSelected
+                if (weightSelected) {
+                    CofarSDK.stoptWeight()
+                    viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+                } else {
+                    binding.ivPrevStep.setGone()
+                    binding.ivNextStep.setGone()
+                    CofarSDK.changeMode(
+                        "$recipeNumber:${viewModel.stepIndex}",
+                        CofarSDK.devMode("WEIGHT")
+                    )
+                    changeWeightPanel()
+                    CofarSDK.stoptWeight()
+                    CofarSDK.startWeight()
+                }
             } else {
-                binding.ivPrevStep.setGone()
-                binding.ivNextStep.setGone()
-                CofarSDK.changeMode(
-                    "$recipeNumber:${viewModel.stepIndex}",
-                    CofarSDK.devMode("TURBO")
-                )
-                CofarSDK.stoptWeight()
-                changeTurboPanel()
+                if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
+                    Toast.makeText(this, "Step is running!", Toast.LENGTH_SHORT).show()
+                    return@setOnClickListener
+                }
+                val turboSelected = binding.viewChangeCrush.isSelected
+                if (turboSelected) {
+                    CofarSDK.stoptWeight()
+                    viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+                } else {
+                    binding.ivPrevStep.setGone()
+                    binding.ivNextStep.setGone()
+                    CofarSDK.changeMode(
+                        "$recipeNumber:${viewModel.stepIndex}",
+                        CofarSDK.devMode("TURBO")
+                    )
+                    CofarSDK.stoptWeight()
+                    changeTurboPanel()
+                }
+                binding.viewChangeWeight.isSelected = false
+                binding.viewChangeCrush.isSelected = !turboSelected
             }
-            binding.viewChangeWeight.isSelected = false
-            binding.viewChangeCrush.isSelected = !turboSelected
+
         }
         initData()
         initStepData()

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

@@ -164,11 +164,20 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             it.add(binding.tvEasy)
             it.add(binding.startLayout)
         }
-        allTabViews.add(binding.ivTab1)
+        if (!isNightTheme()){
+            allTabViews.add(binding.ivTab1)
+        } else {
+            binding.ivTab1.setGone()
+        }
         allTabViews.add(binding.ivTab2)
         allTabViews.add(binding.ivTab3)
         allTabViews.add(binding.ivTab4)
-        selectTab(TAB_SOURCE)
+        if (isNightTheme()){
+            selectTab(TAB_DESC)
+        } else {
+            selectTab(TAB_SOURCE)
+        }
+
     }
 
     private fun initListener() {

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

@@ -0,0 +1,29 @@
+package com.develop.step.ui.recipes_detail
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.mvvm.BaseBVMActivity
+import com.develop.common.router.Screens
+import com.develop.step.R
+import com.develop.step.databinding.ActivityCookSourceBinding
+import com.develop.step.viewmodel.CookDetailViewModel
+
+@Route(path = Screens.Cook.COOK_SOURCE)
+class CookSourceActivity:BaseBVMActivity<ActivityCookSourceBinding, CookDetailViewModel>() {
+    override fun createViewModel(): CookDetailViewModel {
+        return getViewModel(CookDetailViewModel::class.java)
+    }
+
+    override fun createViewBinding(inflater: LayoutInflater): ActivityCookSourceBinding {
+       return ActivityCookSourceBinding.inflate(inflater)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        addFragment(R.id.fragment_container,CookDetailSourceFragment())
+        binding.ivClose.setOnClickListener {
+            finish()
+        }
+    }
+}

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

@@ -264,10 +264,11 @@
         android:background="@drawable/bg_detail_tab_selector"
         android:elevation="@dimen/convert_8px"
         android:padding="@dimen/convert_28px"
+        android:layout_marginTop="@dimen/convert_100px"
         android:src="@drawable/ic_detail_tab2"
         app:layout_constraintEnd_toStartOf="@+id/iv_tab3"
         app:layout_constraintStart_toEndOf="@+id/iv_tab1"
-        app:layout_constraintTop_toTopOf="@+id/iv_tab1"
+        app:layout_constraintTop_toTopOf="parent"
         app:tint="@color/color_cook_tab_tint" />
 
     <ImageView
@@ -277,10 +278,11 @@
         android:background="@drawable/bg_detail_tab_selector"
         android:elevation="@dimen/convert_8px"
         android:padding="@dimen/convert_28px"
+        android:layout_marginTop="@dimen/convert_100px"
         android:src="@drawable/ic_detail_tab3"
         app:layout_constraintEnd_toStartOf="@+id/iv_tab4"
         app:layout_constraintStart_toEndOf="@+id/iv_tab2"
-        app:layout_constraintTop_toTopOf="@+id/iv_tab1"
+        app:layout_constraintTop_toTopOf="parent"
         app:tint="@color/color_cook_tab_tint" />
 
     <ImageView
@@ -290,10 +292,11 @@
         android:background="@drawable/bg_detail_tab_selector"
         android:elevation="@dimen/convert_8px"
         android:padding="@dimen/convert_28px"
+        android:layout_marginTop="@dimen/convert_100px"
         android:src="@drawable/ic_detail_tab4"
         app:layout_constraintEnd_toStartOf="@+id/iv_top_banner"
         app:layout_constraintStart_toEndOf="@+id/iv_tab3"
-        app:layout_constraintTop_toTopOf="@+id/iv_tab1"
+        app:layout_constraintTop_toTopOf="parent"
         app:tint="@color/color_cook_tab_tint" />
 
     <FrameLayout
@@ -303,7 +306,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/iv_top_banner"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_tab1" />
+        app:layout_constraintTop_toBottomOf="@+id/iv_tab2" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_func_more"

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_color">
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_53px"
+        android:layout_height="@dimen/convert_53px"
+        android:layout_marginStart="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_10px"
+        android:padding="@dimen/convert_15px"
+        android:src="@drawable/ic_close" />
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/iv_close" />
+</RelativeLayout>