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

[mobile] rename quality

Browse Source
pull/137/head
FongMi 3 years ago
parent 265741936f
commit 67da54df93
7 changed files with 43 additions and 20 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. 21
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  2. 12
      app/src/mobile/java/com/fongmi/android/tv/ui/adapter/QualityAdapter.java
  3. 27
      app/src/mobile/res/layout/activity_detail.xml
  4. 0
      app/src/mobile/res/layout/adapter_quality.xml
  5. 1
      app/src/mobile/res/values-zh-rCN/strings.xml
  6. 1
      app/src/mobile/res/values-zh-rTW/strings.xml
  7. 1
      app/src/mobile/res/values/strings.xml

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

@ -64,7 +64,7 @@ import com.fongmi.android.tv.ui.adapter.EpisodeAdapter;
import com.fongmi.android.tv.ui.adapter.FlagAdapter;
import com.fongmi.android.tv.ui.adapter.ParseAdapter;
import com.fongmi.android.tv.ui.adapter.QuickAdapter;
import com.fongmi.android.tv.ui.adapter.UrlAdapter;
import com.fongmi.android.tv.ui.adapter.QualityAdapter;
import com.fongmi.android.tv.ui.base.BaseActivity;
import com.fongmi.android.tv.ui.base.ViewType;
import com.fongmi.android.tv.ui.custom.CustomKeyDownVod;
@ -99,7 +99,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, PiPReceiver.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, UrlAdapter.OnClickListener, QuickAdapter.OnClickListener, ParseAdapter.OnClickListener {
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 {
private ViewGroup.LayoutParams mFrameParams;
private Observer<Result> mObserveDetail;
@ -107,6 +107,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
private Observer<Result> mObserveSearch;
private ActivityDetailBinding mBinding;
private EpisodeAdapter mEpisodeAdapter;
private QualityAdapter mQualityAdapter;
private ControlDialog mControlDialog;
private QuickAdapter mQuickAdapter;
private ParseAdapter mParseAdapter;
@ -114,7 +115,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
private ExecutorService mExecutor;
private SiteViewModel mViewModel;
private FlagAdapter mFlagAdapter;
private UrlAdapter mUrlAdapter;
private PiPReceiver mReceiver;
private List<Dialog> mDialogs;
private List<String> mBroken;
@ -315,10 +315,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
}
private void setRecyclerView() {
mBinding.url.setHasFixedSize(true);
mBinding.url.setItemAnimator(null);
mBinding.url.addItemDecoration(new SpaceItemDecoration(8));
mBinding.url.setAdapter(mUrlAdapter = new UrlAdapter(this));
mBinding.flag.setHasFixedSize(true);
mBinding.flag.setItemAnimator(null);
mBinding.flag.addItemDecoration(new SpaceItemDecoration(8));
@ -328,6 +324,10 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
mBinding.episode.setItemAnimator(null);
mBinding.episode.addItemDecoration(new SpaceItemDecoration(8));
mBinding.episode.setAdapter(mEpisodeAdapter = new EpisodeAdapter(this, ViewType.LIST));
mBinding.quality.setHasFixedSize(true);
mBinding.quality.setItemAnimator(null);
mBinding.quality.addItemDecoration(new SpaceItemDecoration(8));
mBinding.quality.setAdapter(mQualityAdapter = new QualityAdapter(this));
mBinding.control.parse.setHasFixedSize(true);
mBinding.control.parse.setItemAnimator(null);
mBinding.control.parse.addItemDecoration(new SpaceItemDecoration(8));
@ -464,14 +464,15 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
}
private void setPlayer(Result result) {
result.getUrl().set(mUrlAdapter.getPosition());
result.getUrl().set(mQualityAdapter.getPosition());
setUseParse(ApiConfig.hasParse() && ((result.getPlayUrl().isEmpty() && ApiConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1));
if (mControlDialog != null && mControlDialog.isVisible()) mControlDialog.setParseVisible(isUseParse());
mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE);
mPlayers.start(result, isUseParse(), getSite().isChangeable() ? getSite().getTimeout() : -1);
mBinding.url.setVisibility(result.getUrl().isOnly() ? View.GONE : View.VISIBLE);
mBinding.qualityText.setVisibility(result.getUrl().isOnly() ? View.GONE : View.VISIBLE);
mBinding.quality.setVisibility(result.getUrl().isOnly() ? View.GONE : View.VISIBLE);
mBinding.swipeLayout.setRefreshing(false);
mUrlAdapter.addAll(result);
mQualityAdapter.addAll(result);
}
@Override

12
app/src/mobile/java/com/fongmi/android/tv/ui/adapter/UrlAdapter.java → app/src/mobile/java/com/fongmi/android/tv/ui/adapter/QualityAdapter.java
Unescape View File

@ -7,15 +7,15 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.fongmi.android.tv.bean.Result;
import com.fongmi.android.tv.databinding.AdapterUrlBinding;
import com.fongmi.android.tv.databinding.AdapterQualityBinding;
public class UrlAdapter extends RecyclerView.Adapter<UrlAdapter.ViewHolder> {
public class QualityAdapter extends RecyclerView.Adapter<QualityAdapter.ViewHolder> {
private final OnClickListener mListener;
private Result mResult;
private int position;
public UrlAdapter(OnClickListener listener) {
public QualityAdapter(OnClickListener listener) {
this.mListener = listener;
this.mResult = Result.empty();
}
@ -42,7 +42,7 @@ public class UrlAdapter extends RecyclerView.Adapter<UrlAdapter.ViewHolder> {
@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new ViewHolder(AdapterUrlBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
return new ViewHolder(AdapterQualityBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
}
@Override
@ -61,9 +61,9 @@ public class UrlAdapter extends RecyclerView.Adapter<UrlAdapter.ViewHolder> {
static class ViewHolder extends RecyclerView.ViewHolder {
private final AdapterUrlBinding binding;
private final AdapterQualityBinding binding;
ViewHolder(@NonNull AdapterUrlBinding binding) {
ViewHolder(@NonNull AdapterQualityBinding binding) {
super(binding.getRoot());
this.binding = binding;
}

27
app/src/mobile/res/layout/activity_detail.xml
Unescape View File

@ -231,6 +231,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"
@ -238,18 +239,34 @@
android:paddingEnd="16dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<TextView
android:id="@+id/quality_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/detail_quality"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/url"
android:id="@+id/quality"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:visibility="gone"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:visibility="visible" />
<LinearLayout
android:id="@+id/content_layout"
@ -261,7 +278,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/detail_content"
android:textColor="@color/white"
@ -295,7 +312,9 @@
android:paddingEnd="8dp"
android:visibility="gone"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2" />
app:spanCount="2"
tools:listitem="@layout/adapter_quick"
tools:visibility="visible" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

0
app/src/mobile/res/layout/adapter_url.xml → app/src/mobile/res/layout/adapter_quality.xml
Unescape View File

1
app/src/mobile/res/values-zh-rCN/strings.xml
Unescape View File

@ -16,6 +16,7 @@
<string name="detail_flag">线路</string>
<string name="detail_more">更多</string>
<string name="detail_episode">选集</string>
<string name="detail_quality">画质</string>
<string name="detail_content">简介</string>
<string name="detail_search">快搜“<xliff:g name="name">%s</xliff:g>”</string>

1
app/src/mobile/res/values-zh-rTW/strings.xml
Unescape View File

@ -16,6 +16,7 @@
<string name="detail_flag">線路</string>
<string name="detail_more">更多</string>
<string name="detail_episode">選集</string>
<string name="detail_quality">畫質</string>
<string name="detail_content">簡介</string>
<string name="detail_search">快搜「<xliff:g name="name">%s</xliff:g>」</string>

1
app/src/mobile/res/values/strings.xml
Unescape View File

@ -16,6 +16,7 @@
<string name="detail_flag">Flag</string>
<string name="detail_more">More</string>
<string name="detail_episode">Episode</string>
<string name="detail_quality">Quality</string>
<string name="detail_content">Summary</string>
<string name="detail_search">Searching <xliff:g name="name">%s</xliff:g></string>

Write Preview
Loading…
Cancel
Save