Merge pull request #216 from xyoye/dev_4.1.0

Dev 4.1.0
xyoye · Feb 5, 2024 · f690fe8 · f690fe8
2 parents 49ce06a + b44bc9b
commit f690fe8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 5 deletions.
diff --git a/...src/main/java/com/xyoye/anime_component/ui/activities/anime_detail/AnimeDetailActivity.kt b/...src/main/java/com/xyoye/anime_component/ui/activities/anime_detail/AnimeDetailActivity.kt
@@ -90,6 +90,11 @@ class AnimeDetailActivity : BaseActivity<AnimeDetailViewModel, ActivityAnimeDeta
     }
 
     private fun initViewPager(tabs: Array<AnimeDetailTab>) {
+        val viewPagerAdapter = dataBinding.viewpager.adapter as? AnimeDetailPageAdapter?
+        if (viewPagerAdapter != null && viewPagerAdapter.tabs.contentEquals(tabs)) {
+            return
+        }
+
         dataBinding.viewpager.adapter = AnimeDetailPageAdapter(this, tabs)
         val mediator = TabLayoutMediator(
             dataBinding.tabLayout,

diff --git a/...rc/main/java/com/xyoye/anime_component/ui/activities/anime_detail/AnimeDetailViewModel.kt b/...rc/main/java/com/xyoye/anime_component/ui/activities/anime_detail/AnimeDetailViewModel.kt
@@ -3,8 +3,10 @@ package com.xyoye.anime_component.ui.activities.anime_detail
 import androidx.databinding.ObservableField
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.xyoye.anime_component.R
 import com.xyoye.common_component.base.BaseViewModel
 import com.xyoye.common_component.config.UserConfig
+import com.xyoye.common_component.extension.toResString
 import com.xyoye.common_component.extension.toastError
 import com.xyoye.common_component.network.repository.AnimeRepository
 import com.xyoye.common_component.weight.ToastCenter
@@ -47,7 +49,7 @@ class AnimeDetailViewModel : BaseViewModel() {
 
     fun followAnime() {
         if (UserConfig.isUserLoggedIn().not()) {
-            ToastCenter.showWarning("请先登录后再进行此操作")
+            ToastCenter.showWarning(R.string.tips_login_required.toResString())
             return
         }
 

diff --git a/...rc/main/java/com/xyoye/anime_component/ui/activities/anime_season/AnimeSeasonViewModel.kt b/...rc/main/java/com/xyoye/anime_component/ui/activities/anime_season/AnimeSeasonViewModel.kt
@@ -2,8 +2,10 @@ package com.xyoye.anime_component.ui.activities.anime_season
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.xyoye.anime_component.R
 import com.xyoye.common_component.base.BaseViewModel
 import com.xyoye.common_component.config.UserConfig
+import com.xyoye.common_component.extension.toResString
 import com.xyoye.common_component.extension.toastError
 import com.xyoye.common_component.network.repository.AnimeRepository
 import com.xyoye.common_component.utils.stringCompare
@@ -114,7 +116,7 @@ class AnimeSeasonViewModel : BaseViewModel() {
         if (!UserConfig.isUserLoggedIn()
             && AnimeSortType.formValue(sortTypeData[position].typeId) == AnimeSortType.FOLLOW
         ) {
-            ToastCenter.showWarning("请登录后再进行此操作")
+            ToastCenter.showWarning(R.string.tips_login_required.toResString())
             return
         }
 

diff --git a/anime_component/src/main/java/com/xyoye/anime_component/ui/adapter/AnimeDetailPageAdapter.kt b/anime_component/src/main/java/com/xyoye/anime_component/ui/adapter/AnimeDetailPageAdapter.kt
@@ -14,7 +14,7 @@ import com.xyoye.data_component.enums.AnimeDetailTab
 
 class AnimeDetailPageAdapter(
     activity: FragmentActivity,
-    private val tabs: Array<AnimeDetailTab>
+    val tabs: Array<AnimeDetailTab>
 ) : FragmentStateAdapter(activity) {
 
     override fun getItemCount() = tabs.size

diff --git a/...src/main/java/com/xyoye/anime_component/ui/fragment/anime_episode/AnimeEpisodeFragment.kt b/...src/main/java/com/xyoye/anime_component/ui/fragment/anime_episode/AnimeEpisodeFragment.kt
@@ -17,11 +17,14 @@ import com.xyoye.common_component.adapter.buildAdapter
 import com.xyoye.common_component.adapter.setupDiffUtil
 import com.xyoye.common_component.base.BaseFragment
 import com.xyoye.common_component.config.RouteTable
+import com.xyoye.common_component.config.UserConfig
 import com.xyoye.common_component.extension.collectAtStarted
 import com.xyoye.common_component.extension.setData
 import com.xyoye.common_component.extension.setTextColorRes
+import com.xyoye.common_component.extension.toResString
 import com.xyoye.common_component.extension.vertical
 import com.xyoye.common_component.weight.BottomActionDialog
+import com.xyoye.common_component.weight.ToastCenter
 import com.xyoye.common_component.weight.dialog.CommonDialog
 import com.xyoye.data_component.bean.SheetActionBean
 import com.xyoye.data_component.data.EpisodeData
@@ -171,6 +174,10 @@ class AnimeEpisodeFragment :
         }
 
         dataBinding.tvSetRead.setOnClickListener {
+            if (UserConfig.isUserLoggedIn().not()) {
+                ToastCenter.showWarning(R.string.tips_login_required.toResString())
+                return@setOnClickListener
+            }
             viewModel.submitMarkedEpisodesViewed()
         }
     }
@@ -209,6 +216,11 @@ class AnimeEpisodeFragment :
      * 考虑标记为已看
      */
     private fun considerMarkAsViewed(data: EpisodeData) {
+        if (UserConfig.isUserLoggedIn().not()) {
+            ToastCenter.showWarning(R.string.tips_login_required.toResString())
+            return
+        }
+
         CommonDialog.Builder(mAttachActivity).apply {
             content = "确认标记 ${data.title} 为已看？"
             addPositive {

diff --git a/...n/java/com/xyoye/anime_component/ui/fragment/search_anime/SearchAnimeFragmentViewModel.kt b/...n/java/com/xyoye/anime_component/ui/fragment/search_anime/SearchAnimeFragmentViewModel.kt
@@ -3,9 +3,11 @@ package com.xyoye.anime_component.ui.fragment.search_anime
 import androidx.databinding.ObservableField
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.xyoye.anime_component.R
 import com.xyoye.common_component.base.BaseViewModel
 import com.xyoye.common_component.config.UserConfig
 import com.xyoye.common_component.database.DatabaseManager
+import com.xyoye.common_component.extension.toResString
 import com.xyoye.common_component.extension.toastError
 import com.xyoye.common_component.network.repository.AnimeRepository
 import com.xyoye.common_component.utils.stringCompare
@@ -149,7 +151,7 @@ class SearchAnimeFragmentViewModel : BaseViewModel() {
         if (!UserConfig.isUserLoggedIn()
             && AnimeSortType.formValue(sortTypeData[position].typeId) == AnimeSortType.FOLLOW
         ) {
-            ToastCenter.showWarning("请登录后再进行此操作")
+            ToastCenter.showWarning(R.string.tips_login_required.toResString())
             return
         }
 

diff --git a/common_component/src/main/res/values/strings.xml b/common_component/src/main/res/values/strings.xml
@@ -25,4 +25,6 @@
     <string name="text_click_install">点击安装</string>
     <string name="text_main_domain">主域名</string>
     <string name="test_backup_domain">备用域名</string>
+
+    <string name="tips_login_required">请登录后再执行此操作</string>
 </resources>
diff --git a/player_component/src/main/java/com/xyoye/player/controller/video/PlayerBottomView.kt b/player_component/src/main/java/com/xyoye/player/controller/video/PlayerBottomView.kt
@@ -15,6 +15,7 @@ import androidx.databinding.DataBindingUtil
 import com.xyoye.common_component.config.UserConfig
 import com.xyoye.common_component.extension.toResColor
 import com.xyoye.common_component.extension.toResDrawable
+import com.xyoye.common_component.extension.toResString
 import com.xyoye.common_component.weight.ToastCenter
 import com.xyoye.data_component.bean.SendDanmuBean
 import com.xyoye.data_component.enums.PlayState
@@ -61,7 +62,7 @@ class PlayerBottomView(
 
         viewBinding.sendDanmuTv.setOnClickListener {
             if (!UserConfig.isUserLoggedIn()) {
-                ToastCenter.showOriginalToast("请登录后再执行此操作")
+                ToastCenter.showWarning(R.string.tips_login_required.toResString())
                 return@setOnClickListener
             }
 
@@ -126,25 +127,30 @@ class PlayerBottomView(
                 viewBinding.playSeekBar.progress = 0
                 viewBinding.playSeekBar.secondaryProgress = 0
             }
+
             PlayState.STATE_PREPARING -> {
                 updateSourceAction()
                 viewBinding.playIv.isSelected = false
             }
+
             PlayState.STATE_START_ABORT,
             PlayState.STATE_PREPARED,
             PlayState.STATE_PAUSED,
             PlayState.STATE_ERROR -> {
                 viewBinding.playIv.isSelected = false
                 mControlWrapper.stopProgress()
             }
+
             PlayState.STATE_PLAYING -> {
                 viewBinding.playIv.isSelected = true
                 mControlWrapper.startProgress()
             }
+
             PlayState.STATE_BUFFERING_PAUSED,
             PlayState.STATE_BUFFERING_PLAYING -> {
                 viewBinding.playIv.isSelected = mControlWrapper.isPlaying()
             }
+
             PlayState.STATE_COMPLETED -> {
                 mControlWrapper.stopProgress()
                 viewBinding.playIv.isSelected = mControlWrapper.isPlaying()