hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update media3 to 1.0.1

Browse Source
pull/137/head
FongMi 3 years ago
parent b91e2b6cee
commit ac61383e7d
4 changed files with 12 additions and 43 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      app/build.gradle
  2. 18
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  3. 7
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
  4. 8
      app/src/mobile/res/layout/view_control_vod.xml

22
app/build.gradle
Unescape View File

@ -79,17 +79,17 @@ dependencies {
implementation project(':forcetech')
implementation project(':ijkplayer')
pythonImplementation project(':pyramid')
implementation 'androidx.media3:media3-database:1.0.0'
implementation 'androidx.media3:media3-datasource:1.0.0'
implementation 'androidx.media3:media3-datasource-rtmp:1.0.0'
implementation 'androidx.media3:media3-exoplayer:1.0.0'
implementation 'androidx.media3:media3-exoplayer-dash:1.0.0'
implementation 'androidx.media3:media3-exoplayer-hls:1.0.0'
implementation 'androidx.media3:media3-exoplayer-rtsp:1.0.0'
implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.0.0'
implementation 'androidx.media3:media3-extractor:1.0.0'
implementation 'androidx.media3:media3-session:1.0.0'
implementation 'androidx.media3:media3-ui:1.0.0'
implementation 'androidx.media3:media3-database:1.0.1'
implementation 'androidx.media3:media3-datasource:1.0.1'
implementation 'androidx.media3:media3-datasource-rtmp:1.0.1'
implementation 'androidx.media3:media3-exoplayer:1.0.1'
implementation 'androidx.media3:media3-exoplayer-dash:1.0.1'
implementation 'androidx.media3:media3-exoplayer-hls:1.0.1'
implementation 'androidx.media3:media3-exoplayer-rtsp:1.0.1'
implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.0.1'
implementation 'androidx.media3:media3-extractor:1.0.1'
implementation 'androidx.media3:media3-session:1.0.1'
implementation 'androidx.media3:media3-ui:1.0.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
implementation 'androidx.preference:preference:1.2.0'

18
app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
Unescape View File

@ -37,7 +37,6 @@ import com.fongmi.android.tv.bean.Parse;
import com.fongmi.android.tv.bean.Site;
import com.fongmi.android.tv.bean.Track;
import com.fongmi.android.tv.bean.Vod;
import com.fongmi.android.tv.cast.CastVideo;
import com.fongmi.android.tv.databinding.ActivityDetailBinding;
import com.fongmi.android.tv.db.AppDatabase;
import com.fongmi.android.tv.event.ErrorEvent;
@ -56,7 +55,6 @@ import com.fongmi.android.tv.ui.base.BaseActivity;
import com.fongmi.android.tv.ui.custom.CustomKeyDownVod;
import com.fongmi.android.tv.ui.custom.SpaceItemDecoration;
import com.fongmi.android.tv.ui.custom.ViewType;
import com.fongmi.android.tv.ui.custom.dialog.CastDialog;
import com.fongmi.android.tv.ui.custom.dialog.ControlDialog;
import com.fongmi.android.tv.ui.custom.dialog.EpisodeGridDialog;
import com.fongmi.android.tv.ui.custom.dialog.EpisodeListDialog;
@ -82,7 +80,7 @@ import java.util.concurrent.Executors;
import tv.danmaku.ijk.media.player.ui.IjkVideoView;
public class DetailActivity extends BaseActivity implements Clock.Callback, CustomKeyDownVod.Listener, CastDialog.Listener, Receiver.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, ParseAdapter.OnClickListener {
public class DetailActivity extends BaseActivity implements Clock.Callback, CustomKeyDownVod.Listener, Receiver.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, ParseAdapter.OnClickListener {
private ViewGroup.LayoutParams mFrameParams;
private ActivityDetailBinding mBinding;
@ -231,7 +229,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
mBinding.content.setOnClickListener(view -> onContent());
mBinding.reverse.setOnClickListener(view -> onReverse());
mBinding.control.back.setOnClickListener(view -> onFull());
mBinding.control.cast.setOnClickListener(view -> onCast());
mBinding.control.full.setOnClickListener(view -> onFull());
mBinding.control.keep.setOnClickListener(view -> onKeep());
mBinding.control.lock.setOnClickListener(view -> onLock());
@ -464,11 +461,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
toggleFullscreen();
}
private void onCast() {
for (Fragment fragment : getSupportFragmentManager().getFragments()) if (fragment instanceof BottomSheetDialogFragment) return;
CastDialog.create(this).config(ApiConfig.getUrl()).history(mHistory).video(CastVideo.get(getName(), getUrl())).show(getSupportFragmentManager(), null);
}
private void onKeep() {
Keep keep = Keep.find(getHistoryKey());
Notify.show(keep != null ? R.string.keep_del : R.string.keep_add);
@ -692,7 +684,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
private void showControl() {
mBinding.control.share.setVisibility(getUrl() == null || isFullscreen() ? View.GONE : View.VISIBLE);
mBinding.control.cast.setVisibility(getUrl() == null || isFullscreen() ? View.GONE : View.VISIBLE);
mBinding.control.keep.setVisibility(mHistory == null || isFullscreen() ? View.GONE : View.VISIBLE);
mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE);
mBinding.control.rotate.setVisibility(isFullscreen() && !isLock() ? View.VISIBLE : View.GONE);
@ -1059,13 +1050,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
adapter.notifyItemRangeChanged(0, adapter.getItemCount());
}
@Override
public void onCastTo(boolean mobile) {
if (mobile) return;
checkPlayImg(false);
mPlayers.pause();
}
@Override
public void onScale(int tag) {
mHistory.setScale(tag);

7
app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
Unescape View File

@ -100,11 +100,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
};
}
private boolean openLive() {
LiveActivity.start(this);
return false;
}
private void setConfirm() {
confirm = true;
Notify.show(R.string.app_exit);
@ -117,7 +112,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
if (!event.getType().equals(RefreshEvent.Type.CONFIG)) return;
mBinding.navigation.getMenu().findItem(R.id.vod).setVisible(true);
mBinding.navigation.getMenu().findItem(R.id.setting).setVisible(true);
mBinding.navigation.getMenu().findItem(R.id.live).setVisible(LiveConfig.hasUrl());
}
@Override
@ -125,7 +119,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
if (mBinding.navigation.getSelectedItemId() == item.getItemId()) return false;
if (item.getItemId() == R.id.vod) return mManager.change(0);
if (item.getItemId() == R.id.setting) return mManager.change(1);
if (item.getItemId() == R.id.live) return openLive();
return false;
}

8
app/src/mobile/res/layout/view_control_vod.xml
Unescape View File

@ -45,14 +45,6 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/cast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_control_cast" />
<ImageView
android:id="@+id/share"
android:layout_width="wrap_content"

Write Preview
Loading…
Cancel
Save