diff --git a/app/build.gradle b/app/build.gradle index 93581fbb..2e0ae382 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,15 +67,15 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation files('libs\\thunder.jar') - implementation files('libs\\commons-lang3-3.12.0.jar') + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation files('libs/thunder.jar') + implementation files('libs/commons-lang3-3.12.0.jar') - implementation 'com.squareup.okhttp3:okhttp:3.12.1' + implementation 'com.squareup.okhttp3:okhttp:3.12.11' annotationProcessor 'androidx.room:room-compiler:2.3.0' implementation 'androidx.room:room-runtime:2.3.0' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.squareup.okio:okio:2.6.0' + implementation 'com.squareup.okio:okio:2.8.0' implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.45-androidx' implementation 'com.kingja.loadsir:loadsir:1.3.8' implementation 'com.google.code.gson:gson:2.8.7' diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java index 4646adc6..36098a37 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java @@ -224,8 +224,7 @@ public class DetailActivity extends BaseActivity { vodInfo.playIndex=(vodInfo.seriesMap.get(vodInfo.playFlag).size()-1)-vodInfo.playIndex; // insertVod(sourceKey, vodInfo); firstReverse = true; -// setSeriesGroupOptions();//干掉集数分组逻辑 - mSeriesGroupView.setVisibility(View.GONE); + setSeriesGroupOptions(); seriesAdapter.notifyDataSetChanged(); } } @@ -532,8 +531,7 @@ public class DetailActivity extends BaseActivity { mGridViewLayoutMgr.setSpanCount(offset); seriesAdapter.setNewData(vodInfo.seriesMap.get(vodInfo.playFlag)); -// setSeriesGroupOptions(); - mSeriesGroupView.setVisibility(View.GONE); + setSeriesGroupOptions(); mGridView.postDelayed(new Runnable() { @Override @@ -910,7 +908,7 @@ public class DetailActivity extends BaseActivity { toggleFullPreview(); mGridView.requestFocus(); List list = vodInfo.seriesMap.get(vodInfo.playFlag); -// mSeriesGroupView.setVisibility(list.size()>GroupCount ? View.VISIBLE : View.GONE); + mSeriesGroupView.setVisibility(list.size()>GroupCount ? View.VISIBLE : View.GONE); return; } if (seriesSelect) { @@ -951,7 +949,7 @@ public class DetailActivity extends BaseActivity { llPlayerFragmentContainerBlock.setVisibility(fullWindows ? View.GONE : View.VISIBLE); mGridView.setVisibility(fullWindows ? View.GONE : View.VISIBLE); mGridViewFlag.setVisibility(fullWindows ? View.GONE : View.VISIBLE); -// mSeriesGroupView.setVisibility(fullWindows ? View.GONE : View.VISIBLE); + mSeriesGroupView.setVisibility(fullWindows ? View.GONE : View.VISIBLE); //全屏下禁用详情页几个按键的焦点 防止上键跑过来 tvPlay.setFocusable(!fullWindows); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java index d6555e53..22e2d186 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java @@ -1185,8 +1185,7 @@ public class LivePlayActivity extends BaseActivity { case VideoView.STATE_ERROR: case VideoView.STATE_PLAYBACK_COMPLETED: mHandler.removeCallbacks(mConnectTimeoutChangeSourceRun); -// mHandler.post(mConnectTimeoutChangeSourceRun); - mHandler.postDelayed(mConnectTimeoutChangeSourceRun, 1500); + mHandler.postDelayed(mConnectTimeoutChangeSourceRun, 500); break; case VideoView.STATE_PREPARING: case VideoView.STATE_BUFFERING: diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java index f8fbb8c9..b836749c 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java @@ -495,7 +495,7 @@ public class PlayActivity extends BaseActivity { void playUrl(String url, HashMap headers) { LOG.i("playUrl:" + url); - if(autoRetryCount>0 && url.contains(".m3u8")){ + if(autoRetryCount>1 && url.contains(".m3u8")){ url="http://home.jundie.top:666/unBom.php?m3u8="+url; } String finalUrl = url; diff --git a/build.gradle b/build.gradle index 8e31c858..f6f9caba 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { // maven { url 'http://9xi4o.tk/maven2' } } dependencies { - classpath "com.android.tools.build:gradle:4.2.1" + classpath "com.android.tools.build:gradle:4.2.2" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/player/src/main/jniLibs/armeabi-v7a/libijkffmpeg.so b/player/src/main/jniLibs/armeabi-v7a/libijkffmpeg.so index 41064cee..689fa8d2 100644 Binary files a/player/src/main/jniLibs/armeabi-v7a/libijkffmpeg.so and b/player/src/main/jniLibs/armeabi-v7a/libijkffmpeg.so differ diff --git a/player/src/main/jniLibs/armeabi-v7a/libijksdl.so b/player/src/main/jniLibs/armeabi-v7a/libijksdl.so index bebf4d91..9de892f7 100644 Binary files a/player/src/main/jniLibs/armeabi-v7a/libijksdl.so and b/player/src/main/jniLibs/armeabi-v7a/libijksdl.so differ diff --git a/player/src/main/jniLibs/armeabi-v7a/libplayer.so b/player/src/main/jniLibs/armeabi-v7a/libplayer.so index 8a94b480..3a67de1c 100644 Binary files a/player/src/main/jniLibs/armeabi-v7a/libplayer.so and b/player/src/main/jniLibs/armeabi-v7a/libplayer.so differ