fix:修复首页-交友-数据未正常请求问题

app/src/main/java/com/nnbc123/app/home/HomeViewModel.kt

@@ -25,8 +25,6 @@ class HomeViewModel : BaseViewModel() {
     private val _anchorInfoLiveData = MutableLiveData<AnchorInfo?>()
     val anchorInfoLiveData: LiveData<AnchorInfo?> = _anchorInfoLiveData
 
-    val gameTabLiveData = MutableLiveData<MutableList<HomeGameTab>>()
-
     fun getHomeResource() {
         safeLaunch(
             block = {

app/src/main/java/com/nnbc123/app/home/fragment/home/friends/FriendsFragment.kt

@@ -3,7 +3,6 @@ package com.nnbc123.app.home.fragment.home.friends
 import android.view.Gravity
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
 import com.chuhai.utils.ktx.singleClick
 import com.nnbc123.app.R
 import com.nnbc123.app.avroom.activity.AVRoomActivity
@@ -19,7 +18,6 @@ import com.nnbc123.app.ui.utils.load
 import com.nnbc123.app.ui.webview.CommonWebViewActivity
 import com.nnbc123.app.ui.widget.NewFriendsFilterWindow
 import com.nnbc123.core.UriProvider
-import com.nnbc123.core.auth.AuthModel
 import com.nnbc123.core.bean.response.observeResult
 import com.nnbc123.core.pay.PayModel
 import com.nnbc123.core.statistic.StatisticManager
@@ -62,7 +60,7 @@ class FriendsFragment : BaseBindingFragment<HomeFriendsFragmentBinding>() {
         mBinding.refreshLayout.isEnableOverScrollBounce = false
         mBinding.refreshLayout.setOnRefreshListener { view ->
             mBinding.refreshLayout.finishRefresh()
-            loadData()
+            loadData(true)
             childFragmentManager.fragments.forEach {
                 if (it is OnRefreshListener) {
                     it.onRefresh(view)
@@ -73,7 +71,6 @@ class FriendsFragment : BaseBindingFragment<HomeFriendsFragmentBinding>() {
             .beginTransaction()
             .replace(R.id.fragment_container_view, FriendsListFragment())
             .commitAllowingStateLoss()
-        loadData()
     }
 
     private fun initFilterTab() {
@@ -204,6 +201,11 @@ class FriendsFragment : BaseBindingFragment<HomeFriendsFragmentBinding>() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        loadData(false)
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         if (genderPopup?.isShowing == true) {
@@ -212,14 +214,19 @@ class FriendsFragment : BaseBindingFragment<HomeFriendsFragmentBinding>() {
         }
     }
 
-    private fun loadData() {
-        // 重置条件
-        updateGender(null)
-        tabAdapter.selectItem(null)
-        if (homeViewModel.gameTabLiveData.value.isNullOrEmpty()) {
+    private fun loadData(resetFilter: Boolean) {
+        if (resetFilter) {
+            // 重置条件
+            updateGender(null)
+            tabAdapter.selectItem(null)
+        }
+        if (viewModel.gameTabLiveData.value.isNullOrEmpty()) {
             viewModel.getHomeGameTab()
         }
-        homeViewModel.getHomeResource()
+        if (homeViewModel.resourceLiveData.value.isNullOrEmpty()) {
+            // 和派对页共用数据了，派对页会刷新，这里不需要再刷新了
+            homeViewModel.getHomeResource()
+        }
         refreshListData()
     }
 

app/src/main/java/com/nnbc123/app/home/fragment/home/friends/FriendsListFragment.kt

@@ -6,7 +6,6 @@ import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.chuhai.utils.UiUtils

library/src/module_utils/java/com/chuhai/utils/log/LogUtil.kt

@@ -18,7 +18,7 @@ object LogUtil {
     // 是否启动文件打印
     var filePrinterEnabled: Boolean = true
 
-    var tagPrefix: String = "*>#"
+    var tagPrefix: String = "->#"
 
     /**
      * 设置文件打印