js support s2t t2s

pull/137/head
FongMi 3 years ago
parent e8bef567be
commit 8c761982a9
  1. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/bean/Class.java
  3. 2
      app/src/main/java/com/fongmi/android/tv/bean/Epg.java
  4. 2
      app/src/main/java/com/fongmi/android/tv/bean/Filter.java
  5. 2
      app/src/main/java/com/fongmi/android/tv/bean/Result.java
  6. 2
      app/src/main/java/com/fongmi/android/tv/bean/Sub.java
  7. 2
      app/src/main/java/com/fongmi/android/tv/bean/Vod.java
  8. 2
      app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
  9. 14
      catvod/src/main/java/com/github/catvod/utils/Trans.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;

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

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

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

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

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

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

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

@ -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);
}
}
Loading…
Cancel
Save