pull/137/head
FongMi 3 years ago
parent f96b45dd42
commit b17e288680
  1. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
  2. 4
      app/src/main/java/com/fongmi/android/tv/bean/Vod.java
  3. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
  4. 2
      ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
  5. 8
      ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
  6. 32
      ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkTimedText.java

@ -240,7 +240,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
@Override
public void onItemClick(Vod item) {
if (item.isFolder() || item.isCover()) {
if (item.isFolder()) {
mPages.add(Page.get(item.getVodId(), mBinding.recycler.getSelectedPosition()));
mBinding.recycler.setMoveTop(false);
getVideo(item.getVodId(), "1");

@ -193,10 +193,6 @@ public class Vod {
return getVodTag().equals("folder");
}
public boolean isCover() {
return getVodTag().equals("cover");
}
public boolean isFile() {
return getVodTag().equals("file");
}

@ -196,7 +196,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
@Override
public void onItemClick(Vod item) {
if (item.isFolder() || item.isCover()) {
if (item.isFolder()) {
mPages.add(Page.get(item.getVodId(), findPosition()));
getVideo(item.getVodId(), "1");
} else {

@ -316,7 +316,7 @@ public class AndroidMediaPlayer extends AbstractMediaPlayer implements MediaPlay
@Override
public void onTimedText(MediaPlayer mp, TimedText text) {
if (text != null) notifyOnTimedText(new IjkTimedText(text.getBounds(), text.getText()));
if (text != null) notifyOnTimedText(IjkTimedText.create(text.getText()));
}
@Override

@ -21,7 +21,6 @@ package tv.danmaku.ijk.media.player;
import android.content.ContentResolver;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
import android.media.MediaCodecInfo;
import android.media.MediaCodecList;
@ -819,12 +818,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
player.notifyOnInfo(msg.arg1, msg.arg2);
return;
case MEDIA_TIMED_TEXT:
if (msg.obj == null) {
player.notifyOnTimedText(null);
} else {
IjkTimedText text = new IjkTimedText(new Rect(0, 0, 1, 1), (String) msg.obj);
player.notifyOnTimedText(text);
}
player.notifyOnTimedText(msg.obj == null ? null : IjkTimedText.create(msg.obj.toString()));
return;
case MEDIA_NOP: // interface test message - ignore
break;

@ -1,38 +1,18 @@
/*
* Copyright (C) 2016 Zheng Yuan <zhengyuan10503@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package tv.danmaku.ijk.media.player;
import android.graphics.Rect;
public final class IjkTimedText {
private final String mTextChars;
private final Rect mTextBounds;
private final String text;
public IjkTimedText(Rect bounds, String text) {
mTextBounds = bounds;
mTextChars = text;
public static IjkTimedText create(String text) {
return new IjkTimedText(text);
}
public Rect getBounds() {
return mTextBounds;
public IjkTimedText(String text) {
this.text = text;
}
public String getText() {
return mTextChars;
return text;
}
}

Loading…
Cancel
Save