From 04653d7ac28d3a81681e54b6f80e8a1cf7939210 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 28 Jul 2023 10:45:15 +0800 Subject: [PATCH] Add logger and clean code --- app/src/main/java/com/fongmi/android/tv/bean/Vod.java | 4 ++++ catvod/build.gradle | 1 + catvod/src/main/java/com/github/catvod/Provider.java | 4 ++++ .../java/com/github/catvod/crawler/SpiderDebug.java | 10 +++++++--- .../xunlei/downloadlib/parameter/TorrentFileInfo.java | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) 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 c0240f468..097cd5895 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 @@ -193,6 +193,10 @@ public class Vod { return getVodTag().equals("folder"); } + public boolean isFile() { + return getVodTag().equals("file"); + } + public String getVodName(String name) { if (getVodName().isEmpty()) setVodName(name); return getVodName(); diff --git a/catvod/build.gradle b/catvod/build.gradle index 1f8712cf2..6720fe309 100644 --- a/catvod/build.gradle +++ b/catvod/build.gradle @@ -13,6 +13,7 @@ android { dependencies { implementation 'androidx.annotation:annotation:' + annotationVersion + implementation 'com.orhanobut:logger:2.2.0' api 'com.google.code.gson:gson:' + gsonVersion api 'com.squareup.okhttp3:okhttp:' + okhttpVersion api 'com.squareup.okhttp3:okhttp-dnsoverhttps:' + okhttpVersion diff --git a/catvod/src/main/java/com/github/catvod/Provider.java b/catvod/src/main/java/com/github/catvod/Provider.java index 395608281..e4fa03c37 100644 --- a/catvod/src/main/java/com/github/catvod/Provider.java +++ b/catvod/src/main/java/com/github/catvod/Provider.java @@ -8,10 +8,14 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.orhanobut.logger.AndroidLogAdapter; +import com.orhanobut.logger.Logger; + public class Provider extends ContentProvider { @Override public boolean onCreate() { + Logger.addLogAdapter(new AndroidLogAdapter()); Init.setContext(getContext()); return true; } diff --git a/catvod/src/main/java/com/github/catvod/crawler/SpiderDebug.java b/catvod/src/main/java/com/github/catvod/crawler/SpiderDebug.java index 12b2d6d7b..9327c49d9 100644 --- a/catvod/src/main/java/com/github/catvod/crawler/SpiderDebug.java +++ b/catvod/src/main/java/com/github/catvod/crawler/SpiderDebug.java @@ -1,16 +1,20 @@ package com.github.catvod.crawler; -import android.util.Log; +import android.text.TextUtils; + +import com.orhanobut.logger.Logger; public class SpiderDebug { private static final String TAG = SpiderDebug.class.getSimpleName(); public static void log(Throwable th) { - Log.d(TAG, th.getMessage()); + if (th == null || TextUtils.isEmpty(th.getMessage())) return; + Logger.t(TAG).d(th.getMessage()); } public static void log(String msg) { - Log.d(TAG, msg); + if (TextUtils.isEmpty(msg)) return; + Logger.t(TAG).d(msg); } } diff --git a/thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java b/thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java index 06676a9a6..f6b755b6e 100644 --- a/thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java +++ b/thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java @@ -42,6 +42,6 @@ public class TorrentFileInfo { } public String getExt() { - return getFileName().contains(".") ? getFileName().substring(getFileName().lastIndexOf(".") + 1) : ""; + return getFileName().contains(".") ? getFileName().substring(getFileName().lastIndexOf(".") + 1).toLowerCase() : ""; } }