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

[leanback] rename detail to video

Browse Source
pull/142/head
FongMi 3 years ago
parent 72b4f5a6bf
commit b786a04b45
10 changed files with 23 additions and 23 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. 2
      app/src/leanback/AndroidManifest.xml
  2. 14
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
  3. 4
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
  4. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
  5. 10
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  6. 4
      app/src/leanback/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
  7. 6
      app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
  8. 0
      app/src/leanback/res/layout/activity_video.xml
  9. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  10. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java

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

@ -101,7 +101,7 @@
android:screenOrientation="sensorLandscape" />
<activity
android:name=".ui.activity.DetailActivity"
android:name=".ui.activity.VideoActivity"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
android:screenOrientation="sensorLandscape" />

14
app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
Unescape View File

@ -61,8 +61,8 @@ import java.util.List;
public class HomeActivity extends BaseActivity implements CustomTitleView.Listener, VodPresenter.OnClickListener, FuncPresenter.OnClickListener, HistoryPresenter.OnClickListener {
private ArrayObjectAdapter mHistoryAdapter;
private ActivityHomeBinding mBinding;
private ArrayObjectAdapter mHistoryAdapter;
private HistoryPresenter mPresenter;
private ArrayObjectAdapter mAdapter;
private SiteViewModel mViewModel;
@ -107,12 +107,12 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
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());
}
}
}
@ -283,7 +283,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
@Override
public void onItemClick(Vod item) {
DetailActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic());
VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic());
}
@Override
@ -294,7 +294,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
@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
@ -355,7 +355,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
CollectActivity.start(this, event.getText(), true);
break;
case PUSH:
DetailActivity.push(this, event.getText(), true);
VideoActivity.push(this, event.getText(), true);
break;
}
}
@ -363,7 +363,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
@Subscribe(threadMode = ThreadMode.MAIN)
public void onCastEvent(CastEvent event) {
if (ApiConfig.get().getConfig().equals(event.getConfig())) {
DetailActivity.cast(this, event.getHistory().update(ApiConfig.getCid()));
VideoActivity.cast(this, event.getHistory().update(ApiConfig.getCid()));
} else {
ApiConfig.load(event.getConfig(), getCallback(event));
}

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

@ -57,7 +57,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.history();
RefreshEvent.video();
}
@ -78,7 +78,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

2
app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
Unescape View File

@ -38,6 +38,6 @@ public class PushActivity extends BaseActivity {
private void onClip(View view) {
CharSequence text = Utils.getClipText();
if (!TextUtils.isEmpty(text)) DetailActivity.push(this, text.toString(), false);
if (!TextUtils.isEmpty(text)) VideoActivity.push(this, text.toString(), false);
}
}

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

@ -44,7 +44,7 @@ import com.fongmi.android.tv.bean.Result;
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.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;
@ -94,8 +94,9 @@ import okhttp3.Call;
import okhttp3.Response;
import tv.danmaku.ijk.media.player.ui.IjkVideoView;
public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Listener, TrackDialog.Listener, ArrayPresenter.OnClickListener, Clock.Callback {
public class VideoActivity extends BaseActivity implements CustomKeyDownVod.Listener, TrackDialog.Listener, ArrayPresenter.OnClickListener, Clock.Callback {
private ActivityVideoBinding mBinding;
private ViewGroup.LayoutParams mFrameParams;
private EpisodePresenter mEpisodePresenter;
private ArrayObjectAdapter mEpisodeAdapter;
@ -104,7 +105,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private ArrayObjectAdapter mQuickAdapter;
private ArrayObjectAdapter mFlagAdapter;
private ArrayObjectAdapter mPartAdapter;
private ActivityDetailBinding mBinding;
private QualityAdapter mQualityAdapter;
private FlagPresenter mFlagPresenter;
private PartPresenter mPartPresenter;
@ -167,7 +167,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
}
public static void start(Activity activity, String key, String id, String name, String pic, String mark, boolean clear, boolean cast) {
Intent intent = new Intent(activity, DetailActivity.class);
Intent intent = new Intent(activity, VideoActivity.class);
if (clear) intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.putExtra("cast", cast);
intent.putExtra("mark", mark);
@ -254,7 +254,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
@Override
protected ViewBinding getBinding() {
return mBinding = ActivityDetailBinding.inflate(getLayoutInflater());
return mBinding = ActivityVideoBinding.inflate(getLayoutInflater());
}
@Override

4
app/src/leanback/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
Unescape View File

@ -20,7 +20,7 @@ import com.fongmi.android.tv.bean.Result;
import com.fongmi.android.tv.bean.Vod;
import com.fongmi.android.tv.databinding.FragmentVodBinding;
import com.fongmi.android.tv.model.SiteViewModel;
import com.fongmi.android.tv.ui.activity.DetailActivity;
import com.fongmi.android.tv.ui.activity.VideoActivity;
import com.fongmi.android.tv.ui.activity.VodActivity;
import com.fongmi.android.tv.ui.base.BaseFragment;
import com.fongmi.android.tv.ui.custom.CustomRowPresenter;
@ -118,7 +118,7 @@ public class CollectFragment extends BaseFragment implements CustomScroller.Call
public void onItemClick(Vod item) {
getActivity().setResult(Activity.RESULT_OK);
if (item.isFolder()) VodActivity.start(getActivity(), item.getSiteKey(), Result.folder(item));
else DetailActivity.start(getActivity(), item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
else VideoActivity.start(getActivity(), item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
}
@Override

6
app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
Unescape View File

@ -30,7 +30,7 @@ import com.fongmi.android.tv.bean.Vod;
import com.fongmi.android.tv.databinding.FragmentVodBinding;
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.base.BaseFragment;
import com.fongmi.android.tv.ui.custom.CustomRowPresenter;
import com.fongmi.android.tv.ui.custom.CustomScroller;
@ -264,8 +264,8 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
mBinding.recycler.setMoveTop(false);
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());
}
}

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

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

@ -78,8 +78,8 @@ import tv.danmaku.ijk.media.player.ui.IjkVideoView;
public class LiveActivity extends BaseActivity implements CustomKeyDownLive.Listener, CastDialog.Listener, PiPReceiver.Listener, TrackDialog.Listener, Biometric.Callback, PassCallback, LiveCallback, GroupAdapter.OnClickListener, ChannelAdapter.OnClickListener, SubtitleCallback {
private ChannelAdapter mChannelAdapter;
private ActivityLiveBinding mBinding;
private ChannelAdapter mChannelAdapter;
private SimpleDateFormat mFormatDate;
private SimpleDateFormat mFormatTime;
private CustomKeyDownLive mKeyDown;

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

@ -38,8 +38,8 @@ import org.greenrobot.eventbus.ThreadMode;
public class MainActivity extends BaseActivity implements NavigationBarView.OnItemSelectedListener {
private FragmentStateManager mManager;
private ActivityMainBinding mBinding;
private FragmentStateManager mManager;
private boolean confirm;
@Override

Write Preview
Loading…
Cancel
Save