From 8c761982a96a248cbb5b01e5260e64cfa2d26879 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 16 Aug 2023 18:14:07 +0800
Subject: [PATCH] js support s2t t2s

---
 .../fongmi/android/tv/ui/activity/VodActivity.java |  2 +-
 .../java/com/fongmi/android/tv/bean/Class.java     |  2 +-
 .../main/java/com/fongmi/android/tv/bean/Epg.java  |  2 +-
 .../java/com/fongmi/android/tv/bean/Filter.java    |  2 +-
 .../java/com/fongmi/android/tv/bean/Result.java    |  2 +-
 .../main/java/com/fongmi/android/tv/bean/Sub.java  |  2 +-
 .../main/java/com/fongmi/android/tv/bean/Vod.java  |  2 +-
 .../com/fongmi/android/tv/model/SiteViewModel.java |  2 +-
 .../main/java/com/github/catvod}/utils/Trans.java  | 14 +++++++++++---
 9 files changed, 19 insertions(+), 11 deletions(-)
 rename {app/src/main/java/com/fongmi/android/tv => catvod/src/main/java/com/github/catvod}/utils/Trans.java (97%)

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 94be6c971..1890ea86f 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
@@ -28,7 +28,7 @@ import com.fongmi.android.tv.ui.base.BaseActivity;
 import com.fongmi.android.tv.ui.fragment.VodFragment;
 import com.fongmi.android.tv.ui.presenter.TypePresenter;
 import com.fongmi.android.tv.utils.ResUtil;
-import com.fongmi.android.tv.utils.Trans;
+import com.github.catvod.utils.Trans;
 import com.fongmi.android.tv.utils.Utils;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Class.java b/app/src/main/java/com/fongmi/android/tv/bean/Class.java
index ba8498876..43a8418e9 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Class.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Class.java
@@ -2,7 +2,7 @@ package com.fongmi.android.tv.bean;
 
 import android.text.TextUtils;
 
-import com.fongmi.android.tv.utils.Trans;
+import com.github.catvod.utils.Trans;
 import com.google.gson.annotations.SerializedName;
 
 import org.simpleframework.xml.Attribute;
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Epg.java b/app/src/main/java/com/fongmi/android/tv/bean/Epg.java
index 9cfbc9164..5152d2926 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Epg.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Epg.java
@@ -4,7 +4,7 @@ import android.text.TextUtils;
 
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.utils.ResUtil;
-import com.fongmi.android.tv.utils.Trans;
+import com.github.catvod.utils.Trans;
 import com.github.catvod.utils.Util;
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Filter.java b/app/src/main/java/com/fongmi/android/tv/bean/Filter.java
index 8eaf93e7e..890ed34f0 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Filter.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Filter.java
@@ -2,7 +2,7 @@ package com.fongmi.android.tv.bean;
 
 import android.text.TextUtils;
 
-import com.fongmi.android.tv.utils.Trans;
+import com.github.catvod.utils.Trans;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java
index ae2a2426d..6bbc2bbfe 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java
@@ -5,7 +5,7 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 
 import com.fongmi.android.tv.gson.FilterAdapter;
-import com.fongmi.android.tv.utils.Trans;
+import com.github.catvod.utils.Trans;
 import com.github.catvod.utils.Json;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Sub.java b/app/src/main/java/com/fongmi/android/tv/bean/Sub.java
index 04f9408ef..7d2441dd5 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Sub.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Sub.java
@@ -5,7 +5,7 @@ import android.text.TextUtils;
 
 import androidx.media3.common.MediaItem;
 
-import com.fongmi.android.tv.utils.Trans;
+import com.github.catvod.utils.Trans;
 import com.google.gson.annotations.SerializedName;
 
 public class Sub {
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
index 786fd1aee..9e1d74f59 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.fongmi.android.tv.ui.base.ViewType;
-import com.fongmi.android.tv.utils.Trans;
+import com.github.catvod.utils.Trans;
 import com.fongmi.android.tv.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
index d011f938e..dc7f5ef17 100644
--- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
+++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
@@ -19,7 +19,7 @@ import com.fongmi.android.tv.player.Source;
 import com.fongmi.android.tv.player.extractor.Magnet;
 import com.fongmi.android.tv.utils.ResUtil;
 import com.fongmi.android.tv.utils.Sniffer;
-import com.fongmi.android.tv.utils.Trans;
+import com.github.catvod.utils.Trans;
 import com.github.catvod.crawler.Spider;
 import com.github.catvod.crawler.SpiderDebug;
 import com.github.catvod.net.OkHttp;
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Trans.java b/catvod/src/main/java/com/github/catvod/utils/Trans.java
similarity index 97%
rename from app/src/main/java/com/fongmi/android/tv/utils/Trans.java
rename to catvod/src/main/java/com/github/catvod/utils/Trans.java
index bf6d4f51f..59475d74a 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/Trans.java
+++ b/catvod/src/main/java/com/github/catvod/utils/Trans.java
@@ -1,4 +1,4 @@
-package com.fongmi.android.tv.utils;
+package com.github.catvod.utils;
 
 import android.text.TextUtils;
 
@@ -51,10 +51,18 @@ public class Trans {
     }
 
     public static String s2t(String text) {
-        return pass() ? text : get().get(text, get().s2t);
+        return s2t(pass(), text);
     }
 
     public static String t2s(String text) {
-        return pass() ? text : get().get(text, get().t2s);
+        return t2s(pass(), text);
+    }
+
+    public static String s2t(boolean pass, String text) {
+        return pass ? text : get().get(text, get().s2t);
+    }
+
+    public static String t2s(boolean pass, String text) {
+        return pass ? text : get().get(text, get().t2s);
     }
 }