From 622d79b166d244f50d2464d95a2146fbefd2761a Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 18 Feb 2023 11:58:25 +0800
Subject: [PATCH] Fix autosize bug

---
 .../java/com/fongmi/android/tv/Product.java     | 17 +++++++++++++++++
 .../android/tv/ui/activity/DetailActivity.java  |  4 ++--
 .../android/tv/ui/activity/BaseActivity.java    |  7 +++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 app/src/leanback/java/com/fongmi/android/tv/Product.java

diff --git a/app/src/leanback/java/com/fongmi/android/tv/Product.java b/app/src/leanback/java/com/fongmi/android/tv/Product.java
new file mode 100644
index 000000000..3d75d9815
--- /dev/null
+++ b/app/src/leanback/java/com/fongmi/android/tv/Product.java
@@ -0,0 +1,17 @@
+package com.fongmi.android.tv;
+
+import android.content.res.Resources;
+
+import me.jessyan.autosize.AutoSizeCompat;
+
+public class Product {
+
+    public static Resources hackResources(Resources resources) {
+        try {
+            AutoSizeCompat.autoConvertDensityOfGlobal(resources);
+            return resources;
+        } catch (Exception ignored) {
+            return resources;
+        }
+    }
+}
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index 154009c4f..f2d806c4b 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -843,8 +843,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     }
 
     private void checkSearch() {
-        if (isAutoMode() && mSearchAdapter.size() > 0) nextSite();
-        else initSearch(getName(), true);
+        if (mSearchAdapter.size() == 0) initSearch(getName(), true);
+        else if (isAutoMode()) nextSite();
     }
 
     private void initSearch(String keyword, boolean auto) {
diff --git a/app/src/main/java/com/fongmi/android/tv/ui/activity/BaseActivity.java b/app/src/main/java/com/fongmi/android/tv/ui/activity/BaseActivity.java
index ad73bd9be..f33f1ac0a 100644
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/BaseActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/BaseActivity.java
@@ -2,6 +2,7 @@ package com.fongmi.android.tv.ui.activity;
 
 import android.app.Activity;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
@@ -9,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.viewbinding.ViewBinding;
 
+import com.fongmi.android.tv.Product;
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.api.WallConfig;
 import com.fongmi.android.tv.event.RefreshEvent;
@@ -65,6 +67,11 @@ public abstract class BaseActivity extends AppCompatActivity {
         setWall();
     }
 
+    @Override
+    public Resources getResources() {
+        return Product.hackResources(super.getResources());
+    }
+
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);