提交人：jtm

提交内容：性别添加“无”，未翻译

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

@@ -52,11 +52,19 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
         }
         binding.tvChooseSex.setOnClickListener {
             GenderSelectDialog {
-                selectGender = if (it) 2 else 1
-                if (selectGender == 2) {
-                    binding.tvChooseSex.text = "Male"
-                } else {
-                    binding.tvChooseSex.text = "Female"
+                selectGender = it
+                when (selectGender) {
+                    2 -> {
+                        binding.tvChooseSex.text = "Male"
+                    }
+
+                    1 -> {
+                        binding.tvChooseSex.text = "Female"
+                    }
+
+                    else -> {
+                        binding.tvChooseSex.text = "None"
+                    }
                 }
                 binding.tvChooseSex.setTextColor(Color.BLACK)
             }.showDialog(parentFragmentManager, "gender")
@@ -94,12 +102,19 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                     selectGender = userGender?.toInt() ?: 2
                     binding.etNickname.setText(userName ?: "")
                     viewModel.chooseAvatar.value = userAvatar?.toInt()
-                    if (selectGender == 2) {
-                        binding.tvChooseSex.text = "Male"
-                        binding.tvChooseAge.setTextColor(Color.BLACK)
-                    } else if (selectGender == 1) {
-                        binding.tvChooseSex.text = "Female"
-                        binding.tvChooseAge.setTextColor(Color.BLACK)
+                    when (selectGender) {
+                        2 -> {
+                            binding.tvChooseSex.text = "Male"
+                            binding.tvChooseAge.setTextColor(Color.BLACK)
+                        }
+                        1 -> {
+                            binding.tvChooseSex.text = "Female"
+                            binding.tvChooseAge.setTextColor(Color.BLACK)
+                        }
+                        0 -> {
+                            binding.tvChooseSex.text = "None"
+                            binding.tvChooseAge.setTextColor(Color.BLACK)
+                        }
                     }
                     if (selectAge > 0) {
                         binding.tvChooseAge.text = selectAge.toString()

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

@@ -9,7 +9,7 @@ import com.develop.common.databinding.DialogGenderSelectBinding
 
 
 class GenderSelectDialog(
-    private val onSelect: (male: Boolean) -> Unit
+    private val onSelect: (male: Int) -> Unit
 ) : FullScreenTransparentDialog() {
 
     private lateinit var binding: DialogGenderSelectBinding
@@ -28,16 +28,27 @@ class GenderSelectDialog(
         binding.ivCancel.setOnClickListener {
             removeSelf()
         }
+
+        binding.tvSelectNo.setOnClickListener {
+            binding.tvSelectFemale.isSelected = false
+            binding.tvSelectMale.isSelected = false
+            binding.tvSelectNo.isSelected  =true
+            onSelect(0)
+            removeSelf()
+        }
+
         binding.tvSelectMale.setOnClickListener {
             binding.tvSelectFemale.isSelected = false
             binding.tvSelectMale.isSelected = true
-            onSelect(true)
+            binding.tvSelectNo.isSelected  =false
+            onSelect(2)
             removeSelf()
         }
         binding.tvSelectFemale.setOnClickListener {
             binding.tvSelectFemale.isSelected = true
             binding.tvSelectMale.isSelected = false
-            onSelect(false)
+            binding.tvSelectNo.isSelected  =false
+            onSelect(1)
             removeSelf()
         }
         binding.tvSelectMale.isSelected = true

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

@@ -10,7 +10,7 @@
     <LinearLayout
         android:id="@+id/ll_dialog"
         android:layout_width="@dimen/convert_430px"
-        android:layout_height="@dimen/convert_361px"
+        android:layout_height="@dimen/convert_460px"
         android:orientation="vertical"
         android:gravity="center_horizontal"
         android:background="@drawable/shape_10pxffffff_stoke"
@@ -21,6 +21,19 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
 
+        <TextView
+            android:id="@+id/tv_select_no"
+            android:layout_width="@dimen/convert_326px"
+            android:layout_height="@dimen/convert_88px"
+            android:text="@string/none"
+            android:textSize="@dimen/convert_30px"
+            android:gravity="center"
+            android:background="@drawable/bg_amount_item"
+            android:textColor="@color/color_amount_text"
+            android:layout_marginTop="@dimen/convert_69px"/>
+
+
+
         <TextView
             android:id="@+id/tv_select_male"
             android:layout_width="@dimen/convert_326px"
@@ -30,7 +43,7 @@
             android:gravity="center"
             android:background="@drawable/bg_amount_item"
             android:textColor="@color/color_amount_text"
-            android:layout_marginTop="@dimen/convert_69px"/>
+            android:layout_marginTop="@dimen/convert_24px"/>
 
         <TextView
             android:id="@+id/tv_select_female"

BusinessCommon/src/main/res/values-en/strings.xml

@@ -233,4 +233,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="no_login">Please enter the fields above to login</string>
     <string name="enjoy_your_meal_desc">enjoy your meal</string>
     <string name="wrong_captcha">Wrong captcha</string>
+    <string name="none">None</string>
 </resources>

BusinessCommon/src/main/res/values-fr/strings.xml

@@ -286,4 +286,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="enjoy_your_meal_desc">Votre recette est prête ！</string>
     <string name="login_expire_tips">Veuillez saisir les champs ci-dessus pour vous connecter</string>
     <string name="wrong_captcha">Wrong captcha</string>
+    <string name="none">None</string>
 </resources>

BusinessCommon/src/main/res/values-ja/strings.xml

@@ -158,4 +158,5 @@
     <string name="Min20">20Min</string>
     <string name="enjoy_your_meal">ENJOY YOUR MEAL</string>
     <string name="wrong_captcha">Wrong captcha</string>
+    <string name="none">None</string>
 </resources>

BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -296,4 +296,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="no_net_error">Please connect to Wifi</string>
     <string name="no_login">Veuillez saisir les champs ci-dessus pour vous connecter</string>
     <string name="wrong_captcha">Wrong captcha</string>
+    <string name="none">None</string>
 </resources>

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

@@ -296,4 +296,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="no_net_error">Please connect to Wifi</string>
     <string name="no_login">Veuillez saisir les champs ci-dessus pour vous connecter</string>
     <string name="wrong_captcha">Wrong captcha</string>
+    <string name="none">None</string>
 </resources>