Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

支持在配置内设定直播播放请求头,修改片尾显示和跳过逻辑 #124

Open
wants to merge 56 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
86d2a0b
update quickjs.
watson1982 Oct 11, 2023
59a5d9f
Merge pull request #114 from watson1982/main
Roinlong Oct 13, 2023
eaf5e65
代码回退
Roinlong Nov 5, 2023
a545c27
Merge remote-tracking branch 'origin/main'
Roinlong Nov 5, 2023
7dfe245
Update ApiConfig.java
670637080 Jun 3, 2024
02775d0
Update LivePlayActivity.java
670637080 Jun 3, 2024
d9b8673
Update VodController.java
670637080 Jun 5, 2024
cf0d5f3
Update LivePlayActivity.java
670637080 Jun 5, 2024
8e01736
Update SearchHelper.java
670637080 Jul 18, 2024
19eed64
Update SearchHelper.java
670637080 Jul 18, 2024
22347d4
Update build.gradle
670637080 Jul 18, 2024
1144f79
Add files via upload
670637080 Jul 18, 2024
0450587
Update build.gradle
670637080 Jul 18, 2024
35f0d3d
Update build.gradle
670637080 Jul 18, 2024
c0cee84
Add files via upload
670637080 Jul 18, 2024
903cd56
Update build.gradle
670637080 Jul 18, 2024
1ae00a8
Update SearchHelper.java
670637080 Jul 18, 2024
ca83230
Update SearchHelper.java
670637080 Jul 18, 2024
7822dae
Update item_dialog_checkbox_search.xml
670637080 Jul 18, 2024
20d3356
Create selector_checkbox.xml
670637080 Jul 18, 2024
8cd0437
Create shape_search_checkall.xml
670637080 Jul 18, 2024
31e4582
Create shape_search_clearall.xml
670637080 Jul 18, 2024
d216d09
Update shape_search_clearall.xml
670637080 Jul 18, 2024
44c7ee6
Update colors.xml
670637080 Jul 18, 2024
ae3f232
Update shape_search_clearall.xml
670637080 Jul 18, 2024
a12a113
Update shape_search_clearall.xml
670637080 Jul 18, 2024
93091cf
Update item_dialog_checkbox_search.xml
670637080 Jul 18, 2024
4a9ea0f
Update SearchHelper.java
670637080 Jul 18, 2024
8912b35
Update SearchHelper.java
670637080 Jul 18, 2024
c98dc61
Update SearchHelper.java
670637080 Jul 18, 2024
053197a
Update SearchHelper.java
670637080 Jul 18, 2024
544730e
Update SearchHelper.java
670637080 Jul 18, 2024
8368ea0
Update SearchHelper.java
670637080 Jul 19, 2024
c32c5c3
Update SearchHelper.java
670637080 Jul 19, 2024
0f5f377
Update CheckboxSearchAdapter.java
670637080 Jul 19, 2024
c74ac7d
Update SearchHelper.java
670637080 Jul 19, 2024
59d9b82
Update SearchHelper.java
670637080 Jul 19, 2024
d199cdc
Update CheckboxSearchAdapter.java
670637080 Jul 19, 2024
4b67bb7
Update CheckboxSearchAdapter.java
670637080 Jul 19, 2024
8b08b2b
Update SearchHelper.java
670637080 Jul 19, 2024
e72df94
Update CheckboxSearchAdapter.java
670637080 Jul 19, 2024
0041d82
Update SearchHelper.java
670637080 Jul 19, 2024
8f9d815
Update SearchHelper.java
670637080 Jul 19, 2024
ccf0bbb
Update CheckboxSearchAdapter.java
670637080 Jul 19, 2024
6733081
Update SearchActivity.java
670637080 Jul 19, 2024
e01c8dc
Update CheckboxSearchAdapter.java
670637080 Jul 19, 2024
285b2ed
Update SearchHelper.java
670637080 Jul 19, 2024
1275723
Update SearchHelper.java
670637080 Jul 19, 2024
ff9303e
Update CheckboxSearchAdapter.java
670637080 Jul 19, 2024
bf524cf
Update SearchCheckboxDialog.java
670637080 Jul 19, 2024
309d66f
Update SearchHelper.java
670637080 Jul 19, 2024
b62c7f2
Update SearchHelper.java
670637080 Jul 19, 2024
1aaa155
Update SearchHelper.java
670637080 Jul 19, 2024
a6b855c
Update test.yml
670637080 Jan 8, 2025
3d5ab63
Update test.yml
670637080 Jan 8, 2025
dd2ecfe
Update test.yml
670637080 Jan 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
- name: Build With Gradle
run: |
chmod +x gradlew
Expand Down
21 changes: 10 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
compileSdkVersion 33

defaultConfig {
applicationId 'com.github.tvbox.osc'
minSdkVersion 16
minSdkVersion 18
targetSdkVersion 26
versionCode 1
versionName '1.0.0'
Expand Down Expand Up @@ -59,7 +59,7 @@ android {
}

dependencies {
api fileTree(dir: "libs", include: ["*.jar"])
api fileTree(dir: "libs", include: ['*.jar', '*.aar'])


implementation 'org.nanohttpd:nanohttpd:2.3.1'
Expand All @@ -70,7 +70,7 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation files('libs/thunder.jar')
implementation files('libs/commons-lang3-3.12.0.jar')

implementation 'org.conscrypt:conscrypt-android:2.5.2'
implementation 'com.squareup.okhttp3:okhttp:3.12.11'
annotationProcessor 'androidx.room:room-compiler:2.3.0'
implementation 'androidx.room:room-runtime:2.3.0'
Expand All @@ -88,18 +88,17 @@ dependencies {
implementation 'com.orhanobut:hawk:2.0.1'

implementation project(":player")
implementation project(":quickjs")
//implementation project(":quickjs")

implementation('org.xwalk:xwalk_shared_library:23.53.589.4') {
exclude group: 'com.android.support'
}
implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.4'
implementation files('libs/xwalk_shared_library-23.53.589.4.aar')
implementation 'com.lzy.net:okgo:3.0.4'
// implementation 'com.tencent.bugly:crashreport_upgrade:latest.release'
implementation 'com.owen:tv-recyclerview:3.0.0'

implementation 'com.github.getActivity:XXPermissions:13.6'
implementation 'org.jsoup:jsoup:1.14.1'
implementation files('libs/XXPermissions-13.6.aar')
implementation 'org.jsoup:jsoup:1.16.2'
implementation 'com.github.hedzr:android-file-chooser:v1.2.0-final'
implementation 'commons-io:commons-io:2.11.0'
implementation 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
}
}
Binary file added app/libs/XXPermissions-13.6.aar
Binary file not shown.
Binary file added app/libs/dec-0.1.2.jar
Binary file not shown.
Binary file added app/libs/wrapper-android-release.aar
Binary file not shown.
Binary file added app/libs/xwalk_shared_library-23.53.589.4.aar
Binary file not shown.
4 changes: 2 additions & 2 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@
# 迅雷下载模块
-keep class com.xunlei.downloadlib.** {*;}
# quickjs引擎
-keep class com.github.tvbox.quickjs.** {*;}
-keep class com.whl.quickjs.** {*;}
# 支持影视的ali相关的jar
-keep class com.google.gson.**{*;}
# Zxing
-keep class com.google.zxing.**{*;}
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
}
1 change: 1 addition & 0 deletions app/src/main/assets/js/lib/ali.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/src/main/assets/js/lib/ali_api.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/src/main/assets/js/lib/cat.js

Large diffs are not rendered by default.

8,837 changes: 8,836 additions & 1 deletion app/src/main/assets/js/lib/cheerio.min.js

Large diffs are not rendered by default.

Loading