pull/447/head
okjack 2 years ago
parent 5c590d47a2
commit 7ae35e45f7
  1. 4
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java
  2. 4
      app/src/leanback/java/com/fongmi/android/tv/ui/adapter/CacheDirAdapter.java
  3. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/dialog/CacheDirDialog.java
  4. 8
      app/src/main/java/com/fongmi/android/tv/Setting.java
  5. 2
      app/src/main/res/values-zh-rCN/strings.xml
  6. 2
      app/src/main/res/values-zh-rTW/strings.xml
  7. 2
      app/src/main/res/values/strings.xml
  8. 8
      catvod/src/main/java/com/github/catvod/utils/Path.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);
}

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

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

@ -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);
}
}

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

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

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

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

Loading…
Cancel
Save