From f963adb5c34d9e7dcd3d0b212833a16796d7cdf7 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 14 May 2023 23:19:02 +0800 Subject: [PATCH 1/8] [mobile] fix crash --- app/src/leanback/res/layout/activity_collect.xml | 1 + app/src/leanback/res/layout/activity_search.xml | 2 +- app/src/mobile/res/layout/activity_collect.xml | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/leanback/res/layout/activity_collect.xml b/app/src/leanback/res/layout/activity_collect.xml index 1c93b9808..47b03c1fb 100644 --- a/app/src/leanback/res/layout/activity_collect.xml +++ b/app/src/leanback/res/layout/activity_collect.xml @@ -13,6 +13,7 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="24dp" + android:layout_marginEnd="24dp" android:layout_marginBottom="16dp" android:singleLine="true" android:textColor="@color/white" diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml index c3c803a97..2c89e2dc9 100644 --- a/app/src/leanback/res/layout/activity_search.xml +++ b/app/src/leanback/res/layout/activity_search.xml @@ -68,7 +68,7 @@ android:imeOptions="actionDone" android:inputType="textCapCharacters|textAutoCorrect|textAutoComplete" android:letterSpacing="0.02" - android:maxLength="20" + android:maxLength="255" android:nextFocusRight="@id/word" android:singleLine="true" android:textColor="@color/white" diff --git a/app/src/mobile/res/layout/activity_collect.xml b/app/src/mobile/res/layout/activity_collect.xml index 7e55cb327..87fc785fb 100644 --- a/app/src/mobile/res/layout/activity_collect.xml +++ b/app/src/mobile/res/layout/activity_collect.xml @@ -19,14 +19,13 @@ android:id="@+id/keyword" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="16dp" android:layout_weight="1" android:background="@null" android:hint="@string/search_keyword" android:imeOptions="actionDone" android:inputType="textCapCharacters|textAutoCorrect|textAutoComplete" android:letterSpacing="0.02" - android:maxLength="20" + android:maxLength="255" android:singleLine="true" android:textColor="@color/white" android:textColorHint="@color/white" @@ -37,6 +36,7 @@ android:id="@+id/site" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="16dp" android:src="@drawable/ic_action_site" /> + android:visibility="gone" + tools:visibility="visible" /> From 023f16bba701ec00f846ed04b6b8124eca4794fb Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 14 May 2023 23:34:43 +0800 Subject: [PATCH 2/8] [mobile] update dev --- app/build.gradle | 2 +- app/src/mobile/java/com/fongmi/android/tv/Updater.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fd0bc50d0..db194b19b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,7 +27,7 @@ android { mobile { dimension "mode" versionCode 13 - versionName "1.1.3" + versionName "20230514#1" } java { dimension "api" diff --git a/app/src/mobile/java/com/fongmi/android/tv/Updater.java b/app/src/mobile/java/com/fongmi/android/tv/Updater.java index 3a9a146ed..9238de7a0 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Updater.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Updater.java @@ -77,7 +77,7 @@ public class Updater implements Download.Callback { } private boolean need(int code, String name) { - return (branch.equals(Github.DEV) ? !name.equals(BuildConfig.VERSION_NAME) : code > BuildConfig.VERSION_CODE) && Prefers.getUpdate(); + return Prefers.getUpdate() && branch.equals(Github.DEV) ? !name.equals(BuildConfig.VERSION_NAME) && code <= BuildConfig.VERSION_CODE : code > BuildConfig.VERSION_CODE; } private void doInBackground() { From 1cd57cb6f13ea81be1052ae8a23cb56448e6f1b4 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 14 May 2023 23:38:37 +0800 Subject: [PATCH 3/8] [mobile] update dev --- app/src/mobile/java/com/fongmi/android/tv/Updater.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/mobile/java/com/fongmi/android/tv/Updater.java b/app/src/mobile/java/com/fongmi/android/tv/Updater.java index 9238de7a0..022c259c2 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Updater.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Updater.java @@ -77,7 +77,7 @@ public class Updater implements Download.Callback { } private boolean need(int code, String name) { - return Prefers.getUpdate() && branch.equals(Github.DEV) ? !name.equals(BuildConfig.VERSION_NAME) && code <= BuildConfig.VERSION_CODE : code > BuildConfig.VERSION_CODE; + return Prefers.getUpdate() && branch.equals(Github.DEV) ? !name.equals(BuildConfig.VERSION_NAME) && code >= BuildConfig.VERSION_CODE : code > BuildConfig.VERSION_CODE; } private void doInBackground() { From df51ff1261d5777ed599d1523bea5e1383f74c20 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 14 May 2023 23:50:01 +0800 Subject: [PATCH 4/8] [leanback] update dev --- app/build.gradle | 2 +- app/src/leanback/java/com/fongmi/android/tv/Updater.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index db194b19b..f8dde8722 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { leanback { dimension "mode" versionCode 76 - versionName "1.7.6" + versionName "20230514#1" } mobile { dimension "mode" diff --git a/app/src/leanback/java/com/fongmi/android/tv/Updater.java b/app/src/leanback/java/com/fongmi/android/tv/Updater.java index 61fbe09b9..ef3a84b4c 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Updater.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Updater.java @@ -76,7 +76,7 @@ public class Updater implements Download.Callback { } private boolean need(int code, String name) { - return (branch.equals(Github.DEV) ? !name.equals(BuildConfig.VERSION_NAME) : code > BuildConfig.VERSION_CODE) && Prefers.getUpdate(); + return Prefers.getUpdate() && branch.equals(Github.DEV) ? !name.equals(BuildConfig.VERSION_NAME) && code >= BuildConfig.VERSION_CODE : code > BuildConfig.VERSION_CODE; } private void doInBackground() { From 91ae0a3be68619fc6b2cafce4ea0e2c5d5ff3870 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 15 May 2023 10:49:56 +0800 Subject: [PATCH 5/8] Remove filterable --- README.md | 1 - other/sample/vod/offline.json | 3 --- other/sample/vod/online.json | 3 --- 3 files changed, 7 deletions(-) diff --git a/README.md b/README.md index fcc354180..217412aab 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ https://github.com/CatVodTVOfficial/CatVodTVJarLoader ### 點播欄位 
searchable：搜索    (0：關閉、1：啟用)  
-filterable：篩選    (0：關閉、1：啟用)  
 changeable：換源    (0：關閉、1：啟用)
 playerType：播放器  (1：IJK、2：EXO)
diff --git a/other/sample/vod/offline.json b/other/sample/vod/offline.json index d72d8f471..7b2c32965 100644 --- a/other/sample/vod/offline.json +++ b/other/sample/vod/offline.json @@ -7,7 +7,6 @@ "type": 3, "api": "csp_Csp", "searchable": 1, - "filterable": 1, "changeable": 1, "ext": "file://Download/one.json" }, @@ -17,7 +16,6 @@ "type": 3, "api": "csp_Csp", "searchable": 1, - "filterable": 1, "changeable": 1, "ext": "file://Download/two.json" }, @@ -27,7 +25,6 @@ "type": 3, "api": "csp_Csp", "searchable": 1, - "filterable": 1, "changeable": 1, "ext": "file://Download/extend.json", "jar": "file://Download/extend.jar" diff --git a/other/sample/vod/online.json b/other/sample/vod/online.json index 845874731..a41da0980 100644 --- a/other/sample/vod/online.json +++ b/other/sample/vod/online.json @@ -7,7 +7,6 @@ "type": 3, "api": "csp_Csp", "searchable": 1, - "filterable": 1, "changeable": 1, "ext": "https://github.com/one.json" }, @@ -17,7 +16,6 @@ "type": 3, "api": "csp_Csp", "searchable": 1, - "filterable": 1, "changeable": 1, "ext": "https://github.com/two.json" }, @@ -27,7 +25,6 @@ "type": 3, "api": "csp_Csp", "searchable": 1, - "filterable": 1, "changeable": 1, "ext": "https://github.com/extend.json", "jar": "https://github.com/extend.jar" From 1689ad5754b711efe81dc21807b995d8591ecd54 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 15 May 2023 11:55:56 +0800 Subject: [PATCH 6/8] [mobile] support send title and name when use share --- .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index ddb545a62..651391f24 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -485,7 +485,10 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust } private void onShare() { - new ShareCompat.IntentBuilder(this).setType("text/plain").setText(getUrl()).startChooser(); + ShareCompat.IntentBuilder builder = new ShareCompat.IntentBuilder(this).setType("text/plain").setText(getUrl()); + builder.getIntent().putExtra("title", mBinding.control.title.getText()); + builder.getIntent().putExtra("name", mBinding.control.title.getText()); + builder.startChooser(); } private void checkPlay() { From 84b62e43e6e4089c7c3f1b29aba19d47fbc8ac0a Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 15 May 2023 11:57:10 +0800 Subject: [PATCH 7/8] [mobile] update dev --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f8dde8722..9c6b4bfb3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,7 +27,7 @@ android { mobile { dimension "mode" versionCode 13 - versionName "20230514#1" + versionName "20230515#1" } java { dimension "api" From 2871aecf991c18bab42bb4bc675a4e53f5bd93d0 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 15 May 2023 22:30:22 +0800 Subject: [PATCH 8/8] [mobile] update to 1.1.4 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9c6b4bfb3..71707e965 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,8 +26,8 @@ android { } mobile { dimension "mode" - versionCode 13 - versionName "20230515#1" + versionCode 14 + versionName "1.1.4" } java { dimension "api"