[leanback] support manual play and preview

3 years ago · 2c94d4d03a
parent 8a968bd973
commit 2c94d4d03a
13 changed files with 130 additions and 10 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@ -4,6 +4,7 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.Html;
 import android.text.TextUtils;
@ -27,6 +28,7 @@ import androidx.media3.ui.PlayerView;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;

+import com.bumptech.glide.request.transition.Transition;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Constant;
 import com.fongmi.android.tv.R;
@ -45,6 +47,7 @@ import com.fongmi.android.tv.event.ErrorEvent;
 import com.fongmi.android.tv.event.PlayerEvent;
 import com.fongmi.android.tv.event.RefreshEvent;
 import com.fongmi.android.tv.impl.Callback;
+import com.fongmi.android.tv.impl.CustomTarget;
 import com.fongmi.android.tv.model.SiteViewModel;
 import com.fongmi.android.tv.player.ExoUtil;
 import com.fongmi.android.tv.player.Players;
@ -61,6 +64,7 @@ import com.fongmi.android.tv.ui.presenter.PartPresenter;
 import com.fongmi.android.tv.ui.presenter.SearchPresenter;
 import com.fongmi.android.tv.utils.Clock;
 import com.fongmi.android.tv.utils.FileChooser;
+import com.fongmi.android.tv.utils.ImgUtil;
 import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.ResUtil;
 import com.fongmi.android.tv.utils.Sniffer;
@ -394,6 +398,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
        mViewModel.playerContent(getKey(), flag.getFlag(), episode.getUrl());
        updateHistory(episode, replay);
        showProgress();
+        hidePreview();
        hideCenter();
    }

@ -429,6 +434,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
        mFlagAdapter.setItems(item.getVodFlags(), null);
        mBinding.content.setMaxLines(getMaxLines());
        mBinding.video.requestFocus();
+        setArtwork(item.getVodPic());
        getPart(item.getVodName());
        checkHistory(item);
        checkFlag(item);
@ -465,11 +471,14 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
    }

    private void seamless(Vod.Flag flag, boolean force) {
-        if (!force && !getSite().isChangeable()) return;
-        Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
-        if (episode == null || episode.isActivated()) return;
-        mHistory.setVodRemarks(episode.getName());
-        setEpisodeActivated(episode);
+        if (Setting.isManual() && mHistory.isNew()) {
+            hideProgress();
+        } else if (!Setting.isManual() || force) {
+            Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
+            if (episode == null || episode.isActivated()) return;
+            mHistory.setVodRemarks(episode.getName());
+            setEpisodeActivated(episode);
+        }
    }

    private void setEpisodeActivated(Vod.Flag.Episode item) {
@ -564,8 +573,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
    }

    private void onChange() {
-        if (getSite().isChangeable()) checkSearch(true);
-        else checkFlag();
+        checkSearch(true);
    }

    private void onLoop() {
@ -770,6 +778,17 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
        hideInfo();
    }

+    private void showPreview(Drawable resource) {
+        if (!Setting.isManual() || isVisible(mBinding.widget.progress)) return;
+        mBinding.widget.preview.setVisibility(View.VISIBLE);
+        mBinding.widget.preview.setImageDrawable(resource);
+    }
+
+    private void hidePreview() {
+        mBinding.widget.preview.setVisibility(View.VISIBLE);
+        mBinding.widget.preview.setImageDrawable(null);
+    }
+
    private void setTraffic() {
        Traffic.setSpeed(mBinding.widget.traffic);
        App.post(mR2, Constant.INTERVAL_TRAFFIC);
@ -779,6 +798,23 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
        App.post(mR1, Constant.INTERVAL_HIDE);
    }

+    private void setArtwork(String url) {
+        ImgUtil.load(url, R.drawable.radio, new CustomTarget() {
+            @Override
+            public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                getExo().setDefaultArtwork(resource);
+                getIjk().setDefaultArtwork(resource);
+                showPreview(resource);
+            }
+
+            @Override
+            public void onLoadFailed(@Nullable Drawable error) {
+                getExo().setDefaultArtwork(error);
+                getIjk().setDefaultArtwork(error);
+            }
+        });
+    }
+
    private void getPart(String source) {
        OkHttp.newCall("http://api.pullword.com/get.php?source=" + URLEncoder.encode(source.trim()) + "&param1=0&param2=0&json=1").enqueue(new Callback() {
            @Override
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
@ -38,6 +38,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback {
    protected void initView() {
        mBinding.uaText.setText(Setting.getUa());
        mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
+        mBinding.manualText.setText(getSwitch(Setting.isManual()));
        mBinding.http.setVisibility(Players.isExo(Setting.getPlayer()) ? View.VISIBLE : View.GONE);
        mBinding.tunnel.setVisibility(Players.isExo(Setting.getPlayer()) ? View.VISIBLE : View.GONE);
        mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]);
@ -48,6 +49,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback {
        mBinding.ua.setOnClickListener(this::onUa);
        mBinding.http.setOnClickListener(this::setHttp);
        mBinding.tunnel.setOnClickListener(this::setTunnel);
+        mBinding.manual.setOnClickListener(this::setManual);
    }

    private void onUa(View view) {
@ -66,6 +68,11 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback {
        mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
    }

+    private void setManual(View view) {
+        Setting.putManual(!Setting.isManual());
+        mBinding.manualText.setText(getSwitch(Setting.isManual()));
+    }
+
    @Override
    public void setUa(String ua) {
        mBinding.uaText.setText(ua);
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
@ -102,5 +102,34 @@
                tools:text="關" />

        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/manual"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/selector_item"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:text="@string/setting_player_manual"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/manualText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                tools:text="關" />
+
+        </LinearLayout>
    </LinearLayout>
 </androidx.core.widget.NestedScrollView>
--- a/app/src/leanback/res/layout/view_widget_vod.xml
+++ b/app/src/leanback/res/layout/view_widget_vod.xml
@ -227,4 +227,12 @@
            app:trackColor="@color/grey_500" />

    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/preview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter"
+        android:visibility="gone" />
+
 </FrameLayout>
--- a/app/src/main/java/com/fongmi/android/tv/Setting.java
+++ b/app/src/main/java/com/fongmi/android/tv/Setting.java
@ -183,6 +183,14 @@ public class Setting {
        Prefers.put("exo_http", http);
    }

+    public static boolean isManual() {
+        return Prefers.getBoolean("manual");
+    }
+
+    public static void putManual(boolean manual) {
+        Prefers.put("manual", manual);
+    }
+
    public static int getSiteMode() {
        return Prefers.getInt("site_mode");
    }
--- a/app/src/main/java/com/fongmi/android/tv/bean/History.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/History.java
@ -245,6 +245,10 @@ public class History {
        return isRevPlay() ? R.string.play_backward_hint : R.string.play_forward_hint;
    }

+    public boolean isNew() {
+        return getCreateTime() == 0 && getPosition() == 0;
+    }
+
    public static List<History> get() {
        return get(ApiConfig.getCid());
    }
--- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
@ -261,6 +261,7 @@ public class Vod {

        public Flag() {
            this.episodes = new ArrayList<>();
+            this.position = -1;
        }

        public Flag(String flag) {
@ -333,11 +334,11 @@ public class Vod {
            int number = Utils.getDigit(remarks);
            if (getEpisodes().size() == 0) return null;
            if (getEpisodes().size() == 1) return getEpisodes().get(0);
-            if (getPosition() != -1) return getEpisodes().get(getPosition());
            for (Episode item : getEpisodes()) if (item.rule1(remarks)) return item;
            for (Episode item : getEpisodes()) if (item.rule2(number)) return item;
            for (Episode item : getEpisodes()) if (item.rule3(remarks)) return item;
            for (Episode item : getEpisodes()) if (item.rule4(remarks)) return item;
+            if (getPosition() != -1) return getEpisodes().get(getPosition());
            return strict ? null : getEpisodes().get(0);
        }

@ -445,6 +446,10 @@ public class Vod {
                return name.toLowerCase().contains(getName().toLowerCase());
            }

+            public boolean equals(Episode episode) {
+                return rule1(episode.getName());
+            }
+
            @Override
            public boolean equals(Object obj) {
                if (this == obj) return true;
--- a/app/src/main/java/com/fongmi/android/tv/impl/CustomTarget.java
+++ b/app/src/main/java/com/fongmi/android/tv/impl/CustomTarget.java
@ -0,0 +1,19 @@
+package com.fongmi.android.tv.impl;
+
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.request.transition.Transition;
+
+public class CustomTarget extends com.bumptech.glide.request.target.CustomTarget<Drawable> {
+
+    @Override
+    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+    }
+
+    @Override
+    public void onLoadCleared(@Nullable Drawable placeholder) {
+    }
+}
--- a/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
@ -37,8 +37,9 @@ public class ImgUtil {
        load(url, view, ImageView.ScaleType.CENTER);
    }

-    public static void load(String url, CustomTarget<Drawable> target) {
-        if (!TextUtils.isEmpty(url)) Glide.with(App.get()).load(checkUrl(url)).dontAnimate().into(target);
+    public static void load(String url, int error, CustomTarget<Drawable> target) {
+        if (TextUtils.isEmpty(url)) target.onLoadFailed(ResUtil.getDrawable(error));
+        else Glide.with(App.get()).load(checkUrl(url)).error(error).dontAnimate().into(target);
    }

    public static void load(String url, ImageView view, ImageView.ScaleType scaleType) {
--- a/app/src/main/res/drawable-nodpi/radio.webp
+++ b/app/src/main/res/drawable-nodpi/radio.webp
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -68,6 +68,7 @@
    <string name="setting_player_ua">User-Agent</string>
    <string name="setting_player_http">连线方式</string>
    <string name="setting_player_tunnel">隧道模式</string>
+    <string name="setting_player_manual">手动播放</string>
    <string name="setting_decode">解码方式</string>
    <string name="setting_render">渲染方式</string>
    <string name="setting_scale">缩放比例</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -68,6 +68,7 @@
    <string name="setting_player_ua">User-Agent</string>
    <string name="setting_player_http">連線方式</string>
    <string name="setting_player_tunnel">隧道模式</string>
+    <string name="setting_player_manual">手動播放</string>
    <string name="setting_decode">解碼方式</string>
    <string name="setting_render">渲染方式</string>
    <string name="setting_scale">縮放比例</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -68,6 +68,7 @@
    <string name="setting_player_ua">User-Agent</string>
    <string name="setting_player_http">HTTP method</string>
    <string name="setting_player_tunnel">Tunnel mode</string>
+    <string name="setting_player_manual">Manual play</string>
    <string name="setting_decode">Decode</string>
    <string name="setting_render">Render</string>
    <string name="setting_scale">Scale</string>