Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

光环助手V4.8.0-视频优化（第1期）(UI测试问题) https://git.ghzs.com/pm/halo-app-issues/-/issues/1107

Browse Source
This commit is contained in:
张玉久
2021-03-18 10:13:24 +08:00
parent 95b21b5bb5
commit c6f5ef64d5
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
View File

@ -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

8
app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt
View File

@ -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()