From 10adfaa4136a109e4ec93a1aa47b323bda412071 Mon Sep 17 00:00:00 2001 From: okjack Date: Mon, 8 Apr 2024 17:13:22 +0800 Subject: [PATCH 01/11] build.gradle --- app/build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 3fa6ee675..ac091366a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,6 +73,14 @@ android { } } + android.applicationVariants.all { variant -> + if (variant.buildType.name == 'release' && variant.productFlavors[0].name == 'mobile') { + variant.mergeAssets.doLast { + delete(fileTree(dir: variant.mergeAssets.outputDir, includes: ['x5.tbs.apk'])) + } + } + } + configurations.configureEach { resolutionStrategy { force 'com.squareup.okhttp3:okhttp:' + okhttpVersion From c72d32ece4c23fc7da4af352c2d6c91a6f8f6f9d Mon Sep 17 00:00:00 2001 From: okjack Date: Tue, 9 Apr 2024 17:14:57 +0800 Subject: [PATCH 02/11] strings.xml --- app/src/main/res/values-zh-rTW/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a4743184f..86f3bdcaa 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -251,12 +251,12 @@ 選項彈窗 切換站源 切換線路 - 直播页面 + 直播頁面 歷史頁面 搜索頁面 推送頁面 收藏頁面 - 设置頁面 + 設置頁面 From 9da8af0eff7130a01b3bb98e666686f6a43b17ac Mon Sep 17 00:00:00 2001 From: okjack Date: Tue, 9 Apr 2024 17:20:52 +0800 Subject: [PATCH 03/11] live progress --- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 1 + .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 7ae967e39..f6229bca4 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -221,6 +221,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP private void setDisplayView() { mBinding.display.getRoot().setVisibility(View.VISIBLE); + mBinding.display.progress.setVisibility(View.GONE); showDisplayInfo(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index d00d70775..457b335a4 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -240,6 +240,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom private void setDisplayView() { mBinding.display.getRoot().setVisibility(View.VISIBLE); + mBinding.display.progress.setVisibility(View.GONE); showDisplayInfo(); } From ff03f1693bd3a3a54db73b188aee649b5e30ca04 Mon Sep 17 00:00:00 2001 From: okjack Date: Tue, 9 Apr 2024 21:30:54 +0800 Subject: [PATCH 04/11] strings.xml --- app/src/main/java/com/fongmi/android/tv/Setting.java | 2 +- app/src/main/java/com/fongmi/android/tv/bean/Config.java | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 6 ++---- app/src/main/res/values-zh-rTW/strings.xml | 6 ++---- app/src/main/res/values/strings.xml | 6 ++---- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java index 463ac256a..699c95e58 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -474,7 +474,7 @@ public class Setting { } public static int getConfigCache() { - return Math.min(Prefers.getInt("config_cache", 0), 8); + return Math.min(Prefers.getInt("config_cache", 0), 2); } public static void putParseWebView(int key) { diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Config.java b/app/src/main/java/com/fongmi/android/tv/bean/Config.java index 70fab9099..2d667ffd7 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Config.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Config.java @@ -121,7 +121,7 @@ public class Config { } public boolean isCache() { - return getTime() + (long)(3600*1000 * Setting.getConfigCache()) > System.currentTimeMillis(); + return getTime() + (long)(3600*1000*12 * Setting.getConfigCache()) > System.currentTimeMillis(); } public Config type(int type) { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 883346486..6bbd1af39 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -276,10 +276,8 @@ 关闭 - 1小时 - 2小时 - 3小时 - 4小时 + 12小时 + 24小时 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 86f3bdcaa..9ac646637 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -276,10 +276,8 @@ 關閉 - 1小時 - 2小時 - 3小時 - 4小時 + 12小時 + 24小時 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ecea42cc6..d16d8c602 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -281,10 +281,8 @@ Close - 1 Hour - 2 Hour - 3 Hour - 4 Hour + 12 Hour + 24 Hour From 20daee8ab8bcacf70ac2943e27342cda5240af08 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 10 Apr 2024 11:40:00 +0800 Subject: [PATCH 05/11] adapter_type.xml --- app/src/leanback/res/layout/adapter_type.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/leanback/res/layout/adapter_type.xml b/app/src/leanback/res/layout/adapter_type.xml index bcc8f5848..3d796fae6 100644 --- a/app/src/leanback/res/layout/adapter_type.xml +++ b/app/src/leanback/res/layout/adapter_type.xml @@ -9,5 +9,5 @@ android:focusableInTouchMode="true" android:gravity="center" android:textColor="@color/white" - android:textSize="16sp" + android:textSize="18sp" tools:text="電影" /> \ No newline at end of file From 1347e885dae628825c22ef435f6f0776cccb9ca0 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 10 Apr 2024 23:25:49 +0800 Subject: [PATCH 06/11] config --- .../com/fongmi/android/tv/ui/activity/SettingActivity.java | 3 ++- .../com/fongmi/android/tv/ui/fragment/SettingFragment.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index 2c379fd88..0f2755709 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -345,7 +345,8 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit @Override public void success() { setCacheText(); - setConfig(VodConfig.get().getConfig().json("").save()); + Config config = VodConfig.get().getConfig().json("").save(); + if (!config.isEmpty()) setConfig(); } }); return true; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index ab90f7a25..d9469efe3 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -351,7 +351,8 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit @Override public void success() { setCacheText(); - setConfig(VodConfig.get().getConfig().json("").save()); + Config config = VodConfig.get().getConfig().json("").save(); + if (!config.isEmpty()) setConfig(); } }); return true; From c5498ea526511281ff9d22643a964ba20a44777e Mon Sep 17 00:00:00 2001 From: okjack Date: Thu, 11 Apr 2024 17:12:06 +0800 Subject: [PATCH 07/11] update --- app/src/main/java/com/fongmi/android/tv/utils/Tbs.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Tbs.java b/app/src/main/java/com/fongmi/android/tv/utils/Tbs.java index 272864fcc..0d8a7b078 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Tbs.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Tbs.java @@ -51,6 +51,7 @@ public class Tbs { public static void init() { if (Setting.getParseWebView() == 0) return; + if (QbSdk.isTbsCoreInited()) return; App.post(() -> tbsInit()); } From 4ab510272f83e00721d76613a403f64df9adef38 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 12 Apr 2024 10:39:45 +0800 Subject: [PATCH 08/11] fix clan --- app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java index f272548ac..12746a39d 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java @@ -36,7 +36,7 @@ public class UrlUtil { public static String convert(String url) { String scheme = scheme(url); - if ("clan".equals(scheme)) fixUrl(url); + if ("clan".equals(scheme)) return convert(fixUrl(url)); if ("local".equals(scheme)) return url.replace("local://", Server.get().getAddress("")); if ("assets".equals(scheme)) return url.replace("assets://", Server.get().getAddress("")); if ("file".equals(scheme)) return url.replace("file://", Server.get().getAddress("file/")); From 6c1b13379b576de6f4c171c7b21d891cd1025735 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 12 Apr 2024 12:42:58 +0800 Subject: [PATCH 09/11] update --- .../java/com/fongmi/android/tv/ui/dialog/SiteDialog.java | 4 ++-- .../java/com/fongmi/android/tv/ui/custom/CustomWebView.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java index 5ae1c1e61..1323a64d5 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java @@ -57,11 +57,11 @@ public class SiteDialog implements SiteAdapter.OnClickListener{ } private boolean list() { - return Setting.getSiteMode() == 0 || adapter.getItemCount() < 20; + return Setting.getSiteMode() == 0 || adapter.getItemCount() < 10; } private int getCount() { - return list() ? 1 : Math.max(1, Math.min((int) (Math.ceil(adapter.getItemCount() / 20.0f)), 3)); + return list() ? 1 : Math.max(1, Math.min((int) (Math.ceil(adapter.getItemCount() / 10.0f)), 3)); } private int getIcon() { diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java index 0df2947c8..26982414f 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java @@ -80,6 +80,7 @@ public class CustomWebView extends WebView { getSettings().setSupportZoom(true); getSettings().setUseWideViewPort(true); getSettings().setDatabaseEnabled(true); + getSettings().setBlockNetworkImage(true); getSettings().setDomStorageEnabled(true); getSettings().setJavaScriptEnabled(true); getSettings().setBuiltInZoomControls(true); From 4d77116146ac2ad2585d1685c6ce4b6cc700ba2f Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 12 Apr 2024 15:14:36 +0800 Subject: [PATCH 10/11] update --- app/src/main/java/com/fongmi/android/tv/Setting.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java index 699c95e58..dde4e9371 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -194,7 +194,7 @@ public class Setting { } public static int getSiteMode() { - return Prefers.getInt("site_mode"); + return Prefers.getInt("site_mode", 1); } public static void putSiteMode(int mode) { @@ -442,7 +442,7 @@ public class Setting { } public static int getHomeUI() { - return Prefers.getInt("home_ui", 0); + return Prefers.getInt("home_ui", 1); } public static void putHomeButtons(String buttons) { From 5d044de22ab3d76c854db0d8a1af8ef41ee718c7 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 12 Apr 2024 15:15:09 +0800 Subject: [PATCH 11/11] build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ac091366a..eec4ce2e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 232 - versionName "0408" + versionName "0412" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]