From 32416d5feee1fa9fbefec64c91dcfab72b078e63 Mon Sep 17 00:00:00 2001
From: jun <215613905@qq.com>
Date: Tue, 22 Apr 2025 23:06:39 +0800
Subject: [PATCH] fix bug;

---
 .../tvbox/osc/player/controller/VodController.java  | 10 ++++++----
 .../com/github/tvbox/osc/util/PlayerHelper.java     | 13 +++++--------
 app/src/main/res/layout/item_user_hot_vod.xml       |  4 ++--
 3 files changed, 13 insertions(+), 14 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 05a996cb..d131171a 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
@@ -189,13 +189,15 @@ public class VodController extends BaseController {
             Date date = new Date();
             @SuppressLint("SimpleDateFormat") SimpleDateFormat timeFormat = new SimpleDateFormat("hh:mm a");
             mPlayPauseTime.setText(timeFormat.format(date));
-            String speed = PlayerHelper.getDisplaySpeed(mControlWrapper.getTcpSpeed(),false);
-            String speedBps = PlayerHelper.getDisplaySpeedBps(mControlWrapper.getTcpSpeed(),true);
+            long mSpeed = mControlWrapper.getTcpSpeed();
+            String speed = PlayerHelper.getDisplaySpeed(mSpeed,false);
+            String speedBps = PlayerHelper.getDisplaySpeedBps(mSpeed,true);
             mPlayLoadNetSpeedRightTop.setText(speedBps);
             mPlayLoadNetSpeed.setText(speed);
             net_play_speed.setText(speedBps);
-            String width = Integer.toString(mControlWrapper.getVideoSize()[0]);
-            String height = Integer.toString(mControlWrapper.getVideoSize()[1]);
+            int[] mVideoSizes = mControlWrapper.getVideoSize();
+            String width = Integer.toString(mVideoSizes[0]);
+            String height = Integer.toString(mVideoSizes[1]);
             mVideoSize.setText("[ " + width + " X " + height +" ]");
 
             mHandler.postDelayed(this, 1000);
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 560573d3..a7c2b552 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
@@ -291,17 +291,14 @@ public class PlayerHelper {
     }
     public static String getDisplaySpeedBps(long speed, boolean show) {
         long bitSpeed = speed * 8; // 字节转比特
-
         if (bitSpeed >= 1_000_000_000) {
             return new DecimalFormat("0.00").format(bitSpeed / 1_000_000_000d) + "Gbps";
-        } else {
+        } else if (bitSpeed >= 1_000) {
             double mbps = bitSpeed / 1_000_000d;
-            if (mbps > 0 || show) {
-                DecimalFormat df = mbps < 0.1 ? new DecimalFormat("0.00") : new DecimalFormat("0.0");
-                return df.format(mbps) + "Mbps";
-            } else {
-                return "0bps";
-            }
+            DecimalFormat df = mbps < 0.1 ? new DecimalFormat("0.00") : new DecimalFormat("0.0");
+            return df.format(mbps) + "Mbps";
+        }else {
+            return show ? "0bps" : "";
         }
     }
 }
diff --git a/app/src/main/res/layout/item_user_hot_vod.xml b/app/src/main/res/layout/item_user_hot_vod.xml
index 9798b787..19388f4a 100644
--- a/app/src/main/res/layout/item_user_hot_vod.xml
+++ b/app/src/main/res/layout/item_user_hot_vod.xml
@@ -39,7 +39,7 @@
                 android:paddingRight="@dimen/vs_5"
                 android:singleLine="true"
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/ts_20" />
+                android:textSize="@dimen/ts_16" />
         </LinearLayout>
 
 
@@ -65,7 +65,7 @@
                 android:paddingRight="@dimen/vs_5"
                 android:singleLine="true"
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/ts_20" />
+                android:textSize="@dimen/ts_16" />
 
             <TextView
                 android:id="@+id/tvName"