Browse Source

提交人:jtm
提交内容:bug fixed

江天明 1 year ago
parent
commit
e7c4e7e6e3

+ 12 - 4
BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -16,6 +16,8 @@ import androidx.core.graphics.drawable.DrawableCompat
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setGone
+import com.develop.base.ext.setVisible
 import com.develop.base.ext.src
 import com.develop.base.util.ThreadUtils
 import com.develop.common.data_repo.db.ModesType
@@ -924,6 +926,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     /**切换到温度*/
     private fun changeTempSettingStep() {
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.steamFire.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
@@ -953,7 +957,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到时间*/
     private fun changeTimeSettingStep() {
         binding.steamFire.visibility = View.GONE
-
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -972,7 +977,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到转速*/
     private fun changeSpeedSettingStep() {
         binding.steamFire.visibility = View.GONE
-
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -991,7 +997,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到方向*/
     private fun changeDirectionSettingStep() {
         binding.steamFire.visibility = View.GONE
-
+        binding.jianhao.setGone()
+        binding.jiahao.setGone()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -1010,7 +1017,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到*/
     private fun changeWaterSprySettingStep() {
         binding.steamFire.visibility = View.GONE
-
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE

+ 12 - 0
BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepBaseActivity.kt

@@ -18,6 +18,8 @@ import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.launcher.ARouter
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setGone
+import com.develop.base.ext.setVisible
 import com.develop.base.ext.src
 import com.develop.base.ext.text_color
 import com.develop.base.ext.updateText
@@ -348,6 +350,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTempSettingPanel() {
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
@@ -381,6 +385,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTimeSettingPanel() {
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
@@ -400,6 +406,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeSpeedSettingStep() {
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
@@ -420,6 +428,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeWaterGearSettingStep() {
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.llWeightView.visibility = View.GONE
@@ -441,6 +451,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeDirectionSettingStep() {
+        binding.controller.jianhao.setGone()
+        binding.controller.jiahao.setGone()
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE