合并代码

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

@@ -47,7 +47,7 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
             AgeSelectDialog(hostActivity) { index, change ->
                 selectAge = if (index == 0) {
                     0
-                } else if (index == 1){
+                } else if (index == 1) {
                     20
                 } else {
                     index + 19
@@ -60,7 +60,7 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
             UserIconSelectDialog(viewModel).showDialog(childFragmentManager, "UserIcon")
         }
         binding.tvChooseSex.setOnClickListener {
-            GenderSelectDialog {
+            GenderSelectDialog(selectGender) {
                 selectGender = it
                 when (selectGender) {
                     2 -> {
@@ -114,17 +114,17 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                     when (selectGender) {
                         2 -> {
                             binding.tvChooseSex.text = "Male"
-                            binding.tvChooseAge.setTextColor(Color.BLACK)
+                            binding.tvChooseSex.setTextColor(Color.BLACK)
                         }
 
                         1 -> {
                             binding.tvChooseSex.text = "Female"
-                            binding.tvChooseAge.setTextColor(Color.BLACK)
+                            binding.tvChooseSex.setTextColor(Color.BLACK)
                         }
 
                         0 -> {
                             binding.tvChooseSex.text = "None"
-                            binding.tvChooseAge.setTextColor(Color.BLACK)
+                            binding.tvChooseSex.setTextColor(Color.BLACK)
                         }
                     }
                     if (selectAge > 0) {

BusinessAuth/src/main/res/layout/fragment_member_profile.xml

@@ -83,7 +83,7 @@
             android:gravity="center_vertical"
             android:paddingHorizontal="@dimen/convert_66px"
             android:text="@string/none"
-            android:textColor="#B1B2B2"
+            android:textColor="@color/black"
             android:textSize="@dimen/convert_30px"
             app:layout_constraintEnd_toStartOf="@+id/tv_choose_age"
             app:layout_constraintStart_toStartOf="parent"
@@ -99,7 +99,7 @@
             android:gravity="center_vertical"
             android:paddingHorizontal="@dimen/convert_66px"
             android:text="0"
-            android:textColor="#B1B2B2"
+            android:textColor="@color/black"
             android:textSize="@dimen/convert_30px"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/tv_choose_sex"

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

@@ -9,6 +9,7 @@ import com.develop.common.databinding.DialogGenderSelectBinding
 
 
 class GenderSelectDialog(
+    private var selectedPos: Int = 0,
     private val onSelect: (male: Int) -> Unit
 ) : FullScreenTransparentDialog() {
 
@@ -28,30 +29,39 @@ class GenderSelectDialog(
         binding.ivCancel.setOnClickListener {
             removeSelf()
         }
+        if (selectedPos==0){
+            binding.tvSelectFemale.isSelected = false
+            binding.tvSelectMale.isSelected = false
+            binding.tvSelectNo.isSelected = true
+        } else if (selectedPos == 1){
+            binding.tvSelectFemale.isSelected = true
+            binding.tvSelectMale.isSelected = false
+            binding.tvSelectNo.isSelected = false
+        } else {
+            binding.tvSelectFemale.isSelected = false
+            binding.tvSelectMale.isSelected = true
+            binding.tvSelectNo.isSelected = false
+        }
 
         binding.tvSelectNo.setOnClickListener {
             binding.tvSelectFemale.isSelected = false
             binding.tvSelectMale.isSelected = false
-            binding.tvSelectNo.isSelected  =true
+            binding.tvSelectNo.isSelected = true
             onSelect(0)
-            removeSelf()
         }
 
         binding.tvSelectMale.setOnClickListener {
             binding.tvSelectFemale.isSelected = false
             binding.tvSelectMale.isSelected = true
-            binding.tvSelectNo.isSelected  =false
+            binding.tvSelectNo.isSelected = false
             onSelect(2)
-            removeSelf()
         }
         binding.tvSelectFemale.setOnClickListener {
             binding.tvSelectFemale.isSelected = true
             binding.tvSelectMale.isSelected = false
-            binding.tvSelectNo.isSelected  =false
+            binding.tvSelectNo.isSelected = false
             onSelect(1)
-            removeSelf()
         }
-        binding.tvSelectNo.isSelected = true
         return binding.root
     }
 }

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

@@ -85,46 +85,46 @@ class CookEvaluateActivity : CommonBindingActivity<ActivityCookEvaluateBinding>(
         }
 
 
-        safeGlobalScope.launch(Dispatchers.IO) {
-            val userTag = FoodDataProvider.getUserDatabase().userInfoDao().queryUserTag(
-                CURRENT_USER_ID, recipeId ?: ""
-            )
-            val recipes = FoodDataProvider.getDatabase().recipeDao().queryRecipe(recipeId)
-            val count1 = userTag?.starCount ?: 0
-            val count2 = recipes?.score?.toInt() ?: 0
-            starCount = if (count1 != 0) {
-                count1
-            } else if (count2 != 0) {
-                count2
-            } else {
-                0
-            }
-            withMain {
-                selectStar(starCount)
-                when (starCount) {
-                    1 -> {
-                        binding.tvGood.text = getString(R.string.bad)
-                    }
-
-                    2 -> {
-                        binding.tvGood.text = getString(R.string.imperfect)
-                    }
-
-                    3 -> {
-                        binding.tvGood.text = getString(R.string.ordinary)
-                    }
-
-                    4 -> {
-                        binding.tvGood.text = getString(R.string.good)
-                    }
-
-                    5 -> {
-                        binding.tvGood.text = getString(R.string.perfect)
-                    }
-                }
-                binding.etContent.setText(userTag?.daily)
-            }
-        }
+//        safeGlobalScope.launch(Dispatchers.IO) {
+//            val userTag = FoodDataProvider.getUserDatabase().userInfoDao().queryUserTag(
+//                CURRENT_USER_ID, recipeId ?: ""
+//            )
+//            val recipes = FoodDataProvider.getDatabase().recipeDao().queryRecipe(recipeId)
+//            val count1 = userTag?.starCount ?: 0
+//            val count2 = recipes?.score?.toInt() ?: 0
+//            starCount = if (count1 != 0) {
+//                count1
+//            } else if (count2 != 0) {
+//                count2
+//            } else {
+//                0
+//            }
+//            withMain {
+//                selectStar(starCount)
+//                when (starCount) {
+//                    1 -> {
+//                        binding.tvGood.text = getString(R.string.bad)
+//                    }
+//
+//                    2 -> {
+//                        binding.tvGood.text = getString(R.string.imperfect)
+//                    }
+//
+//                    3 -> {
+//                        binding.tvGood.text = getString(R.string.ordinary)
+//                    }
+//
+//                    4 -> {
+//                        binding.tvGood.text = getString(R.string.good)
+//                    }
+//
+//                    5 -> {
+//                        binding.tvGood.text = getString(R.string.perfect)
+//                    }
+//                }
+//                binding.etContent.setText(userTag?.daily)
+//            }
+//        }
 
 
         binding.tvOk.setOnClickListener {

BusinessStep/src/main/java/com/develop/step/viewmodel/FoodListViewModel.kt

@@ -89,7 +89,7 @@ class FoodListViewModel : BaseViewModel() {
                 FoodContentModel(
                     it.photoPath ?: "",
                     it.name ?: "",
-                    3,
+                    it.score?.toInt() ?: 5,
                     getTime(it.makeHours ?: 0, it.makeMinutes ?: 0),
                     it.difficultyLevel ?: "",
                     isLike = false,

app/build.gradle

@@ -153,9 +153,7 @@ android {
         brand030A {
             dimension "platform"
             applicationId "com.develop.foodcooking"
-            buildConfigField("String", "UpdatePlatform", "\"036I\"")
             resValue("string", "app_theme", "@style/SplashTheme")
-            resValue("string", "app_theme", "@style/Splash036IDTheme")
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
         }