Support reset

app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java

@@ -191,13 +191,13 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         mBinding.control.prev.setOnClickListener(view -> checkPrev());
         mBinding.control.scale.setOnClickListener(view -> onScale());
         mBinding.control.speed.setOnClickListener(view -> onSpeed());
-        mBinding.control.replay.setOnClickListener(view -> onReplay());
+        mBinding.control.reset.setOnClickListener(view -> onReset());
         mBinding.control.player.setOnClickListener(view -> onPlayer());
         mBinding.control.decode.setOnClickListener(view -> onDecode());
         mBinding.control.ending.setOnClickListener(view -> onEnding());
         mBinding.control.opening.setOnClickListener(view -> onOpening());
         mBinding.control.speed.setOnLongClickListener(view -> onSpeedLong());
-        mBinding.control.replay.setOnLongClickListener(view -> onReplayLong());
+        mBinding.control.reset.setOnLongClickListener(view -> onResetLong());
         mBinding.control.ending.setOnLongClickListener(view -> onEndingReset());
         mBinding.control.opening.setOnLongClickListener(view -> onOpeningReset());
         mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event));
@@ -540,12 +540,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         return true;
     }
 
-    private void onReplay() {
-        getPlayer(true);
+    private void onReset() {
+        getPlayer(false);
     }
 
-    private boolean onReplayLong() {
-        getPlayer(false);
+    private boolean onResetLong() {
+        getPlayer(true);
         return true;
     }
 

app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java

@@ -28,7 +28,16 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
         return detector.onTouchEvent(e);
     }
 
+    public boolean hasEvent(KeyEvent event) {
+        return Utils.isEnterKey(event) || Utils.isUpKey(event) || Utils.isDownKey(event) || Utils.isLeftKey(event) || Utils.isRightKey(event);
+    }
+
     public boolean onKeyDown(KeyEvent event) {
+        check(event);
+        return true;
+    }
+
+    private void check(KeyEvent event) {
         if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isLeftKey(event)) {
             listener.onSeeking(subTime());
         } else if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isRightKey(event)) {
@@ -42,7 +51,6 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
         } else if (event.getAction() == KeyEvent.ACTION_UP && Utils.isEnterKey(event)) {
             listener.onKeyCenter();
         }
-        return true;
     }
 
     @Override
@@ -57,10 +65,6 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
         return true;
     }
 
-    public boolean hasEvent(KeyEvent event) {
-        return Utils.isEnterKey(event) || Utils.isUpKey(event) || Utils.isDownKey(event) || Utils.isLeftKey(event) || Utils.isRightKey(event);
-    }
-
     private int addTime() {
         return holdTime = holdTime + 10000;
     }

app/src/leanback/res/layout/activity_detail.xml

@@ -15,6 +15,7 @@
         android:layout_marginTop="24dp"
         android:background="@color/black"
         android:focusable="true"
+        android:focusableInTouchMode="true"
         android:foreground="@drawable/selector_video"
         android:nextFocusDown="@id/flag">
 

app/src/leanback/res/layout/view_control_vod.xml

@@ -60,7 +60,7 @@
                 android:textSize="14sp" />
 
             <TextView
-                android:id="@+id/replay"
+                android:id="@+id/reset"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="12dp"
@@ -68,7 +68,7 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:nextFocusDown="@id/parse"
-                android:text="@string/play_replay"
+                android:text="@string/play_reset"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -41,8 +41,7 @@
     <string name="play_next">下一集</string>
     <string name="play_prev">上一集</string>
     <string name="play_ready">准备播放：<xliff:g name="name">%s</xliff:g></string>
-    <string name="play_replay">重播</string>
-    <string name="play_reset">重置</string>
+    <string name="play_reset">刷新</string>
     <string name="play_track">轨道</string>
     <string name="play_track_text">字幕</string>
     <string name="play_track_audio">音轨</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -41,8 +41,7 @@
     <string name="play_next">下一集</string>
     <string name="play_prev">上一集</string>
     <string name="play_ready">準備播放：<xliff:g name="name">%s</xliff:g></string>
-    <string name="play_replay">重播</string>
-    <string name="play_reset">重置</string>
+    <string name="play_reset">刷新</string>
     <string name="play_track">軌道</string>
     <string name="play_track_text">字幕</string>
     <string name="play_track_audio">音軌</string>

app/src/main/res/values/strings.xml

@@ -41,7 +41,6 @@
     <string name="play_next">Next</string>
     <string name="play_prev">Prev</string>
     <string name="play_ready">Ready to play: <xliff:g name="name">%s</xliff:g></string>
-    <string name="play_replay">Replay</string>
     <string name="play_reset">Reset</string>
     <string name="play_track">Tracks</string>
     <string name="play_track_text">Text</string>