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

[mobile] rename detail to video

Browse Source
pull/142/head
FongMi 3 years ago
parent dbb1d2d70d
commit 82ffad2ded
13 changed files with 50 additions and 50 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. 4
      app/src/main/java/com/fongmi/android/tv/player/extractor/Push.java
  2. 2
      app/src/mobile/AndroidManifest.xml
  3. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
  4. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java
  5. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
  6. 6
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
  7. 12
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  8. 50
      app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java
  9. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LinkDialog.java
  10. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java
  11. 6
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
  12. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
  13. 0
      app/src/mobile/res/layout/activity_video.xml

4
app/src/main/java/com/fongmi/android/tv/player/extractor/Push.java
Unescape View File

@ -7,7 +7,7 @@ import androidx.fragment.app.FragmentActivity;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.player.Source;
import com.fongmi.android.tv.ui.activity.DetailActivity;
import com.fongmi.android.tv.ui.activity.VideoActivity;
public class Push implements Source.Extractor {
@ -18,7 +18,7 @@ public class Push implements Source.Extractor {
@Override
public String fetch(String url) throws Exception {
DetailActivity.push((FragmentActivity) App.activity(), Uri.parse(url.substring(7)));
VideoActivity.push((FragmentActivity) App.activity(), Uri.parse(url.substring(7)));
SystemClock.sleep(500);
return "";
}

2
app/src/mobile/AndroidManifest.xml
Unescape View File

@ -81,7 +81,7 @@
android:screenOrientation="fullUser" />
<activity
android:name=".ui.activity.DetailActivity"
android:name=".ui.activity.VideoActivity"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
android:excludeFromRecents="true"
android:launchMode="singleTask"

2
app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
Unescape View File

@ -271,7 +271,7 @@ public class CollectActivity extends BaseActivity implements CustomScroller.Call
@Override
public void onItemClick(Vod item) {
if (item.isFolder()) VodActivity.start(this, item.getSiteKey(), Result.folder(item));
else DetailActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
else VideoActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
}
@Override

2
app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java
Unescape View File

@ -81,7 +81,7 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl
@Override
public void onItemClick(History item) {
DetailActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
VideoActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
}
@Override

4
app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
Unescape View File

@ -82,7 +82,7 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis
ApiConfig.load(config, new Callback() {
@Override
public void success() {
DetailActivity.start(getActivity(), item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
VideoActivity.start(getActivity(), item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
RefreshEvent.config();
RefreshEvent.video();
}
@ -103,7 +103,7 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis
public void onItemClick(Keep item) {
Config config = Config.find(item.getCid());
if (item.getCid() != ApiConfig.getCid()) loadConfig(config, item);
else DetailActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
else VideoActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
}
@Override

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

@ -68,12 +68,12 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
private void checkAction(Intent intent) {
if (Intent.ACTION_SEND.equals(intent.getAction())) {
DetailActivity.push(this, Uri.parse(intent.getStringExtra(Intent.EXTRA_TEXT)));
VideoActivity.push(this, Uri.parse(intent.getStringExtra(Intent.EXTRA_TEXT)));
} else if (Intent.ACTION_VIEW.equals(intent.getAction()) && intent.getData() != null) {
if ("text/plain".equals(intent.getType()) || Util.path(intent.getData()).endsWith(".m3u")) {
loadLive("file:/" + FileChooser.getPathFromUri(this, intent.getData()));
} else {
DetailActivity.push(this, intent.getData());
VideoActivity.push(this, intent.getData());
}
}
}
@ -154,7 +154,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
@Subscribe(threadMode = ThreadMode.MAIN)
public void onServerEvent(ServerEvent event) {
if (event.getType() != ServerEvent.Type.PUSH) return;
DetailActivity.push(this, event.getText());
VideoActivity.push(this, event.getText());
}
@Override

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

@ -48,7 +48,7 @@ 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.databinding.ActivityVideoBinding;
import com.fongmi.android.tv.db.AppDatabase;
import com.fongmi.android.tv.event.ErrorEvent;
import com.fongmi.android.tv.event.PlayerEvent;
@ -101,13 +101,13 @@ 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, PiPReceiver.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, QualityAdapter.OnClickListener, QuickAdapter.OnClickListener, ParseAdapter.OnClickListener, SubtitleCallback {
public class VideoActivity extends BaseActivity implements Clock.Callback, CustomKeyDownVod.Listener, CastDialog.Listener, PiPReceiver.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, QualityAdapter.OnClickListener, QuickAdapter.OnClickListener, ParseAdapter.OnClickListener, SubtitleCallback {
private ActivityVideoBinding mBinding;
private ViewGroup.LayoutParams mFrameParams;
private Observer<Result> mObserveDetail;
private Observer<Result> mObservePlayer;
private Observer<Result> mObserveSearch;
private ActivityDetailBinding mBinding;
private EpisodeAdapter mEpisodeAdapter;
private QualityAdapter mQualityAdapter;
private ControlDialog mControlDialog;
@ -168,7 +168,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
}
public static void start(Activity activity, String key, String id, String name, String pic, String mark) {
Intent intent = new Intent(activity, DetailActivity.class);
Intent intent = new Intent(activity, VideoActivity.class);
intent.putExtra("mark", mark);
intent.putExtra("name", name);
intent.putExtra("pic", pic);
@ -244,7 +244,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
@Override
protected ViewBinding getBinding() {
return mBinding = ActivityDetailBinding.inflate(getLayoutInflater());
return mBinding = ActivityVideoBinding.inflate(getLayoutInflater());
}
@Override
@ -663,7 +663,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
}
private void onSetting() {
mControlDialog = ControlDialog.create().detail(mBinding).history(mHistory).players(mPlayers).parse(isUseParse()).show(this);
mControlDialog = ControlDialog.create().parent(mBinding).history(mHistory).players(mPlayers).parse(isUseParse()).show(this);
}
private void onTrack(View view) {

50
app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java
Unescape View File

@ -15,7 +15,7 @@ import com.fongmi.android.tv.App;
import com.fongmi.android.tv.R;
import com.fongmi.android.tv.bean.History;
import com.fongmi.android.tv.bean.Parse;
import com.fongmi.android.tv.databinding.ActivityDetailBinding;
import com.fongmi.android.tv.databinding.ActivityVideoBinding;
import com.fongmi.android.tv.databinding.DialogControlBinding;
import com.fongmi.android.tv.player.Players;
import com.fongmi.android.tv.ui.adapter.ParseAdapter;
@ -31,7 +31,7 @@ import java.util.List;
public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickListener {
private DialogControlBinding binding;
private ActivityDetailBinding detail;
private ActivityVideoBinding parent;
private List<TextView> scales;
private final String[] scale;
private Listener listener;
@ -47,8 +47,8 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis
this.scale = ResUtil.getStringArray(R.array.select_scale);
}
public ControlDialog detail(ActivityDetailBinding detail) {
this.detail = detail;
public ControlDialog parent(ActivityVideoBinding parent) {
this.parent = parent;
return this;
}
@ -86,11 +86,11 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis
if (players == null) dismiss();
if (players == null) return;
binding.speed.setValue(Math.max(players.getSpeed(), 1.0f));
binding.player.setText(detail.control.action.player.getText());
binding.decode.setText(detail.control.action.decode.getText());
binding.ending.setText(detail.control.action.ending.getText());
binding.opening.setText(detail.control.action.opening.getText());
binding.loop.setActivated(detail.control.action.loop.isActivated());
binding.player.setText(parent.control.action.player.getText());
binding.decode.setText(parent.control.action.decode.getText());
binding.ending.setText(parent.control.action.ending.getText());
binding.opening.setText(parent.control.action.opening.getText());
binding.loop.setActivated(parent.control.action.loop.isActivated());
setTrackVisible();
setScaleText();
setParse();
@ -100,27 +100,27 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis
protected void initEvent() {
binding.speed.addOnChangeListener(this::setSpeed);
for (TextView view : scales) view.setOnClickListener(this::setScale);
binding.text.setOnClickListener(v -> dismiss(detail.control.action.text));
binding.audio.setOnClickListener(v -> dismiss(detail.control.action.audio));
binding.video.setOnClickListener(v -> dismiss(detail.control.action.video));
binding.loop.setOnClickListener(v -> active(binding.loop, detail.control.action.loop));
binding.player.setOnClickListener(v -> click(binding.player, detail.control.action.player));
binding.decode.setOnClickListener(v -> click(binding.decode, detail.control.action.decode));
binding.ending.setOnClickListener(v -> click(binding.ending, detail.control.action.ending));
binding.opening.setOnClickListener(v -> click(binding.opening, detail.control.action.opening));
binding.ending.setOnLongClickListener(v -> longClick(binding.ending, detail.control.action.ending));
binding.opening.setOnLongClickListener(v -> longClick(binding.opening, detail.control.action.opening));
binding.text.setOnClickListener(v -> dismiss(parent.control.action.text));
binding.audio.setOnClickListener(v -> dismiss(parent.control.action.audio));
binding.video.setOnClickListener(v -> dismiss(parent.control.action.video));
binding.loop.setOnClickListener(v -> active(binding.loop, parent.control.action.loop));
binding.player.setOnClickListener(v -> click(binding.player, parent.control.action.player));
binding.decode.setOnClickListener(v -> click(binding.decode, parent.control.action.decode));
binding.ending.setOnClickListener(v -> click(binding.ending, parent.control.action.ending));
binding.opening.setOnClickListener(v -> click(binding.opening, parent.control.action.opening));
binding.ending.setOnLongClickListener(v -> longClick(binding.ending, parent.control.action.ending));
binding.opening.setOnLongClickListener(v -> longClick(binding.opening, parent.control.action.opening));
}
private void setSpeed(@NonNull Slider slider, float value, boolean fromUser) {
detail.control.action.speed.setText(players.setSpeed(value));
parent.control.action.speed.setText(players.setSpeed(value));
if (history != null) history.setSpeed(players.getSpeed());
}
private void setScaleText() {
for (int i = 0; i < scales.size(); i++) {
scales.get(i).setText(scale[i]);
scales.get(i).setActivated(scales.get(i).getText().equals(detail.control.action.scale.getText()));
scales.get(i).setActivated(scales.get(i).getText().equals(parent.control.action.scale.getText()));
}
}
@ -164,7 +164,7 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis
}
public void updatePlayer() {
binding.player.setText(detail.control.action.player.getText());
binding.player.setText(parent.control.action.player.getText());
}
public void setParseVisible(boolean visible) {
@ -173,9 +173,9 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis
}
public void setTrackVisible() {
binding.text.setVisibility(detail.control.action.text.getVisibility());
binding.audio.setVisibility(detail.control.action.audio.getVisibility());
binding.video.setVisibility(detail.control.action.video.getVisibility());
binding.text.setVisibility(parent.control.action.text.getVisibility());
binding.audio.setVisibility(parent.control.action.audio.getVisibility());
binding.video.setVisibility(parent.control.action.video.getVisibility());
binding.track.setVisibility(binding.text.getVisibility() == View.GONE && binding.audio.getVisibility() == View.GONE && binding.video.getVisibility() == View.GONE ? View.GONE : View.VISIBLE);
}

4
app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LinkDialog.java
Unescape View File

@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.R;
import com.fongmi.android.tv.databinding.DialogLinkBinding;
import com.fongmi.android.tv.ui.activity.DetailActivity;
import com.fongmi.android.tv.ui.activity.VideoActivity;
import com.fongmi.android.tv.utils.FileChooser;
import com.fongmi.android.tv.utils.Sniffer;
import com.fongmi.android.tv.utils.Utils;
@ -66,7 +66,7 @@ public class LinkDialog {
private void onPositive(DialogInterface dialog, int which) {
String text = binding.text.getText().toString().trim();
if (!text.isEmpty()) DetailActivity.push(App.activity(), text);
if (!text.isEmpty()) VideoActivity.push(App.activity(), text);
dialog.dismiss();
}

4
app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java
Unescape View File

@ -15,7 +15,7 @@ import com.fongmi.android.tv.databinding.DialogReceiveBinding;
import com.fongmi.android.tv.event.CastEvent;
import com.fongmi.android.tv.event.RefreshEvent;
import com.fongmi.android.tv.impl.Callback;
import com.fongmi.android.tv.ui.activity.DetailActivity;
import com.fongmi.android.tv.ui.activity.VideoActivity;
import com.fongmi.android.tv.utils.ImgUtil;
import com.fongmi.android.tv.utils.Notify;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
@ -71,7 +71,7 @@ public class ReceiveDialog extends BaseDialog {
private void onReceiveCast() {
if (ApiConfig.get().getConfig().equals(event.getConfig())) {
DetailActivity.cast(getActivity(), event.getHistory().update(ApiConfig.getCid()));
VideoActivity.cast(getActivity(), event.getHistory().update(ApiConfig.getCid()));
dismiss();
} else {
showProgress();

6
app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
Unescape View File

@ -22,7 +22,7 @@ import com.fongmi.android.tv.bean.Vod;
import com.fongmi.android.tv.databinding.FragmentTypeBinding;
import com.fongmi.android.tv.model.SiteViewModel;
import com.fongmi.android.tv.ui.activity.CollectActivity;
import com.fongmi.android.tv.ui.activity.DetailActivity;
import com.fongmi.android.tv.ui.activity.VideoActivity;
import com.fongmi.android.tv.ui.adapter.VodAdapter;
import com.fongmi.android.tv.ui.base.BaseFragment;
import com.fongmi.android.tv.ui.custom.CustomScroller;
@ -213,8 +213,8 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
mPages.add(Page.get(item.getVodId(), findPosition()));
getVideo(item.getVodId(), "1");
} else {
if (!isFolder()) DetailActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic());
else DetailActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), item.getVodName());
if (!isFolder()) VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic());
else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), item.getVodName());
}
}

4
app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
Unescape View File

@ -30,7 +30,7 @@ import com.fongmi.android.tv.impl.FilterCallback;
import com.fongmi.android.tv.impl.SiteCallback;
import com.fongmi.android.tv.model.SiteViewModel;
import com.fongmi.android.tv.ui.activity.CollectActivity;
import com.fongmi.android.tv.ui.activity.DetailActivity;
import com.fongmi.android.tv.ui.activity.VideoActivity;
import com.fongmi.android.tv.ui.activity.HistoryActivity;
import com.fongmi.android.tv.ui.activity.KeepActivity;
import com.fongmi.android.tv.ui.adapter.TypeAdapter;
@ -274,7 +274,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode != Activity.RESULT_OK || requestCode != FileChooser.REQUEST_PICK_FILE) return;
DetailActivity.file(getActivity(), FileChooser.getPathFromUri(getContext(), data.getData()));
VideoActivity.file(getActivity(), FileChooser.getPathFromUri(getContext(), data.getData()));
}
@Override

0
app/src/mobile/res/layout/activity_detail.xml → app/src/mobile/res/layout/activity_video.xml
Unescape View File

Write Preview
Loading…
Cancel
Save