提交人：jtm

提交内容：bug fix

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -129,7 +129,7 @@ object DataFactory {
         val resIdList = mutableListOf(
             R.drawable.ic_setting_language,
             R.drawable.ic_setting_wifi,
-            R.drawable.ic_setting_voice,
+//            R.drawable.ic_setting_voice,
             R.drawable.ic_setting_brightness,
             R.drawable.ic_setting_user,
 //            R.drawable.ic_setting_folder,
@@ -140,7 +140,7 @@ object DataFactory {
         val nameList = mutableListOf(
             resource.getString(R.string.language),
             resource.getString(R.string.wifi),
-            resource.getString(R.string.sound),
+//            resource.getString(R.string.sound),
             resource.getString(R.string.brightness),
             resource.getString(R.string.user_account),
 //            resource.getString(R.string.storage),
@@ -151,7 +151,7 @@ object DataFactory {
         val settingTypeList = mutableListOf(
             SettingType.LANGUAGE,
             SettingType.WIFI,
-            SettingType.SOUND,
+//            SettingType.SOUND,
             SettingType.BRIGHTNESS,
             SettingType.USER_ACCOUNT,
 //            SettingType.STORAGE,

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

@@ -7,9 +7,9 @@
 
     <RelativeLayout
         android:id="@+id/mode_layout"
-        android:layout_width="@dimen/convert_314px"
+        android:layout_width="@dimen/convert_260px"
         android:layout_height="match_parent"
-        android:background="@drawable/ic_mode_round1">
+        android:background="@color/color_F4A12E">
 
         <ImageView
             android:id="@+id/iv_function"

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

@@ -256,7 +256,7 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
             }
             binding.ivAvatar.setImageResource(icon)
         } else {
-            binding.ivAvatar.setImageResource(com.develop.common.R.drawable.ic_icon1)
+            binding.ivAvatar.setImageResource(com.develop.common.R.drawable.ic_no_user)
             binding.functionTopBar.setUserName(getString(com.develop.common.R.string.login))
             binding.tvUserName.text = getString(com.develop.common.R.string.login)
         }

BusinessMain/src/main/res/layout/activity_home.xml

@@ -35,7 +35,7 @@
             android:layout_height="@dimen/convert_140px"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/convert_100px"
-            android:background="@drawable/ic_icon1" />
+            android:background="@drawable/ic_no_user" />
 
         <LinearLayout
             android:id="@+id/history_layout"

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

@@ -376,11 +376,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     }
 
     private fun showAmountSelectDialog() {
-        viewModel.getRecipeLiveData().value?.let {
-            AmountSelectDialog(it.portionSize) { size ->
-                viewModel.portionSizeLiveData.value = size
-            }.showDialog(supportFragmentManager, "AmountSelectDialog")
-        }
+//        viewModel.getRecipeLiveData().value?.let {
+//            AmountSelectDialog(it.portionSize) { size ->
+//                viewModel.portionSizeLiveData.value = size
+//            }.showDialog(supportFragmentManager, "AmountSelectDialog")
+//        }
     }
 
     private fun showDeleteRecipeDialog() {

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

@@ -155,6 +155,7 @@
         android:text="@string/serving_sizes"
         android:textColor="#fff"
         android:textSize="@dimen/convert_30px"
+        android:visibility="gone"
         android:layout_marginEnd="@dimen/convert_40px"
         app:layout_constraintTop_toTopOf="@+id/tv_jar_count"
         app:layout_constraintEnd_toEndOf="parent"/>
@@ -165,6 +166,7 @@
         android:layout_height="@dimen/convert_35px"
         android:background="@drawable/ic_cook_serving"
         android:layout_marginEnd="@dimen/convert_12px"
+        android:visibility="gone"
         app:layout_constraintEnd_toStartOf="@+id/tv_serving_size"
         app:layout_constraintTop_toTopOf="@+id/tv_serving_size"
         app:layout_constraintBottom_toBottomOf="@+id/tv_serving_size"/>

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

@@ -48,6 +48,7 @@
             android:layout_width="@dimen/convert_56px"
             android:layout_height="@dimen/convert_45px"
             android:background="@drawable/ic_alarm"
+            android:visibility="gone"
             android:layout_marginEnd="@dimen/convert_33px"
             android:layout_marginTop="@dimen/convert_24px"
             app:layout_constraintEnd_toEndOf="parent"