hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into release

Browse Source
pull/137/head
FongMi 3 years ago
parent 423bb51dc1 2871aecf99
commit 140160e18f
10 changed files with 15 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      README.md
  2. 6
      app/build.gradle
  3. 2
      app/src/leanback/java/com/fongmi/android/tv/Updater.java
  4. 1
      app/src/leanback/res/layout/activity_collect.xml
  5. 2
      app/src/leanback/res/layout/activity_search.xml
  6. 2
      app/src/mobile/java/com/fongmi/android/tv/Updater.java
  7. 5
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  8. 7
      app/src/mobile/res/layout/activity_collect.xml
  9. 3
      other/sample/vod/offline.json
  10. 3
      other/sample/vod/online.json

1
README.md
Unescape View File

@ -18,7 +18,6 @@ https://github.com/CatVodTVOfficial/CatVodTVJarLoader
### 點播欄位
<pre><code>searchable：搜索 (0：關閉、1：啟用)
filterable：篩選 (0：關閉、1：啟用)
changeable：換源 (0：關閉、1：啟用)
playerType：播放器 (1：IJK、2：EXO)</code></pre>

6
app/build.gradle
Unescape View File

@ -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"

2
app/src/leanback/java/com/fongmi/android/tv/Updater.java
Unescape View File

@ -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() {

1
app/src/leanback/res/layout/activity_collect.xml
Unescape View File

@ -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"

2
app/src/leanback/res/layout/activity_search.xml
Unescape View File

@ -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"

2
app/src/mobile/java/com/fongmi/android/tv/Updater.java
Unescape View File

@ -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() {

5
app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
Unescape View File

@ -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() {

7
app/src/mobile/res/layout/activity_collect.xml
Unescape View File

@ -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" />
<ImageView
@ -45,7 +45,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_action_list"
android:visibility="gone" />
android:visibility="gone"
tools:visibility="visible" />
</LinearLayout>

3
other/sample/vod/offline.json
Unescape View File

@ -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"

3
other/sample/vod/online.json
Unescape View File

@ -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"

Write Preview
Loading…
Cancel
Save