From e0b187546ca3129c169349762a171e4fdda252ad Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 30 Mar 2023 09:29:42 +0800
Subject: [PATCH] [leanback] fix vod now showing bug

---
 .../com/fongmi/android/tv/ui/activity/VodActivity.java |  2 +-
 .../com/fongmi/android/tv/ui/fragment/VodFragment.java |  5 +++--
 app/src/leanback/res/layout/fragment_vod.xml           | 10 +++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
index 26b150168..653ae230f 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
@@ -122,7 +122,7 @@ public class VodActivity extends BaseActivity {
         if (child == null) return;
         mOldView = child.itemView;
         mOldView.setActivated(true);
-        App.post(mRunnable, 200);
+        App.post(mRunnable, 50);
     }
 
     private final Runnable mRunnable = new Runnable() {
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
index 61ae67ba8..5dc86fa74 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
@@ -3,6 +3,7 @@ package com.fongmi.android.tv.ui.fragment;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
@@ -85,7 +86,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
         mTypeIds = new ArrayList<>();
         mExtends = new HashMap<>();
         mFilters = Filter.arrayFrom(getFilter());
-        mBinding.progressLayout.showProgress();
+        mBinding.progress.getRoot().setVisibility(View.VISIBLE);
         setRecyclerView();
         setViewModel();
     }
@@ -110,7 +111,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
         mViewModel = new ViewModelProvider(this).get(SiteViewModel.class);
         mViewModel.result.observe(getViewLifecycleOwner(), result -> {
             int size = result.getList().size();
-            mBinding.progressLayout.showContent(isFolder(), size);
+            mBinding.progress.getRoot().setVisibility(View.GONE);
             mScroller.endLoading(size == 0);
             addVideo(result.getList());
             checkPage(size);
diff --git a/app/src/leanback/res/layout/fragment_vod.xml b/app/src/leanback/res/layout/fragment_vod.xml
index 724c3b4c8..8681257d6 100644
--- a/app/src/leanback/res/layout/fragment_vod.xml
+++ b/app/src/leanback/res/layout/fragment_vod.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.fongmi.android.tv.ui.custom.ProgressLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/progressLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -18,4 +17,9 @@
         app:focusOutEnd="true"
         app:focusOutFront="true" />
 
-</com.fongmi.android.tv.ui.custom.ProgressLayout>
\ No newline at end of file
+    <include
+        android:id="@+id/progress"
+        layout="@layout/view_progress"
+        android:visibility="gone" />
+
+</FrameLayout>
\ No newline at end of file