提交人：jtm

提交内容:bug fix

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

@@ -55,29 +55,32 @@
 
     <ImageView
         android:id="@+id/iv_wifi"
-        android:layout_width="@dimen/convert_40px"
-        android:layout_height="@dimen/convert_40px"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/convert_18px"
+        android:layout_marginEnd="@dimen/convert_26px"
+        android:padding="@dimen/convert_10px"
         android:layout_toStartOf="@id/iv_notify" />
 
     <ImageView
         android:id="@+id/iv_notify"
-        android:layout_width="@dimen/convert_40px"
-        android:layout_height="@dimen/convert_40px"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/convert_18px"
+        android:padding="@dimen/convert_10px"
+        android:layout_marginEnd="@dimen/convert_26px"
         android:layout_toStartOf="@+id/iv_tab"
-        android:background="@drawable/ic_notify" />
+        android:src="@drawable/ic_notify" />
 
     <ImageView
         android:id="@+id/iv_tab"
-        android:layout_width="@dimen/convert_40px"
-        android:layout_height="@dimen/convert_40px"
+        android:padding="@dimen/convert_10px"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="@dimen/convert_18px"
-        android:background="@drawable/ic_tab" />
+        android:src="@drawable/ic_tab" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_title"

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

@@ -88,13 +88,6 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                             }
                         }
                         EntranceType.automatic_programmes -> {
-                            navigateTo(Screens.Cook.COOK_MODES) {
-                                val bundle = Bundle()
-                                bundle.putString(MODE_TYPE, "ADAPTED_COOKING")
-                                with(bundle)
-                            }
-                        }
-                        EntranceType.manual_cooking -> {
                             val bundle = Bundle()
                             bundle.putInt(MODE_ENTRANCE, Mode)
                             bundle.putString(HOME_TITLE, title)
@@ -103,6 +96,13 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                             }
                             finish()
                         }
+                        EntranceType.manual_cooking -> {
+                            navigateTo(Screens.Cook.COOK_MODES) {
+                                val bundle = Bundle()
+                                bundle.putString(MODE_TYPE, "ADAPTED_COOKING")
+                                with(bundle)
+                            }
+                        }
                         EntranceType.download_new_recipes -> {
                             val bundle = Bundle()
                             bundle.putInt(MODE_ENTRANCE, Recipes)

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

@@ -121,6 +121,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
                 finish()
             } else {
                 navigateTo(Screens.Auth.MEMBER)
+                finish()
             }
         }
 

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

@@ -185,8 +185,10 @@ class CookStepActivity : CookStepBaseActivity() {
                 binding.ivPrevStep.setVisible()
                 binding.ivNextStep.setVisible()
             }
-            binding.ivCookBg.load(FoodDataProvider.getResourcePath(it.source.photoVideoFilePath),
-                R.drawable.bg_cook_session)
+            binding.ivCookBg.load(
+                FoodDataProvider.getResourcePath(it.source.photoVideoFilePath),
+                R.drawable.bg_cook_session
+            )
             updateUiSetting(it)
             playStepAudio(it.source.audioFilePath)
             tryConsumePendingCookStep(it)
@@ -264,21 +266,21 @@ class CookStepActivity : CookStepBaseActivity() {
     private fun initStepData() {
         configing = true;
         if (runningState == DevStatus.STOP.toInt()) {
+            if (viewModel.allSteps.isNotEmpty()) {
+                viewModel.allSteps.get(viewModel.stepIndex)?.let {
 
-            viewModel.allSteps.get(viewModel.stepIndex)?.let {
+                    it.uiData.applyRecipeSetting(it.source)
 
-                it.uiData.applyRecipeSetting(it.source)
+                    if (!it.isWeightMode() && !it.isDescription()) {
+                        //设置初始参数
+                        CofarSDK.cfgHeat(it.uiData.targetTemp.toShort(), 0)
+                        CofarSDK.cfgTime(it.uiData.targetTime)
+                        CofarSDK.cfgMotorGear(it.uiData.currentSpeed.toByte())
+                        CofarSDK.cfgMotorDirection(it.uiData.direction.toByte())
+                    }
 
-                if (!it.isWeightMode() && !it.isDescription()) {
-                    //设置初始参数
-                    CofarSDK.cfgHeat(it.uiData.targetTemp.toShort(), 0)
-                    CofarSDK.cfgTime(it.uiData.targetTime)
-                    CofarSDK.cfgMotorGear(it.uiData.currentSpeed.toByte())
-                    CofarSDK.cfgMotorDirection(it.uiData.direction.toByte())
                 }
-
             }
-
         }
         ThreadUtils.runOnMainThread({
             configing = false

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

@@ -88,20 +88,22 @@
 
     <ImageView
         android:id="@+id/iv_prev_step"
-        android:layout_width="@dimen/convert_60px"
-        android:layout_height="@dimen/convert_60px"
+        android:layout_width="@dimen/convert_90px"
+        android:layout_height="@dimen/convert_90px"
+        android:padding="@dimen/convert_15px"
         android:src="@drawable/ic_cook_prev_step"
-        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_marginStart="@dimen/convert_10px"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
     <ImageView
         android:id="@+id/iv_next_step"
-        android:layout_width="@dimen/convert_60px"
-        android:layout_height="@dimen/convert_60px"
+        android:padding="@dimen/convert_15px"
+        android:layout_width="@dimen/convert_90px"
+        android:layout_height="@dimen/convert_90px"
         android:src="@drawable/ic_cook_next_step"
-        android:layout_marginEnd="@dimen/convert_40px"
+        android:layout_marginEnd="@dimen/convert_10px"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>