解决开启小窗时TV端遥控器焦点丢失问题,新增菜单键可拉起底部菜单 json解析小调整 修正上一版视频底部操作栏过长

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

@@ -282,6 +282,7 @@ public class VodController extends BaseController {
                     updatePlayerCfgView();
                     listener.updatePlayerCfg();
                     listener.replay(false);
+                    view.requestFocus();
                     // hideBottom();
                 } catch (JSONException e) {
                     e.printStackTrace();
@@ -310,7 +311,8 @@ public class VodController extends BaseController {
                     updatePlayerCfgView();
                     listener.updatePlayerCfg();
                     listener.replay(false);
-                    hideBottom();
+                    view.requestFocus();
+//                    hideBottom();
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
@@ -586,13 +588,16 @@ public class VodController extends BaseController {
         if (super.onKeyEvent(event)) {
             return true;
         }
+        int keyCode = event.getKeyCode();
+        int action = event.getAction();
         if (isBottomVisible()) {
             myHandle.postDelayed(myRunnable, myHandleSeconds);
+            if (keyCode == KeyEvent.KEYCODE_DPAD_UP ) {
+                return true;
+            }
             return super.dispatchKeyEvent(event);
         }
         boolean isInPlayback = isInPlaybackState();
-        int keyCode = event.getKeyCode();
-        int action = event.getAction();
         if (action == KeyEvent.ACTION_DOWN) {
             if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT || keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
                 if (isInPlayback) {
@@ -604,8 +609,8 @@ public class VodController extends BaseController {
                     togglePlay();
                     return true;
                 }
-//            } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {  // 闲置开启计时关闭透明底栏
-            } else if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN || keyCode == KeyEvent.KEYCODE_DPAD_UP) {
+//            } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {  return true;// 闲置开启计时关闭透明底栏
+            } else if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN || keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode== KeyEvent.KEYCODE_MENU) {
                 if (!isBottomVisible()) {
                     showBottom();
                     myHandle.postDelayed(myRunnable, myHandleSeconds);

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

@@ -540,7 +540,7 @@ public class PlayActivity extends BaseActivity {
         }
         String msg = jsonPlayData.optString("msg", "");
         if (url.startsWith("//")) {
-            url = "https:" + url;
+            url = "http:" + url;
         }
         if (!url.startsWith("http")) {
             return null;

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

@@ -553,7 +553,7 @@ public class PlayFragment extends BaseLazyFragment {
         }
         String msg = jsonPlayData.optString("msg", "");
         if (url.startsWith("//")) {
-            url = "https:" + url;
+            url = "http:" + url;
         }
         if (!url.startsWith("http")) {
             return null;

app/src/main/res/layout/player_vod_control_view.xml

@@ -71,7 +71,7 @@
                 android:background="@drawable/button_dialog_main"
                 android:focusable="true"
                 android:padding="@dimen/vs_10"
-                android:text="重播本集"
+                android:text="重播"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/ts_24" />