diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java index 54261bfca..3e568c916 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java @@ -10,12 +10,12 @@ import com.fongmi.android.tv.bean.Parse; import com.fongmi.android.tv.bean.Rule; import com.fongmi.android.tv.bean.Site; import com.fongmi.android.tv.impl.Callback; -import com.github.catvod.utils.Json; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.Utils; import com.github.catvod.bean.Doh; import com.github.catvod.crawler.Spider; import com.github.catvod.crawler.SpiderNull; +import com.github.catvod.utils.Json; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java index b6bf158d5..5a942f13b 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java +++ b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java @@ -3,9 +3,9 @@ package com.fongmi.android.tv.api; import android.util.Base64; import com.fongmi.android.tv.utils.FileUtil; -import com.github.catvod.utils.Json; import com.fongmi.android.tv.utils.Utils; import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Json; import com.google.common.io.BaseEncoding; import java.io.File; diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java index fcbae5e03..bf6501781 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java @@ -13,9 +13,9 @@ import com.fongmi.android.tv.bean.Keep; import com.fongmi.android.tv.bean.Live; import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.impl.Callback; -import com.github.catvod.utils.Json; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.Prefers; +import com.github.catvod.utils.Json; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java index 31d817dca..500e4fe8e 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java @@ -6,8 +6,8 @@ import android.widget.ImageView; import com.fongmi.android.tv.R; import com.fongmi.android.tv.utils.ImgUtil; -import com.github.catvod.utils.Json; import com.fongmi.android.tv.utils.ResUtil; +import com.github.catvod.utils.Json; import com.google.common.net.HttpHeaders; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Parse.java b/app/src/main/java/com/fongmi/android/tv/bean/Parse.java index 695aeb885..8cffee1c9 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Parse.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Parse.java @@ -5,9 +5,9 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import com.fongmi.android.tv.R; -import com.github.catvod.utils.Json; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Utils; +import com.github.catvod.utils.Json; 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 1aa5bab86..47b6ac538 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,8 +5,8 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import com.fongmi.android.tv.gson.FilterAdapter; -import com.github.catvod.utils.Json; import com.fongmi.android.tv.utils.Trans; +import com.github.catvod.utils.Json; 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/player/ParseJob.java b/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java index 9437ff6fa..2800ae76c 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java +++ b/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java @@ -7,9 +7,9 @@ import com.fongmi.android.tv.bean.Parse; import com.fongmi.android.tv.bean.Result; import com.fongmi.android.tv.impl.ParseCallback; import com.fongmi.android.tv.ui.custom.CustomWebView; -import com.github.catvod.utils.Json; import com.fongmi.android.tv.utils.Utils; import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Json; import com.google.gson.JsonObject; import com.google.gson.JsonParser;