From 7ae35e45f79bf08625d2babc528f67963c14d599 Mon Sep 17 00:00:00 2001
From: okjack <okjackcaptain@gmail.com>
Date: Tue, 21 May 2024 22:31:46 +0800
Subject: [PATCH] update

---
 .../android/tv/ui/activity/SettingCustomActivity.java     | 4 ++--
 .../com/fongmi/android/tv/ui/adapter/CacheDirAdapter.java | 4 ++--
 .../com/fongmi/android/tv/ui/dialog/CacheDirDialog.java   | 2 +-
 app/src/main/java/com/fongmi/android/tv/Setting.java      | 8 ++++----
 app/src/main/res/values-zh-rCN/strings.xml                | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml                | 2 +-
 app/src/main/res/values/strings.xml                       | 2 +-
 catvod/src/main/java/com/github/catvod/utils/Path.java    | 8 ++++++--
 8 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java
index 652a220aa..5f906e0c5 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java
@@ -67,7 +67,7 @@ public class SettingCustomActivity extends BaseActivity implements CacheDirCallb
         mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch()));
         mBinding.homeUIText.setText((homeUI = ResUtil.getStringArray(R.array.select_home_ui))[Setting.getHomeUI()]);
         mBinding.homeHistoryText.setText(getSwitch(Setting.isHomeHistory()));
-        mBinding.cacheDirText.setText(Setting.getCacheDir());
+        mBinding.cacheDirText.setText(Setting.getThunderCacheDir());
         mBinding.removeAdText.setText(getSwitch(Setting.isRemoveAd()));
         mBinding.languageText.setText((ResUtil.getStringArray(R.array.select_language))[Setting.getLanguage()]);
         mBinding.parseWebviewText.setText((parseWebview = ResUtil.getStringArray(R.array.select_parse_webview))[Setting.getParseWebView()]);
@@ -238,7 +238,7 @@ public class SettingCustomActivity extends BaseActivity implements CacheDirCallb
 
     @Override
     public void setCacheDir(String dir) {
-        Setting.putCacheDir(dir);
+        Setting.putThunderCacheDir(dir);
         mBinding.cacheDirText.setText(dir);
     }
 
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/CacheDirAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/CacheDirAdapter.java
index 50dceb57f..c07f550c8 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/CacheDirAdapter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/CacheDirAdapter.java
@@ -13,7 +13,7 @@ import java.util.List;
 
 public class CacheDirAdapter extends RecyclerView.Adapter<CacheDirAdapter.ViewHolder> {
 
-    private final OnClickListener mListener;
+    private final CacheDirAdapter.OnClickListener mListener;
     private List<String> mItems;
 
     public CacheDirAdapter(OnClickListener listener, List<String> items) {
@@ -41,7 +41,7 @@ public class CacheDirAdapter extends RecyclerView.Adapter<CacheDirAdapter.ViewHo
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         String item = mItems.get(position);
-        boolean selected = Setting.getCacheDir().equals(item);
+        boolean selected = Setting.getThunderCacheDir().equals(item);
         holder.binding.text.setText(item);
         holder.binding.text.setSelected(selected);
         holder.binding.text.setActivated(selected);
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/CacheDirDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/CacheDirDialog.java
index 6d3bbe70a..8c945c066 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/CacheDirDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/CacheDirDialog.java
@@ -34,7 +34,7 @@ public class CacheDirDialog implements CacheDirAdapter.OnClickListener {
         mItems = new ArrayList<>();
         mItems.add(activity.getCacheDir().getAbsolutePath());
         for(File dir : activity.getExternalCacheDirs()) mItems.add(dir.getAbsolutePath());
-        String cacheDir = Setting.getCacheDir();
+        String cacheDir = Setting.getThunderCacheDir();
         position = 0;
         for(int i=0; i<mItems.size(); i++) {
             if (mItems.get(i).equals(cacheDir)) position = i;
diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java
index 12685f9b4..f9e4b564c 100644
--- a/app/src/main/java/com/fongmi/android/tv/Setting.java
+++ b/app/src/main/java/com/fongmi/android/tv/Setting.java
@@ -502,12 +502,12 @@ public class Setting {
         Prefers.put("remove_ad", remove);
     }
 
-    public static String getCacheDir() {
-        return Prefers.getString("cache_dir", "");
+    public static String getThunderCacheDir() {
+        return Prefers.getString("thunder_cache_dir", "");
     }
 
-    public static void putCacheDir(String dir) {
-        Prefers.put("cache_dir", dir);
+    public static void putThunderCacheDir(String dir) {
+        Prefers.put("thunder_cache_dir", dir);
     }
 
 }
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index df4b6f0b1..faaa04711 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -76,7 +76,7 @@
     <string name="setting_danmu">弹幕设置</string>
     <string name="setting_custom">个性设置</string>
     <string name="setting_config_cache">接口缓存</string>
-    <string name="setting_cache_dir">缓存目录</string>
+    <string name="setting_cache_dir">迅雷缓存</string>
     <string name="setting_reset">重置App</string>
     <string name="setting_quality">图片品质</string>
     <string name="setting_size">图片尺寸</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1a8bdc67a..af89bb2f5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -76,7 +76,7 @@
     <string name="setting_danmu">彈幕設定</string>
     <string name="setting_custom">個性設定</string>
     <string name="setting_config_cache">接口暫存</string>
-    <string name="setting_cache_dir">暫存目錄</string>
+    <string name="setting_cache_dir">迅雷暫存</string>
     <string name="setting_reset">重置App</string>
     <string name="setting_quality">圖片品質</string>
     <string name="setting_size">圖片尺寸</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2e165c7f..c4ab9337e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,7 +76,7 @@
     <string name="setting_danmu">Danmu setting</string>
     <string name="setting_custom">Custom setting</string>
     <string name="setting_config_cache">Config cache</string>
-    <string name="setting_cache_dir">Cache dir</string>
+    <string name="setting_cache_dir">Thunder cache</string>
     <string name="setting_reset">Reset app</string>
     <string name="setting_quality">Image quality</string>
     <string name="setting_size">Image size</string>
diff --git a/catvod/src/main/java/com/github/catvod/utils/Path.java b/catvod/src/main/java/com/github/catvod/utils/Path.java
index cc9973ac5..414da613a 100644
--- a/catvod/src/main/java/com/github/catvod/utils/Path.java
+++ b/catvod/src/main/java/com/github/catvod/utils/Path.java
@@ -37,8 +37,12 @@ public class Path {
     }
 
     public static File cache() {
+        return Init.context().getCacheDir();
+    }
+
+    public static File thunderCache() {
         File internal = Init.context().getCacheDir();
-        String dir = Prefers.getString("cache_dir", internal.getAbsolutePath());
+        String dir = Prefers.getString("thunder_cache_dir", internal.getAbsolutePath());
         if (dir.equals(internal.getAbsolutePath())) return internal;
         File cache = new File(dir);
         if (!cache.exists()) return internal;
@@ -90,7 +94,7 @@ public class Path {
     }
 
     public static File thunder() {
-        return mkdir(new File(cache() + File.separator + "thunder"));
+        return mkdir(new File(thunderCache() + File.separator + "thunder"));
     }
 
     public static File restore() {