From c6f5ef64d502ded249d78e6b469c4e4fdabd8f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Thu, 18 Mar 2021 10:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.8.0-?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BC=98=E5=8C=96=EF=BC=88=E7=AC=AC1?=
 =?UTF-8?q?=E6=9C=9F=EF=BC=89(UI=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98)=20ht?=
 =?UTF-8?q?tps://git.ghzs.com/pm/halo-app-issues/-/issues/1107?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../video/detail/VideoDetailContainerFragment.kt          | 8 +++-----
 .../video/detail/VideoDetailContainerViewModel.kt         | 8 ++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
index 3106769f38..0c630c508a 100644
--- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
@@ -123,11 +123,9 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener {
         mBinding.refresh.setProgressViewOffset(false, 0, 50F.dip2px() + DisplayUtils.getStatusBarHeight(requireContext().resources))
 
         observeData()
-
-        if (UserManager.getInstance().isLoggedIn || mLocation != VideoDetailContainerViewModel.Location.VIDEO_ATTENTION.value) {
+        
+        if (mLocation != VideoDetailContainerViewModel.Location.VIDEO_ATTENTION.value) {
             mViewModel.getVideoDetailList(mInitialVideoId, mLocation, isLoadNext = true)
-        } else {
-            mBinding.attentionNoLoginContainer.visibility = View.VISIBLE
         }
 
         mBinding.loginBtn.setOnClickListener {
@@ -224,7 +222,7 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener {
                 mBinding.refresh.isEnabled = it != null
                 if (it != null) {
                     mBinding.attentionNoLoginContainer.visibility = View.GONE
-                    mViewModel.getVideoDetailList(mInitialVideoId, mLocation, isLoadNext = true)
+                    mViewModel.getVideoDetailList(mInitialVideoId, mLocation, isLoadNext = false)
                 } else {
                     if (::mAdapter.isInitialized) {
                         mBinding.recyclerview.visibility = View.GONE
diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt
index 4e4e5e39e7..84ba5ba562 100644
--- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt
@@ -22,6 +22,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager
 import com.google.gson.JsonObject
 import com.lightgame.utils.Utils
 import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
 import java.lang.ref.WeakReference
@@ -214,11 +215,14 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel
         if (!mIsFirstLoad && total <= videoList.value?.size ?: 0) return
         val requestMap = hashMapOf<String, Any>()
         getAttentionCacheVideoIds().flatMap {
-            requestMap["cache_video_ids"] = it
+            if (page != 1) {
+                requestMap["cache_video_ids"] = it
+            }
             val body = requestMap.createRequestBodyAny()
             RetrofitManager.getInstance(getApplication())
                     .api.getAttentionVideoStream(UserManager.getInstance().userId, body, page)
-        }.subscribeOn(Schedulers.io())
+        }
+                .compose(singleToMain())
                 .subscribe(object : BiResponse<retrofit2.Response<java.util.ArrayList<VideoEntity>>>() {
                     override fun onSuccess(data: retrofit2.Response<java.util.ArrayList<VideoEntity>>) {
                         val headers = data.headers()