优化屏显;

选集全屏逻辑优化;

app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java

@@ -85,6 +85,9 @@ public class VodController extends BaseController {
                         mTopRoot1.setVisibility(VISIBLE);
                         mTopRoot2.setVisibility(VISIBLE);
                         mPlayLoadNetSpeedRightTop.setVisibility(VISIBLE);
+                        if(Hawk.get(HawkConfig.SCREEN_DISPLAY,GONE)==GONE){
+                            mPlayPauseTime.setVisibility(VISIBLE);
+                        }
                         mPlayTitle.setVisibility(GONE);
                         mNextBtn.requestFocus();
                         backBtn.setVisibility(ScreenUtils.isTv(context) ? INVISIBLE : VISIBLE);
@@ -94,8 +97,10 @@ public class VodController extends BaseController {
                     case 1003: { // 隐藏底部菜单
                         mBottomRoot.setVisibility(GONE);
                         mTopRoot1.setVisibility(GONE);
-//                        mTopRoot2.setVisibility(GONE);
                         mPlayLoadNetSpeedRightTop.setVisibility(GONE);
+                        if(Hawk.get(HawkConfig.SCREEN_DISPLAY,GONE)==GONE){
+                            mPlayPauseTime.setVisibility(GONE);
+                        }
                         backBtn.setVisibility(INVISIBLE);
                         break;
                     }
@@ -165,14 +170,16 @@ public class VodController extends BaseController {
 
     int videoPlayState = 0;
 
-    private Runnable myRunnable2 = new Runnable() {
+    private final Runnable myRunnable2 = new Runnable() {
+        @SuppressLint("SetTextI18n")
         @Override
         public void run() {
             Date date = new Date();
-            SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
+            @SuppressLint("SimpleDateFormat") SimpleDateFormat timeFormat = new SimpleDateFormat("hh:mm a");
             mPlayPauseTime.setText(timeFormat.format(date));
-            String speed = PlayerHelper.getDisplaySpeed(mControlWrapper.getTcpSpeed());
-            mPlayLoadNetSpeedRightTop.setText(speed);
+            String speedTop = PlayerHelper.getDisplaySpeed(mControlWrapper.getTcpSpeed(),true);
+            String speed = PlayerHelper.getDisplaySpeed(mControlWrapper.getTcpSpeed(),false);
+            mPlayLoadNetSpeedRightTop.setText(speedTop);
             mPlayLoadNetSpeed.setText(speed);
             String width = Integer.toString(mControlWrapper.getVideoSize()[0]);
             String height = Integer.toString(mControlWrapper.getVideoSize()[1]);
@@ -654,12 +661,16 @@ public class VodController extends BaseController {
             }
         });
         //屏显
-        tv_screen_display.setVisibility(Hawk.get(HawkConfig.SCREEN_DISPLAY, GONE));
+        int disPlay = Hawk.get(HawkConfig.SCREEN_DISPLAY, GONE);
+        seekTime.setVisibility(disPlay);
+        mPlayPauseTime.setVisibility(disPlay);
         mScreenDisplay.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
-                tv_screen_display.setVisibility(tv_screen_display.getVisibility() == VISIBLE ? GONE : VISIBLE);
-                Hawk.put(HawkConfig.SCREEN_DISPLAY, tv_screen_display.getVisibility());
+                int disPlay =(Hawk.get(HawkConfig.SCREEN_DISPLAY, GONE) == VISIBLE) ? GONE : VISIBLE;
+                seekTime.setVisibility(disPlay);
+                if(disPlay==VISIBLE)mPlayPauseTime.setVisibility(disPlay);
+                Hawk.put(HawkConfig.SCREEN_DISPLAY, disPlay);
             }
         });
         mNextBtn.setNextFocusLeftId(R.id.play_time_start);

app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java

@@ -385,7 +385,7 @@ public class DetailActivity extends BaseActivity {
                     seriesAdapter.getData().get(vodInfo.playIndex).selected = true;
                     seriesAdapter.notifyItemChanged(vodInfo.playIndex);
                     //选集全屏 想选集不全屏的注释下面一行
-                    if (showPreview && !fullWindows) toggleFullPreview();
+                    if (showPreview && !fullWindows && playFragment.getPlayer().isPlaying())toggleFullPreview();
                     if (!showPreview || reload) {
                         jumpToPlay();
                         firstReverse=false;

app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java

@@ -1893,7 +1893,7 @@ public class LivePlayActivity extends BaseActivity {
         @Override
         public void run() {
             if (mVideoView == null) return;
-            String speed = PlayerHelper.getDisplaySpeed(mVideoView.getTcpSpeed());
+            String speed = PlayerHelper.getDisplaySpeed(mVideoView.getTcpSpeed(),true);
             tvNetSpeed.setText(speed);
 //            tv_right_top_tipnetspeed.setText(speed);
             mHandler.postDelayed(this, 1000);

app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java

@@ -1310,6 +1310,11 @@ public class PlayFragment extends BaseLazyFragment {
         }
     }
 
+
+    public MyVideoView getPlayer() {
+        return mVideoView;
+    }
+
     // webview
     private XWalkView mXwalkWebView;
     private WebView mSysWebView;

app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java

@@ -281,12 +281,12 @@ public class PlayerHelper {
         return scaleText;
     }
 
-    public static String getDisplaySpeed(long speed) {
+    public static String getDisplaySpeed(long speed,boolean show) {
         if(speed > 1048576)
             return new DecimalFormat("#.00").format(speed / 1048576d) + "Mb/s";
         else if(speed > 1024)
             return (speed / 1024) + "Kb/s";
         else
-            return speed > 0?speed + "B/s":"";
+            return speed > 0?speed + "B/s":(show?"0B/s":"");
     }
 }

gradle.properties

@@ -18,4 +18,4 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 IsDebug=true
-org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED
+#org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED