feat: ui验收问题

app/src/main/AndroidManifest.xml

@@ -187,18 +187,10 @@
         <activity
             android:name=".module.task.BaseDialogActivity"
             android:theme="@style/TransparentDialogTheme" />
-        <activity
-            android:name=".module.task.WomemChatDiamondDialog"
-            android:theme="@style/TransparentDialogTheme" />
+
         <activity
             android:name=".module.task.CommonTaskRewardDialog"
             android:theme="@style/TransparentDialogTheme" />
-        <activity
-            android:name=".module.task.CompleteProfileDialog"
-            android:theme="@style/TransparentDialogTheme"/>
-        <activity
-            android:name=".module.task.WelcomeRewardDialog"
-            android:theme="@style/TransparentDialogTheme" />
         <activity
             android:name=".module.task.invite.InviteRewardDialog"
             android:theme="@style/TransparentDialogTheme" />

module/account/src/main/res/layout/activity_account_setting.xml

@@ -102,8 +102,8 @@
                     tools:text="+10coins" />
 
                 <com.adealink.weparty.module.operation.view.SmallTaskRewardView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
                     android:layout_marginStart="4dp" />
 
                 <androidx.appcompat.widget.AppCompatImageView

module/gift/src/main/res/layout/layout_gift_panel_bottom_operate.xml

@@ -136,8 +136,8 @@
 
     <com.adealink.weparty.module.operation.view.SmallTaskRewardView
         android:id="@+id/small_task_reward_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
         android:layout_marginTop="-8dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@+id/send_layout"

module/profile/src/main/java/com/adealink/weparty/profile/userprofile/NewUserProfileActivity.kt

@@ -91,6 +91,7 @@ class NewUserProfileActivity : BaseActivity() {
         )
         switchTab(tabIndex)
 
+        binding.profileVp.isUserInputEnabled = false //禁止手动滑动
         binding.profileVp.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
                 super.onPageSelected(position)

module/profile/src/main/java/com/adealink/weparty/profile/userprofile/ProfileTab.kt

@@ -38,6 +38,6 @@ var RELATION_TAB = ProfileTab(
 
 val PROFILE_TABS = mutableListOf(
     PERSONAL_TAB,
-    HONOR_TAB,
+//    HONOR_TAB,
     MOMENT_TAB,
 )

module/profile/src/main/java/com/adealink/weparty/profile/userprofile/fragment/PersonalFragment.kt

@@ -32,7 +32,6 @@ import com.adealink.weparty.profile.userprofile.view.car.ProfileCarViewBinder
 import com.adealink.weparty.profile.userprofile.view.frame.ProfileAvatarFrameViewBinder
 import com.adealink.weparty.profile.userprofile.view.gift.ProfileGiftViewBinder
 import com.adealink.weparty.profile.userprofile.view.medal.ProfileMedalViewBinder
-import com.adealink.weparty.profile.userprofile.view.receive.ProfileReceiveGoodViewBinder
 import com.adealink.weparty.profile.viewmodel.ProfileViewModel
 import com.adealink.weparty.profile.viewmodel.ProfileViewModelFactory
 
@@ -69,20 +68,26 @@ class PersonalFragment : BaseFragment(R.layout.fragment_personal), IUserGoodItem
             listAdapter.register(ProfilePrivacyAlbumViewBinder(userUid))
             listAdapter.register(ProfileAboutMeViewBinder())
 
-            //旧逻辑
-            listAdapter.register(ProfileCarViewBinder(this@PersonalFragment, childFragmentManager))
+            listAdapter.register(
+                ProfileCarViewBinder(
+                    userUid,
+                    this@PersonalFragment,
+                    childFragmentManager
+                )
+            )
             listAdapter.register(
                 ProfileAvatarFrameViewBinder(
+                    userUid,
                     this@PersonalFragment,
                     childFragmentManager
                 )
             )
-            listAdapter.register(ProfileReceiveGoodViewBinder())
-            listAdapter.register(ProfileMedalViewBinder(childFragmentManager))
-            listAdapter.register(ProfileGiftViewBinder(childFragmentManager))
+            listAdapter.register(ProfileMedalViewBinder(userUid, childFragmentManager))
+            listAdapter.register(ProfileGiftViewBinder(userUid, childFragmentManager))
 
             adapter = listAdapter
             layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+            itemAnimator = null
         }
     }
 

module/profile/src/main/java/com/adealink/weparty/profile/userprofile/view/ProfilePrivacyAlbumViewBinder.kt

@@ -6,7 +6,6 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.adealink.frame.aab.util.getCompatString
 import com.adealink.frame.base.fastLazy
-import com.adealink.frame.locale.language.languageManager
 import com.adealink.frame.router.Router
 import com.adealink.frame.statistics.CommonEventValue
 import com.adealink.weparty.commonui.ext.gone
@@ -18,7 +17,6 @@ import com.adealink.weparty.commonui.recycleview.itemdecoration.HorizontalItemDe
 import com.adealink.weparty.module.profile.Profile
 import com.adealink.weparty.module.profile.ProfileModule
 import com.adealink.weparty.module.task.UserTaskManager
-import com.adealink.weparty.profile.R
 import com.adealink.weparty.profile.databinding.ItemPrivateAlbumAddButtonBinding
 import com.adealink.weparty.profile.databinding.ItemPrivateAlbumPictureItemBinding
 import com.adealink.weparty.profile.databinding.ItemProfilePrivacyAblumListBinding
@@ -112,6 +110,7 @@ class ProfilePrivacyAlbumViewBinder(
             } else {
                 binding.taskGuideLayout.gone()
                 binding.tvCount.text = item.imageList.size.toString()
+                binding.tvCount.show(isShow = isSelf)
             }
             val list = mutableListOf<Any>()
             if (isSelf) {

module/profile/src/main/java/com/adealink/weparty/profile/userprofile/view/car/ProfileCarViewBinder.kt

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.adealink.frame.base.fastLazy
 import com.adealink.frame.router.Router
+import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.recycleview.adapter.BindingViewHolder
 import com.adealink.weparty.commonui.recycleview.adapter.MultiTypeListAdapter
 import com.adealink.weparty.commonui.recycleview.adapter.multitype.ItemViewBinder
@@ -27,11 +28,14 @@ import com.adealink.weparty.profile.userprofile.listener.IUserGoodItemListener
 import com.adealink.weparty.profile.userprofile.view.ProfileSectionEmptyViewBinder
 
 class ProfileCarViewBinder(
+    private val userUid: Long,
     private val userGoodItemListener: IUserGoodItemListener,
     private val fragmentManager: FragmentManager?
 ) :
     ItemViewBinder<ProfileCarData, ProfileCarViewBinder.ViewHolder>(),
     IUserGoodItemListener {
+    val isSelf by fastLazy { userUid == ProfileModule.getMyUid() }
+
 
     inner class ViewHolder(binding: LayoutProfileCarBinding) :
         BindingViewHolder<LayoutProfileCarBinding>(binding) {
@@ -64,6 +68,7 @@ class ProfileCarViewBinder(
             }
             carListAdapter.submitList(listData, true)
             binding.tvCount.text= item.carList?.size.toString()
+            binding.tvCount.show(isShow = isSelf)
 
             if (item.uid == ProfileModule.getMyUid()) {
                 binding.root.setOnClickListener {

module/profile/src/main/java/com/adealink/weparty/profile/userprofile/view/frame/ProfileAvatarFrameViewBinder.kt

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.adealink.frame.base.fastLazy
 import com.adealink.frame.router.Router
+import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.recycleview.adapter.BindingViewHolder
 import com.adealink.weparty.commonui.recycleview.adapter.MultiTypeListAdapter
 import com.adealink.weparty.commonui.recycleview.adapter.multitype.ItemViewBinder
@@ -26,10 +27,16 @@ import com.adealink.weparty.profile.userprofile.data.ProfileSectionEmptyData
 import com.adealink.weparty.profile.userprofile.listener.IUserGoodItemListener
 import com.adealink.weparty.profile.userprofile.view.ProfileSectionEmptyViewBinder
 
-class ProfileAvatarFrameViewBinder(private val userGoodItemListener: IUserGoodItemListener, private val fragmentManager: FragmentManager?) :
+class ProfileAvatarFrameViewBinder(
+    private val userUid: Long,
+    private val userGoodItemListener: IUserGoodItemListener,
+    private val fragmentManager: FragmentManager?
+) :
     ItemViewBinder<ProfileAvatarFrameData,
             ProfileAvatarFrameViewBinder.ViewHolder>(), IUserGoodItemListener {
 
+    val isSelf by fastLazy { userUid == ProfileModule.getMyUid() }
+
     inner class ViewHolder(binding: LayoutProfileAvatarFrameBinding) :
         BindingViewHolder<LayoutProfileAvatarFrameBinding>(binding) {
         private val avatarFrameListAdapter by fastLazy {
@@ -41,7 +48,12 @@ class ProfileAvatarFrameViewBinder(private val userGoodItemListener: IUserGoodIt
         }
 
         private fun initViews() {
-            avatarFrameListAdapter.register(ProfileAvatarFrameItemViewBinder(userGoodItemListener, fragmentManager))
+            avatarFrameListAdapter.register(
+                ProfileAvatarFrameItemViewBinder(
+                    userGoodItemListener,
+                    fragmentManager
+                )
+            )
             avatarFrameListAdapter.register(ProfileSectionEmptyViewBinder())
 
             binding.rvFrame.apply {
@@ -65,9 +77,10 @@ class ProfileAvatarFrameViewBinder(private val userGoodItemListener: IUserGoodIt
                 }
             }
             avatarFrameListAdapter.submitList(listData, true)
-            binding.tvCount.text= item.frameList?.size.toString()
+            binding.tvCount.text = item.frameList?.size.toString()
+            binding.tvCount.show(isShow = isSelf)
 
-            if (item.uid==ProfileModule.getMyUid()){
+            if (item.uid == ProfileModule.getMyUid()) {
                 binding.root.setOnClickListener {
                     Router.build(it.context, Backpack.Backpack.PATH)
                         .putExtra(Backpack.Common.EXTRA_TYPE, BACKPACK_TAB_INDEX_FRAMES)

module/profile/src/main/java/com/adealink/weparty/profile/userprofile/view/gift/ProfileGiftViewBinder.kt

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.adealink.frame.aab.util.getCompatString
 import com.adealink.frame.base.fastLazy
 import com.adealink.frame.router.Router
+import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.recycleview.adapter.BindingViewHolder
 import com.adealink.weparty.commonui.recycleview.adapter.MultiTypeListAdapter
 import com.adealink.weparty.commonui.recycleview.adapter.multitype.ItemViewBinder
@@ -30,9 +31,12 @@ import com.adealink.weparty.profile.userprofile.view.ProfileSectionEmptyViewBind
  * Date: 2025/3/19
  */
 class ProfileGiftViewBinder(
+    private val userUid: Long,
     private val fragmentManager: FragmentManager?
 ) : ItemViewBinder<ProfileGiftData, ProfileGiftViewBinder.ViewHolder>() {
 
+    val isSelf by fastLazy { userUid == ProfileModule.getMyUid() }
+
     inner class ViewHolder(binding: LayoutProfileCarBinding) :
         BindingViewHolder<LayoutProfileCarBinding>(binding) {
         private val giftListAdapter by fastLazy { MultiTypeListAdapter(BaseListDiffUtil()) }
@@ -65,6 +69,7 @@ class ProfileGiftViewBinder(
             }
             giftListAdapter.submitList(listData, true)
             binding.tvCount.text = item.giftList?.size.toString()
+            binding.tvCount.show(isShow = isSelf)
 
             if (item.uid == ProfileModule.getMyUid()) {
                 binding.root.setOnClickListener {

module/profile/src/main/java/com/adealink/weparty/profile/userprofile/view/medal/ProfileMedalViewBinder.kt

@@ -6,11 +6,13 @@ import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.adealink.frame.base.fastLazy
+import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.recycleview.adapter.BindingViewHolder
 import com.adealink.weparty.commonui.recycleview.adapter.MultiTypeListAdapter
 import com.adealink.weparty.commonui.recycleview.adapter.multitype.ItemViewBinder
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListDiffUtil
 import com.adealink.weparty.commonui.recycleview.itemdecoration.HorizontalItemDecoration
+import com.adealink.weparty.module.profile.ProfileModule
 import com.adealink.weparty.profile.databinding.LayoutProfileMedalBinding
 import com.adealink.weparty.profile.userprofile.data.ProfileEmptyType
 import com.adealink.weparty.profile.userprofile.data.ProfileItemData
@@ -19,8 +21,11 @@ import com.adealink.weparty.profile.userprofile.data.ProfileMedalItemData
 import com.adealink.weparty.profile.userprofile.data.ProfileSectionEmptyData
 import com.adealink.weparty.profile.userprofile.view.ProfileSectionEmptyViewBinder
 
-class ProfileMedalViewBinder(private val fragmentManager: FragmentManager?) :
+class ProfileMedalViewBinder(
+    private val userUid: Long,
+    private val fragmentManager: FragmentManager?) :
     ItemViewBinder<ProfileMedalData, ProfileMedalViewBinder.ViewHolder>() {
+    val isSelf by fastLazy { userUid == ProfileModule.getMyUid() }
 
     inner class ViewHolder(binding: LayoutProfileMedalBinding) :
         BindingViewHolder<LayoutProfileMedalBinding>(binding) {
@@ -51,6 +56,7 @@ class ProfileMedalViewBinder(private val fragmentManager: FragmentManager?) :
             }
             medalListAdapter.submitList(list, true)
             binding.tvCount.text= item.medals.size.toString()
+            binding.tvCount.show(isShow = isSelf)
         }
     }
 

module/profile/src/main/res/layout/activity_user_profile_new.xml

@@ -72,6 +72,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
+        android:paddingBottom="60dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 
@@ -143,7 +144,7 @@
         android:id="@+id/bottom_op_layout"
         layout="@layout/layout_user_profile_bottom"
         android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_height="60dp"
         android:layout_gravity="bottom"
         android:visibility="gone"
         tools:visibility="visible" />

module/profile/src/main/res/layout/fragment_avatar_certification.xml

@@ -88,8 +88,8 @@
 
     <com.adealink.weparty.module.operation.view.SmallTaskRewardView
         android:id="@+id/small_task_reward_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
         android:layout_marginTop="-9dp"
         android:layout_marginEnd="19dp"
         android:visibility="gone"

module/profile/src/main/res/layout/fragment_avatar_notice.xml

@@ -249,8 +249,8 @@
 
     <com.adealink.weparty.module.operation.view.SmallTaskRewardView
         android:id="@+id/small_task_reward_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
         android:layout_marginTop="-9dp"
         android:layout_marginEnd="19dp"
         android:visibility="gone"

module/profile/src/main/res/layout/fragment_certification_task.xml

@@ -134,8 +134,8 @@
 
             <com.adealink.weparty.module.operation.view.SmallTaskRewardView
                 android:id="@+id/iv_reward_avatar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
                 android:layout_marginStart="4dp"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_avatar_reward"
@@ -239,8 +239,8 @@
 
             <com.adealink.weparty.module.operation.view.SmallTaskRewardView
                 android:id="@+id/iv_reward_gender"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
                 android:layout_marginStart="4dp"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_gender_reward"
@@ -344,8 +344,8 @@
 
             <com.adealink.weparty.module.operation.view.SmallTaskRewardView
                 android:id="@+id/iv_reward_phone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
                 android:layout_marginStart="4dp"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_phone_reward"

module/profile/src/main/res/layout/fragment_gender_certification.xml

@@ -77,8 +77,8 @@
         android:id="@+id/reward_view"
         android:visibility="gone"
         tools:visibility="visible"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
         android:layout_marginTop="-9dp"
         android:layout_marginEnd="19dp"
         app:layout_constraintEnd_toEndOf="@+id/btn_confirm"

module/profile/src/main/res/layout/item_profile_privacy_ablum_list.xml

@@ -64,7 +64,7 @@
         android:id="@+id/tv_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableEnd="@drawable/profile_edit_ic_arrow"
+        android:drawableEnd="@drawable/profile_me_arrow_icon"
         android:gravity="center_vertical"
         android:textColor="@color/color_AAAAAA"
         android:textSize="12sp"

module/profile/src/main/res/layout/layout_edit_profile_top_layout.xml

@@ -85,8 +85,8 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/basic_data_coin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
             android:layout_marginEnd="4dp"
             android:paddingVertical="2dp"
             android:text="≥80%,+10coins"

module/profile/src/main/res/layout/layout_profile_me_list_item.xml

@@ -131,8 +131,8 @@
             android:textSize="11sp" />
 
         <com.adealink.weparty.module.operation.view.SmallTaskRewardView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
             android:layout_marginStart="4dp" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>

module/profile/src/main/res/layout/layout_user_profile_bottom.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="90dp"
+    android:layout_height="wrap_content"
     android:layout_gravity="bottom"
     app:layout_constraintBottom_toBottomOf="parent">
 
@@ -30,7 +30,7 @@
         android:id="@+id/btn_small_chat"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="20dp"
         android:src="@drawable/profile_icon_small_chat"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -44,7 +44,7 @@
         android:id="@+id/btn_call_phone"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="20dp"
         android:src="@drawable/profile_icon_call_phone_enable"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -56,7 +56,7 @@
         android:id="@+id/chatUpBtn"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="20dp"
         android:background="@drawable/common_app_main_color_radius_35_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/chatBtn"
@@ -95,7 +95,7 @@
         android:id="@+id/chatBtn"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="20dp"
         android:background="@drawable/common_ff9352fc_radius_35_bg"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"