提交人：jtm

提交内容：部分bug fix

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

@@ -5,12 +5,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.lifecycle.MutableLiveData
+import com.develop.auth.R
 import com.develop.auth.databinding.FragmentMemberProfileBinding
 import com.develop.auth.viewmodel.MemberViewModel
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.setVisible
 import com.develop.base.mvvm.BaseBVMFragment
+import com.develop.base.util.MMkvUtils
 import com.develop.base.util.ThreadUtils
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.data_repo.db.entity.UserInfo
@@ -18,6 +20,8 @@ import com.develop.common.data_repo.net.model.response.User
 import com.develop.common.dialog.AgeSelectDialog
 import com.develop.common.dialog.GenderSelectDialog
 import com.develop.common.router.Screens
+import com.develop.common.tag.API_TOKEN
+import com.develop.common.tag.LOGIN_TAG
 import com.develop.common.ui.CommonBVMFragment
 
 class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, MemberViewModel>() {
@@ -42,7 +46,9 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                 binding.tvChooseAge.setTextColor(Color.BLACK)
             }.show()
         }
-
+        binding.ivMember.setOnClickListener {
+            UserIconSelectDialog(viewModel).show(childFragmentManager, "UserIcon")
+        }
         binding.tvChooseSex.setOnClickListener {
             GenderSelectDialog {
                 selectGender = if (it) 2 else 1
@@ -63,32 +69,16 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
             )
         }
         binding.tvSkipForNow.setOnClickListener {
+            if (viewModel.enterFromHome) {
+                val saveToken: String? = null
+                MMkvUtils.save(API_TOKEN, saveToken)
+                MMkvUtils.save(LOGIN_TAG, false)
+            }
             navigateTo(Screens.Main.ENTRANCE_CHOSEN)
         }
-//        binding.tvDestroyAccount.setOnClickListener {
-//
-//        }
-
         if (viewModel.enterFromHome) {
-            (binding.tvTitle.layoutParams as ViewGroup.MarginLayoutParams).let {
-                it.topMargin = dp53
-                binding.tvTitle.requestLayout()
-            }
-            (binding.tvSave.layoutParams as ViewGroup.MarginLayoutParams).let {
-                it.topMargin = dp101
-                binding.tvSave.requestLayout()
-            }
-            (binding.tvSkipForNow.layoutParams as ViewGroup.MarginLayoutParams).let {
-                it.topMargin = dp16
-                binding.tvSkipForNow.requestLayout()
-            }
             binding.tvSkipForNow.text = "Sign out"
-//            binding.tvDestroyAccount.setVisible()
         }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
         viewModel.apply {
             userInfoLiveData.observe(viewLifecycleOwner) {
                 it?.apply {
@@ -104,6 +94,18 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                     showToast(this)
                 }
             }
+            viewModel.chooseAvatar.observe(viewLifecycleOwner) {
+                val icons = listOf(
+                    com.develop.common.R.drawable.ic_icon1,
+                    com.develop.common.R.drawable.ic_icon2,
+                    com.develop.common.R.drawable.ic_icon3,
+                    com.develop.common.R.drawable.ic_icon4,
+                    com.develop.common.R.drawable.ic_icon5,
+                    com.develop.common.R.drawable.ic_icon6
+                )
+                val chooseIcon = icons.getOrNull(it ?: 0) ?: com.develop.common.R.drawable.ic_icon1
+                binding.ivMember.setImageResource(chooseIcon)
+            }
         }
     }
 

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

@@ -18,7 +18,10 @@ class UserIconSelectDialog(var viewModel: MemberViewModel) : FullScreenTranspare
             inflater, container, false
         )
         binding.ivCancel.setOnClickListener {
-            removeSelf()
+            dismissAllowingStateLoss()
+        }
+        binding.root.setOnClickListener {
+            dismissAllowingStateLoss()
         }
         settingIconClick(binding.ivIcon1, 0)
         settingIconClick(binding.ivIcon2, 1)
@@ -32,7 +35,7 @@ class UserIconSelectDialog(var viewModel: MemberViewModel) : FullScreenTranspare
     private fun settingIconClick(view: View, index: Int) {
         view.setOnClickListener {
             viewModel.chooseAvatar.value = index
-            removeSelf()
+            dismissAllowingStateLoss()
         }
     }
 }

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

@@ -92,6 +92,7 @@
         android:gravity="center_vertical"
         android:layout_gravity="center_horizontal"
         android:paddingHorizontal="@dimen/convert_66px"
+        android:layout_marginEnd="@dimen/convert_40px"
         app:layout_constraintTop_toTopOf="@+id/tv_choose_sex"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/tv_choose_sex"/>

BusinessCommon/src/main/java/com/develop/common/data_repo/FoodDataProvider.kt

@@ -27,7 +27,7 @@ import java.util.concurrent.CountDownLatch
  * 全局管理数据
  */
 object FoodDataProvider {
-    private val SYSTEM_MODE = BuildConfig.DEBUG
+    private val SYSTEM_MODE = !BuildConfig.DEBUG
     private val RES_DST_PARENT = if (SYSTEM_MODE) {
         Environment.getExternalStorageDirectory()
     } else {

BusinessCommon/src/main/java/com/develop/common/data_repo/net/model/response/RegisterResult.kt

@@ -8,31 +8,31 @@ data class RegisterResult(
 )
 @Serializable
 data class User(
-    val account: String,
-    val age: Int,
-    val areaName: String,
-    val brandOwnerCode: String,
-    val brandOwnerNumber: String,
-    val city: String,
-    val cityName: String,
-    val code: String,
-    val country: String,
-    val countryName: String,
-    val createTime: Long,
-    val endTime: String,
-    val gender: String?,
-    val id: Int,
-    val makeCount: String,
-    val nickname: String,
-    val number: String,
-    val password: String,
-    val portrait: String?,
-    val province: String,
-    val provinceName: String,
-    val registerTime: String,
-    val startTime: String,
-    val status: String,
-    val updateTime: Long,
-    val valid: Int,
-    val version: Int
+    val account: String? = "",
+    val age: Int = 0,
+    val areaName: String? = "",
+    val brandOwnerCode: String? = "",
+    val brandOwnerNumber: String? = "",
+    val city: String? = "",
+    val cityName: String? = "",
+    val code: String? = "",
+    val country: String? = "",
+    val countryName: String? = "",
+    val createTime: Long? = 0,
+    val endTime: String? = "",
+    val gender: String? = "",
+    val id: Int = 0,
+    val makeCount: String? = "",
+    val nickname: String? = "",
+    val number: String? = "",
+    val password: String? = "",
+    val portrait: String? = "",
+    val province: String? = "",
+    val provinceName: String? = "",
+    val registerTime: Long = 0,
+    val startTime: String? = "",
+    val status: String? = "",
+    val updateTime: Long? = 0,
+    val valid: Int? = 0,
+    val version: Int? = 0
 )

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

@@ -30,10 +30,10 @@ class AmountSelectDialog(
             inflater, container, false
         )
         binding.ivCancel.setOnClickListener {
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         binding.root.setOnClickListener {
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         val wrappers = mutableListOf<Wrapper>()
         data.forEach {

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

@@ -24,7 +24,7 @@ class CookStepCompleteDialog(
         )
         binding.tvOk.setOnClickListener {
             clickOk?.invoke()
-              removeSelf()
+            dismissAllowingStateLoss()
         }
         return binding.root
     }

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

@@ -21,7 +21,7 @@ class DownloadFailedDialog: FullScreenTransparentDialog() {
             inflater, container, false
         )
         binding.tvOk.setOnClickListener {
-              removeSelf()
+            dismissAllowingStateLoss()
         }
         return binding.root
     }

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

@@ -22,20 +22,23 @@ class GenderSelectDialog(
         binding = DialogGenderSelectBinding.inflate(
             inflater, container, false
         )
+        binding.root.setOnClickListener {
+            dismissAllowingStateLoss()
+        }
         binding.ivCancel.setOnClickListener {
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         binding.tvSelectMale.setOnClickListener {
             binding.tvSelectFemale.isSelected = false
             binding.tvSelectMale.isSelected = true
             onSelect(true)
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         binding.tvSelectFemale.setOnClickListener {
             binding.tvSelectFemale.isSelected = true
             binding.tvSelectMale.isSelected = false
             onSelect(false)
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         binding.tvSelectMale.isSelected = true
         return binding.root

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

@@ -25,10 +25,10 @@ class NoteEditDialog: FullScreenTransparentDialog() {
             KeyboardUtils.hideSoftInput(binding.etNote)
         }
         binding.viewComplete.setOnClickListener {
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         binding.viewEdit.setOnClickListener {
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         return binding.root
     }

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

@@ -20,7 +20,7 @@ class PotCoverUnlockedDialog: FullScreenTransparentDialog() {
             inflater, container, false
         )
         binding.ivCancel.setOnClickListener {
-              removeSelf()
+            dismissAllowingStateLoss()
         }
         return binding.root
     }

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

@@ -24,10 +24,10 @@ class RecipeDeleteConfirmDialog(
         )
         binding.tvYes.setOnClickListener {
             onConfirm()
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         binding.tvCancel.setOnClickListener {
-              removeSelf()
+            dismissAllowingStateLoss()
         }
         return binding.root
     }

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

@@ -30,7 +30,7 @@ class ShareQRCodeDialog : FullScreenTransparentDialog() {
                 }
             })
         binding.ivCancel.setOnClickListener {
-            removeSelf()
+            dismissAllowingStateLoss()
         }
         return binding.root
     }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:sharedUserId="android.uid.system"
     package="com.develop.foodcooking">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />