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/app/build.gradle b/app/build.gradle index 8ed906369..95c1b9548 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,12 +22,12 @@ android { leanback { dimension "mode" versionCode 76 - versionName "1.7.6" + versionName "20230514#1" } mobile { dimension "mode" - versionCode 13 - versionName "1.1.3" + versionCode 14 + versionName "1.1.4" } java { dimension "api" 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() { 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/java/com/fongmi/android/tv/Updater.java b/app/src/mobile/java/com/fongmi/android/tv/Updater.java index 3a9a146ed..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 (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() { 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 a64f6e722..097393ffe 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 @@ -478,7 +478,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() { 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" /> 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"