From 754b14f42cefb7a78f87b898720f3ad9d933a112 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 22 Dec 2023 11:56:34 +0800 Subject: [PATCH 1/6] Update WallConfig.java --- app/src/main/java/com/fongmi/android/tv/api/WallConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java b/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java index 07474cd4b..a14ed400c 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java @@ -13,6 +13,7 @@ import com.fongmi.android.tv.utils.FileUtil; import com.fongmi.android.tv.utils.ImgUtil; import com.fongmi.android.tv.utils.Notify; import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Asset; import com.github.catvod.utils.Path; import java.io.File; @@ -94,6 +95,7 @@ public class WallConfig { private File write(File file) throws IOException { if (getUrl().startsWith("file")) Path.copy(Path.local(getUrl()), file); + else if (getUrl().startsWith("assets")) Path.copy(Asset.open(getUrl()), file); else if (getUrl().startsWith("http")) Path.write(file, ImgUtil.resize(OkHttp.newCall(getUrl()).execute().body().bytes())); else file.delete(); return file; From b9372f2df7d1ebbfa42ecca2a1ba3af3ea2869e8 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 22 Dec 2023 11:57:37 +0800 Subject: [PATCH 2/6] Update build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 2208364ee..8afe046ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 212 - versionName "20231222#3" + versionName "20231222#4" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] From 8ae47951da8db51ce868102f7ca1d5e3f4532858 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 22 Dec 2023 13:49:38 +0800 Subject: [PATCH 3/6] [mobile] fix ui bug --- app/src/mobile/res/layout/fragment_setting.xml | 5 ++++- app/src/mobile/res/layout/fragment_setting_player.xml | 5 ++++- app/src/mobile/res/layout/fragment_vod.xml | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/mobile/res/layout/fragment_setting.xml b/app/src/mobile/res/layout/fragment_setting.xml index efef97772..2d7eb6740 100644 --- a/app/src/mobile/res/layout/fragment_setting.xml +++ b/app/src/mobile/res/layout/fragment_setting.xml @@ -8,7 +8,10 @@ + android:background="@color/transparent" + android:elevation="0dp" + app:elevation="0dp" + app:liftOnScrollColor="@color/transparent"> + android:background="@color/transparent" + android:elevation="0dp" + app:elevation="0dp" + app:liftOnScrollColor="@color/transparent"> + app:elevation="0dp" + app:liftOnScrollColor="@color/transparent"> Date: Fri, 22 Dec 2023 14:22:29 +0800 Subject: [PATCH 4/6] Update Decoder.java --- app/src/main/java/com/fongmi/android/tv/api/Decoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4f7dca2c7..533ef7a1a 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 @@ -24,8 +24,8 @@ public class Decoder { String key = url.contains(";") ? url.split(";")[2] : ""; url = url.contains(";") ? url.split(";")[0] : url; String data = getData(url); - if (Json.valid(data)) return fix(url, data); if (data.isEmpty()) throw new Exception(); + if (Json.valid(data)) return fix(url, data); if (data.contains("**")) data = base64(data); if (data.startsWith("2423")) data = cbc(data); if (key.length() > 0) data = ecb(data, key); From 2db968cb754339c8744e8a6f7be57beeba0ccd94 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 22 Dec 2023 14:28:00 +0800 Subject: [PATCH 5/6] Update build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8afe046ad..6bc959612 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 212 - versionName "20231222#4" + versionName "20231222#5" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] From 8f814b667e2043af80486dea5027cd3836d68c20 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 22 Dec 2023 14:43:05 +0800 Subject: [PATCH 6/6] Update build.gradle --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6bc959612..7717d1fe7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 28 - versionCode 212 - versionName "20231222#5" + versionCode 213 + versionName "2.1.3" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]