提交人：jtm

提交内容：部分bug fix

BusinessAuth/src/main/java/com/develop/auth/ui/MemberProfileFragment.kt

@@ -109,6 +109,10 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                 it.msg?.apply {
                     showToast(this)
                 }
+                if (it.success) {
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                    hostActivity.finish()
+                }
             }
             viewModel.chooseAvatar.observe(viewLifecycleOwner) {
                 val icons = listOf(
@@ -143,10 +147,4 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
     override fun createViewModel(): MemberViewModel {
         return getViewModelOfActivity(MemberViewModel::class.java)
     }
-
-    companion object {
-        var dp53 = (com.develop.base.R.dimen.convert_53px).resId2Dimension().toInt()
-        var dp101 = (com.develop.base.R.dimen.convert_101px).resId2Dimension().toInt()
-        var dp16 = (com.develop.base.R.dimen.convert_16px).resId2Dimension().toInt()
-    }
 }

BusinessCommon/src/main/java/com/develop/common/dialog/AgeSelectDialog.kt

@@ -2,6 +2,8 @@ package com.develop.common.dialog
 
 import android.app.Dialog
 import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Window
 import androidx.appcompat.app.AppCompatActivity
 import com.develop.common.R
 import com.develop.common.databinding.DialogDataPickerBinding
@@ -10,11 +12,13 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 class AgeSelectDialog(
     private val activity: AppCompatActivity,
     private val onConfirm: (index: Int, change: Boolean) -> Unit
-): Dialog(activity) {
+): Dialog(activity, R.style.TransparentDialog) {
 
     private val binding = DialogDataPickerBinding.inflate(activity.layoutInflater)
     private val initIndex = 0
     init {
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         val listData = createAgeListData()
         setContentView(binding.root)
         binding.root.setOnClickListener {

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

@@ -8,7 +8,7 @@
         android:id="@+id/fl_content"
         android:layout_width="@dimen/convert_430px"
         android:layout_height="@dimen/convert_361px"
-        android:background="#ffffff"
+        android:background="@drawable/bg_white_button_round10px"
         android:paddingVertical="@dimen/convert_46px"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -27,7 +27,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_centerHorizontal="true"
-        android:src="@drawable/ic_cancel"
+        android:src="@drawable/ic_age_confirm"
         android:padding="12dp"
         android:background="@drawable/bg_icon_cancel"
         app:layout_constraintStart_toStartOf="@+id/fl_content"

BusinessCommon/src/main/res/values/styles.xml

@@ -17,6 +17,10 @@
         <item name="android:background">@android:color/transparent</item>
     </style>
 
+    <style name="TransparentDialog" parent="Theme.AppCompat.DayNight.Dialog">
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
     <!-- 右上角圆角图片 -->
     <style name="topRightCornerStyle">
         <item name="cornerFamilyTopRight">rounded</item>

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

@@ -234,6 +234,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                     view.visibility = View.VISIBLE
                 }
             }
+            if (hideDetail) {
+                binding.viewHide.setImageResource(com.develop.common.R.drawable.ic_detail_show)
+            } else {
+                binding.viewHide.setImageResource(com.develop.common.R.drawable.ic_visible)
+            }
         }
 
         binding.viewMore.setOnClickListener {

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

@@ -62,7 +62,7 @@
         android:id="@+id/view_hide"
         android:layout_width="@dimen/convert_60px"
         android:layout_height="@dimen/convert_60px"
-        android:src="@drawable/ic_detail_show"
+        android:src="@drawable/ic_visible"
         android:background="@drawable/shape_1eabdb_round_30px"
         android:padding="@dimen/convert_12px"
         android:layout_marginTop="@dimen/convert_24px"