From aea8fffcaeea631f9800925bf26e9f2a5e05429d Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 27 Oct 2022 09:35:18 +0800 Subject: [PATCH] Adjust sniffer --- .../com/fongmi/android/tv/ui/activity/HomeActivity.java | 3 +-- .../com/fongmi/android/tv/ui/custom/CustomTitleView.java | 1 - app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java | 6 +++++- app/src/main/java/com/fongmi/android/tv/utils/Utils.java | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 1a0ff4b84..017152189 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -16,7 +16,6 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; -import com.fongmi.android.tv.BuildConfig; import com.fongmi.android.tv.R; import com.fongmi.android.tv.api.ApiConfig; import com.fongmi.android.tv.bean.Func; @@ -189,7 +188,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen VodActivity.start(this, mViewModel.getResult().getValue()); break; case R.string.home_live: - if (BuildConfig.DEBUG) LiveActivity.start(this); + LiveActivity.start(this); break; case R.string.home_search: SearchActivity.start(this); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java index fb2883e08..61372f276 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java @@ -34,7 +34,6 @@ public class CustomTitleView extends AppCompatTextView { } public void setListener(Listener listener) { - this.setOnClickListener(v -> listener.showDialog()); this.listener = listener; } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java b/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java index ae7ec80b4..95168c416 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java @@ -7,7 +7,11 @@ public class Sniffer { public static final Pattern RULE = Pattern.compile( "http((?!http).){12,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a)\\?.*|" + "http((?!http).){12,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a)|" + - "http((?!http).)*?xg.php\\?id=|" + "http((?!http).)*?video/tos*" ); + + public static final Pattern CUSTOM = Pattern.compile( + "http((?!http).)*?xg.php\\?id=|" + + "http((?!http).)*?/m3/(.*)\\.css" + ); } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java index 97b3a5b75..7c8963bf7 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java @@ -63,6 +63,7 @@ public class Utils { } public static boolean isVideoFormat(String url, Map headers) { + if (Sniffer.CUSTOM.matcher(url).find()) return true; if (headers.containsKey("Accept") && headers.get("Accept").contains("image")) return false; if (url.contains(".js") || url.contains(".css")) return false; return Sniffer.RULE.matcher(url).find();