From 5d14a137c09aecb11d406a73eb776101689b088c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com>
Date: Wed, 1 Mar 2023 16:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86bug;?=
 =?UTF-8?q?=E6=94=B9=E5=96=84=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/tvbox/osc/player/controller/VodController.java   | 6 +++---
 .../com/github/tvbox/osc/ui/activity/DetailActivity.java    | 6 ++++--
 .../com/github/tvbox/osc/ui/activity/LivePlayActivity.java  | 3 ++-
 .../main/java/com/github/tvbox/osc/util/PlayerHelper.java   | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
index 563e35dc..d278a27c 100644
--- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
+++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
@@ -371,7 +371,7 @@ public class VodController extends BaseController {
                     updatePlayerCfgView();
                     listener.updatePlayerCfg();
                     listener.replay(false);
-//                    hideBottom();
+                    hideBottom();
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
@@ -410,7 +410,7 @@ public class VodController extends BaseController {
                                     updatePlayerCfgView();
                                     listener.updatePlayerCfg();
                                     listener.replay(false);
-//                                    hideBottom();
+                                    hideBottom();
                                 }
                             } catch (Exception e) {
                                 e.printStackTrace();
@@ -464,7 +464,7 @@ public class VodController extends BaseController {
                     updatePlayerCfgView();
                     listener.updatePlayerCfg();
                     listener.replay(false);
-//                    hideBottom();
+                    hideBottom();
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
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 36098a37..d463be72 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,7 +224,8 @@ public class DetailActivity extends BaseActivity {
                     vodInfo.playIndex=(vodInfo.seriesMap.get(vodInfo.playFlag).size()-1)-vodInfo.playIndex;
 //                    insertVod(sourceKey, vodInfo);
                     firstReverse = true;
-                    setSeriesGroupOptions();
+//                    setSeriesGroupOptions();//干掉集数分组逻辑
+                    mSeriesGroupView.setVisibility(View.GONE);
                     seriesAdapter.notifyDataSetChanged();
                 }
             }
@@ -531,7 +532,8 @@ public class DetailActivity extends BaseActivity {
         mGridViewLayoutMgr.setSpanCount(offset);
         seriesAdapter.setNewData(vodInfo.seriesMap.get(vodInfo.playFlag));
 
-        setSeriesGroupOptions();
+//        setSeriesGroupOptions();
+        mSeriesGroupView.setVisibility(View.GONE);
 
         mGridView.postDelayed(new Runnable() {
             @Override
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 c4c4cf55..d6555e53 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,7 +1185,8 @@ public class LivePlayActivity extends BaseActivity {
                     case VideoView.STATE_ERROR:
                     case VideoView.STATE_PLAYBACK_COMPLETED:
                         mHandler.removeCallbacks(mConnectTimeoutChangeSourceRun);
-                        mHandler.post(mConnectTimeoutChangeSourceRun);
+//                        mHandler.post(mConnectTimeoutChangeSourceRun);
+                        mHandler.postDelayed(mConnectTimeoutChangeSourceRun, 1500);
                         break;
                     case VideoView.STATE_PREPARING:
                     case VideoView.STATE_BUFFERING:
diff --git a/app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java b/app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java
index a5f173ae..621df35e 100644
--- a/app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java
+++ b/app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java
@@ -16,6 +16,7 @@ import com.orhanobut.hawk.Hawk;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -265,7 +266,7 @@ public class PlayerHelper {
 
     public static String getDisplaySpeed(long speed) {
         if(speed > 1048576)
-            return (speed / 1048576) + "Mb/s";
+            return new DecimalFormat("#.00").format(speed / 1048576d) + "Mb/s";
         else if(speed > 1024)
             return (speed / 1024) + "Kb/s";
         else