更新ijk解码库;还原集数分组;缩短直播无响应时自动换源时间

jinwei26 · Jun 1, 2023 · dbc413b · dbc413b
1 parent a5208f9
commit dbc413b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 15 deletions.
diff --git 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
@@ -224,8 +224,7 @@ public void onClick(View v) {
                     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 @@ void refreshList() {
         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 void onBackPressed() {
             toggleFullPreview();
             mGridView.requestFocus();
             List<VodInfo.VodSeries> 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 @@ void toggleFullPreview() {
         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
@@ -1185,8 +1185,7 @@ public void playStateChanged(int playState) {
                     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
@@ -495,7 +495,7 @@ public void run() {
 
     void playUrl(String url, HashMap<String, String> 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
@@ -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
diff --git a/player/src/main/jniLibs/armeabi-v7a/libijksdl.so b/player/src/main/jniLibs/armeabi-v7a/libijksdl.so
diff --git a/player/src/main/jniLibs/armeabi-v7a/libplayer.so b/player/src/main/jniLibs/armeabi-v7a/libplayer.so