feat: 完善

app/src/main/java/com/adealink/weparty/module/family/data/FamilyData.kt

@@ -45,7 +45,7 @@ enum class FamilyJoinMode(val mode: Int) {
 }
 
 data class FamilyEmptyListItem(
-    @DrawableRes val errorEmptyResId: Int = R.drawable.commonui_record_empty_ic,
+    @DrawableRes val errorEmptyResId: Int = R.drawable.common_list_empty_ic,
     @StringRes val titleResId: Int = R.string.commonui_list_empty
 ) :
     BaseFamilyRankInfo

app/src/main/java/com/adealink/weparty/module/userlist/Tags.kt

@@ -0,0 +1,8 @@
+package com.adealink.weparty.module.userlist
+
+/**
+ * Created by XiaoDongLin.
+ * Date: 2025/3/15
+ */
+
+const val TAG_HOME_USER_LIST = "tag_home_user_list"

app/src/main/java/com/adealink/weparty/module/userlist/binder/UserListEmptyViewBinder.kt

@@ -36,7 +36,7 @@ class UserListEmptyViewBinder() :
 
             UserListDataErrorEmptyType.NoData -> {
                 holder.binding.emptyView.show(
-                    APP_R.drawable.commonui_list_empty_ic,
+                    APP_R.drawable.common_list_empty_ic,
                     APP_R.string.commonui_list_empty
                 )
             }

app/src/main/java/com/adealink/weparty/module/userlist/viewmodel/UserListViewModel.kt

@@ -15,6 +15,7 @@ import com.adealink.weparty.module.operation.banner.data.BannerInfo
 import com.adealink.weparty.module.operation.banner.data.BannerType
 import com.adealink.weparty.module.profile.view.SayHiState
 import com.adealink.weparty.module.userlist.HomeListHttpService
+import com.adealink.weparty.module.userlist.TAG_HOME_USER_LIST
 import com.adealink.weparty.module.userlist.UserFilterData
 import com.adealink.weparty.module.userlist.UserListReq
 import com.adealink.weparty.module.userlist.data.BannerItemData
@@ -73,7 +74,6 @@ class UserListViewModel(
 ) : BaseViewModel(), IUserListViewModel {
 
     companion object {
-        private const val TAG = "UserListViewModel"
         private const val PAGE_COUNT = 20
 
         private const val UPDATE_TIME_INTERVAL = 300_000L //5min
@@ -99,7 +99,7 @@ class UserListViewModel(
             offset = 0
             isEnd.send(false)
         }
-        Log.i(TAG, "loadData, offset=$offset")
+        Log.i(TAG_HOME_USER_LIST, "loadData, offset=$offset")
 
         viewModelScope.launch {
 //            val activity = AppUtil.currentActivity as? FragmentActivity ?: return@launch
@@ -163,7 +163,7 @@ class UserListViewModel(
                         recommendUserInfo.userInfo?.let { info ->
                             val hasChat =
                                 chatMap.containsKey(recommendUserInfo.uid) && chatMap[recommendUserInfo.uid] != 0L
-                            val sayHiState = if(hasChat) SayHiState.Chat else SayHiState.SayHi
+                            val sayHiState = if (hasChat) SayHiState.Chat else SayHiState.SayHi
 
                             newDataList.add(
                                 UserInfoItemData(
@@ -180,7 +180,7 @@ class UserListViewModel(
                     }
                     allListData.addAll(newDataList)
                     dataList.send(value = allListData)
-
+                    Log.i(TAG_HOME_USER_LIST, "loadData, dataList.size=${newDataList.size}")
                 }
 
                 is Rlt.Failed -> {

module/couple/src/main/java/com/adealink/weparty/couple/adapter/LoveHouseErrorEmptyViewBinder.kt

@@ -20,7 +20,7 @@ class LoveHouseErrorEmptyViewBinder :
             rootLp.height = height ?: ViewGroup.LayoutParams.MATCH_PARENT
             binding.root.layoutParams = rootLp
             binding.emptyErrorView.setTitleColor(getCompatColor(com.adealink.weparty.R.color.color_AAAAAA))
-            binding.emptyErrorView.show(APP_R.drawable.commonui_list_empty_ic, APP_R.string.commonui_list_search_empty, isAllPage = false)
+            binding.emptyErrorView.show(APP_R.drawable.common_list_empty_ic, APP_R.string.commonui_list_search_empty, isAllPage = false)
         }
     }
 

module/micgrab/src/main/java/com/adealink/weparty/micgrab/fragment/UploadMicFragment.kt

@@ -161,7 +161,7 @@ class UploadMicFragment : BaseFragment(R.layout.fragment_contributions_upload_mi
             holder: BindingViewHolder<LayoutUploadRecordErrorEmptyBinding>, item: UploadRecordData
         ) {
             holder.binding.emptyErrorView.show(
-                APP_R.drawable.commonui_list_empty_ic,
+                APP_R.drawable.common_list_empty_ic,
                 subTitle = com.adealink.weparty.R.string.commonui_list_empty
             )
         }

module/micgrab/src/main/java/com/adealink/weparty/micgrab/fragment/UploadRecordFragment.kt

@@ -156,7 +156,7 @@ class UploadRecordFragment : BaseFragment(R.layout.fragment_contributions_upload
             holder: BindingViewHolder<LayoutUploadRecordErrorEmptyBinding>, item: UploadRecordData
         ) {
             holder.binding.emptyErrorView.show(
-                APP_R.drawable.commonui_list_empty_ic,
+                APP_R.drawable.common_list_empty_ic,
                 subTitle = R.string.micgrab_no_upload_record
             )
         }

module/moment/src/main/java/com/adealink/weparty/moment/adapter/MomentErrorEmptyViewBinder.kt

@@ -30,23 +30,23 @@ class MomentErrorEmptyViewBinder() : ItemViewBinder<MomentListErrorEmptyData, Bi
         holder.binding.root.layoutParams = rootLp
         when (item.emptyType) {
             MomentDataListErrorEmptyType.NoReply -> {
-                holder.binding.emptyErrorView.show(APP_R.drawable.common_room_list_empty_ic, R.string.moment_topic_no_comment, isAllPage = isAllPage)
+                holder.binding.emptyErrorView.show(APP_R.drawable.common_list_empty_ic, R.string.moment_topic_no_comment, isAllPage = isAllPage)
             }
 
             MomentDataListErrorEmptyType.NetError -> {
                 holder.binding.emptyErrorView.show(APP_R.drawable.common_net_error_ic, APP_R.string.common_net_error, isAllPage = isAllPage)
             }
             MomentDataListErrorEmptyType.NoMoment -> {
-                holder.binding.emptyErrorView.show(APP_R.drawable.common_room_list_empty_ic, R.string.moment_data_empty, isAllPage = isAllPage)
+                holder.binding.emptyErrorView.show(APP_R.drawable.common_list_empty_ic, R.string.moment_data_empty, isAllPage = isAllPage)
             }
             MomentDataListErrorEmptyType.NoMessage -> {
-                holder.binding.emptyErrorView.show(APP_R.drawable.common_room_list_empty_ic, R.string.moment_data_msg_empty, isAllPage = isAllPage)
+                holder.binding.emptyErrorView.show(APP_R.drawable.common_list_empty_ic, R.string.moment_data_msg_empty, isAllPage = isAllPage)
             }
             MomentDataListErrorEmptyType.NoGift->{
-                holder.binding.emptyErrorView.show(APP_R.drawable.common_room_list_empty_ic, R.string.moment_topic_no_gift, isAllPage = isAllPage)
+                holder.binding.emptyErrorView.show(APP_R.drawable.common_list_empty_ic, R.string.moment_topic_no_gift, isAllPage = isAllPage)
             }
             MomentDataListErrorEmptyType.NoLike->{
-                holder.binding.emptyErrorView.show(APP_R.drawable.common_room_list_empty_ic, R.string.moment_topic_no_like, isAllPage = isAllPage)
+                holder.binding.emptyErrorView.show(APP_R.drawable.common_list_empty_ic, R.string.moment_topic_no_like, isAllPage = isAllPage)
             }
 
         }

module/music/src/main/java/com/adealink/weparty/music/local/LocalMusicFragment.kt

@@ -35,6 +35,7 @@ import com.adealink.weparty.music.databinding.FragmentLocalMusicBinding
 import com.adealink.weparty.music.listener.OnMusicItemListener
 import com.adealink.weparty.music.local.adapter.LocalMusicItemViewBinder
 import com.adealink.weparty.music.viewmodel.MusicViewModel
+import com.adealink.weparty.R as APP_R
 
 
 /**
@@ -169,7 +170,7 @@ class LocalMusicFragment : BaseFragment(R.layout.fragment_local_music), ISearchM
     private fun showEmpty() {
         binding.musicList.visibility = View.GONE
         binding.emptyView.visibility = View.VISIBLE
-        binding.emptyView.show(R.drawable.music_empty_ic, R.string.music_empty)
+        binding.emptyView.show(APP_R.drawable.common_list_empty_ic, R.string.music_empty)
     }
 
     private fun showContent() {

module/music/src/main/java/com/adealink/weparty/music/my/MyMusicFragment.kt

@@ -20,6 +20,7 @@ import com.adealink.weparty.music.databinding.FragmentMyMusicBinding
 import com.adealink.weparty.music.listener.OnMusicItemListener
 import com.adealink.weparty.music.viewmodel.MusicDialogViewModel
 import com.adealink.weparty.music.viewmodel.MusicViewModel
+import  com.adealink.weparty.R as APP_R
 
 /**
  * Created by sunxiaodong on 2021/7/15.
@@ -104,7 +105,8 @@ class MyMusicFragment : BaseFragment(R.layout.fragment_my_music), ISearchMusicFr
     private fun showEmpty() {
         binding.emptyView.visibility = View.VISIBLE
         binding.musicList.visibility = View.GONE
-        binding.emptyView.show(R.drawable.music_empty_ic,
+        binding.emptyView.show(
+            APP_R.drawable.common_list_empty_ic,
             title = R.string.music_empty,
             buttonText = R.string.music_add_songs,
             buttonClick = {

module/party/src/main/java/com/adealink/weparty/party/adapter/PartyErrorEmptyViewBinder.kt

@@ -28,7 +28,7 @@ class PartyErrorEmptyViewBinder :
             }
             PartyListErrorEmptyType.SquareEmpty -> {
                 holder.binding.emptyErrorView.show(
-                    APP_R.drawable.common_room_list_empty_ic,
+                    APP_R.drawable.common_list_empty_ic,
                     APP_R.string.commonui_list_empty
                 )
                 rootLp.height = ViewGroup.LayoutParams.MATCH_PARENT

module/pk/src/main/java/com/adealink/weparty/pk/history/RoomPKHistoryFragment.kt

@@ -107,7 +107,7 @@ class RoomPKHistoryFragment : BaseFragment(R.layout.fragment_room_pk_history), I
     private fun showEmptyView(show: Boolean) {
         if (show) {
             binding.rvHistory.visibility = View.GONE
-            binding.emptyView.show(APP_R.drawable.commonui_record_empty_ic,
+            binding.emptyView.show(APP_R.drawable.common_list_empty_ic,
                 subTitle = R.string.pk_no_history)
         } else {
             binding.rvHistory.visibility = View.VISIBLE

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

@@ -12,11 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <!-- 边框 -->
-    <com.adealink.weparty.effect.WeAnimView
-        android:id="@+id/cover_board_anim"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
@@ -58,6 +53,7 @@
                     android:id="@+id/tabLayout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:indicator_color="@color/color_222222"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:normal_tab_color="@color/color_999999"
@@ -89,11 +85,4 @@
         tools:visibility="visible" />
 
 
-    <!-- 进场动画 -->
-    <com.adealink.weparty.effect.WeAnimView
-        android:id="@+id/enter_anim"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

module/room/src/main/java/com/adealink/weparty/room/roomlist/RoomErrorEmptyViewBinder.kt

@@ -20,7 +20,7 @@ class RoomErrorEmptyViewBinder: ItemViewBinder<RoomListErrorEmptyData, BindingVi
         holder.binding.root.layoutParams = rootLp
         when(item.emptyType) {
             RoomListErrorEmptyType.Empty -> {
-                holder.binding.emptyErrorView.show(APP_R.drawable.common_list_empty_ic, APP_R.string.commonui_room_empty, isAllPage = isAllPage)
+                holder.binding.emptyErrorView.show(APP_R.drawable.common_room_list_empty_ic, APP_R.string.commonui_room_empty, isAllPage = isAllPage)
             }
             RoomListErrorEmptyType.NetError -> {
                 holder.binding.emptyErrorView.show(APP_R.drawable.common_net_error_ic, APP_R.string.common_net_error, isAllPage = isAllPage)

module/setting/src/main/java/com/adealink/weparty/setting/blacklist/BlackListEmptyErrorViewBinder.kt

@@ -24,7 +24,7 @@ class BlackListEmptyErrorViewBinder :
                     R.string.setting_blacklist_empty)
             }
             BlackListEmptyErrorType.NetError -> {
-                holder.binding.emptyErrorView.show(APP_R.drawable.common_black_list_empty_ic,
+                holder.binding.emptyErrorView.show(APP_R.drawable.common_net_error_ic,
                     null,
                     R.string.setting_blacklist_empty)
             }

module/visitors/src/main/java/com/adealink/weparty/visitors/adapter/VisitorsListErrorEmptyViewBinder.kt

@@ -19,7 +19,7 @@ class VisitorsListErrorEmptyViewBinder :
     ) {
         when (item.emptyType) {
             VisitorsListErrorEmptyType.Empty -> {
-                holder.binding.emptyErrorView.show(APP_R.drawable.commonui_list_empty_ic,
+                holder.binding.emptyErrorView.show(APP_R.drawable.common_list_empty_ic,
                     R.string.visitors_list_empty_data)
             }
             VisitorsListErrorEmptyType.NetError -> {