Remove rtsp channel

1 year ago · 2abfd1ebee
parent a75c625302
commit 2abfd1ebee
9 changed files with 0 additions and 99 deletions
--- 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
@ -28,7 +28,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
    private String[] caption;
    private String[] render;
    private String[] scale;
-    private String[] rtsp;

    public static void start(Activity activity) {
        activity.startActivity(new Intent(activity, SettingPlayerActivity.class));
@ -55,7 +54,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
        mBinding.backgroundText.setText(getSwitch(Setting.isBackgroundOn()));
        mBinding.audioDecodeText.setText(getSwitch(Setting.isAudioPrefer()));
        mBinding.danmakuLoadText.setText(getSwitch(Setting.isDanmakuLoad()));
-        mBinding.rtspText.setText((rtsp = ResUtil.getStringArray(R.array.select_rtsp))[Setting.getRtsp()]);
        mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]);
        mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]);
        mBinding.captionText.setText((caption = ResUtil.getStringArray(R.array.select_caption))[Setting.isCaption() ? 1 : 0]);
@ -64,7 +62,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
    @Override
    protected void initEvent() {
        mBinding.ua.setOnClickListener(this::onUa);
-        mBinding.rtsp.setOnClickListener(this::setRtsp);
        mBinding.scale.setOnClickListener(this::setScale);
        mBinding.speed.setOnClickListener(this::onSpeed);
        mBinding.buffer.setOnClickListener(this::onBuffer);
@ -92,12 +89,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
        Setting.putUa(ua);
    }

-    private void setRtsp(View view) {
-        int index = Setting.getRtsp();
-        Setting.putRtsp(index = index == rtsp.length - 1 ? 0 : ++index);
-        mBinding.rtspText.setText(rtsp[index]);
-    }
-
    private void setScale(View view) {
        int index = Setting.getScale();
        Setting.putScale(index = index == scale.length - 1 ? 0 : ++index);
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
@ -292,35 +292,6 @@

        </LinearLayout>

-        <LinearLayout
-            android:id="@+id/rtsp"
-            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/player_rtsp"
-                android:textColor="@color/white"
-                android:textSize="18sp" />
-
-            <TextView
-                android:id="@+id/rtspText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:textColor="@color/white"
-                android:textSize="18sp"
-                tools:text="UDP" />
-
-        </LinearLayout>
-
        <LinearLayout
            android:id="@+id/ua"
            android:layout_width="match_parent"
--- a/app/src/main/java/com/fongmi/android/tv/Setting.java
+++ b/app/src/main/java/com/fongmi/android/tv/Setting.java
@ -137,14 +137,6 @@ public class Setting {
        Prefers.put("background", background);
    }

-    public static int getRtsp() {
-        return Prefers.getInt("rtsp");
-    }
-
-    public static void putRtsp(int rtsp) {
-        Prefers.put("rtsp", rtsp);
-    }
-
    public static int getSiteMode() {
        return Prefers.getInt("site_mode");
    }
@ -217,14 +209,6 @@ public class Setting {
        Prefers.put("caption", caption);
    }

-    public static boolean isLibAss() {
-        return Prefers.getBoolean("libass");
-    }
-
-    public static void putLibAss(boolean libass) {
-        Prefers.put("libass", libass);
-    }
-
    public static boolean isTunnel() {
        return Prefers.getBoolean("tunnel");
    }
--- a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java
@ -115,7 +115,6 @@ public class ExoUtil {
        builder.setSubtitleConfigurations(getSubtitleConfigs(subs));
        if (drm != null) builder.setDrmConfiguration(drm.get());
        if (mimeType != null) builder.setMimeType(mimeType);
-        builder.setForceUseRtpTcp(Setting.getRtsp() == 1);
        builder.setAds(Sniffer.getRegex(uri));
        builder.setMediaId(uri.toString());
        builder.setImageDurationMs(15000);
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -101,7 +101,6 @@
    <string name="player_tunnel">隧道模式</string>
    <string name="player_buffer">缓冲时间</string>
    <string name="player_speed">长按倍速</string>
-    <string name="player_rtsp">RTSP 通道</string>
    <string name="player_ua">User-Agent</string>

    <!-- Search -->
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -101,7 +101,6 @@
    <string name="player_tunnel">隧道模式</string>
    <string name="player_buffer">緩衝時間</string>
    <string name="player_speed">長按倍速</string>
-    <string name="player_rtsp">RTSP 通道</string>
    <string name="player_ua">User-Agent</string>

    <!-- Search -->
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -102,7 +102,6 @@
    <string name="player_tunnel">Tunnel mode</string>
    <string name="player_buffer">Buffer time</string>
    <string name="player_speed">Press speed</string>
-    <string name="player_rtsp">RTSP channel</string>
    <string name="player_ua">User-Agent</string>

    <!-- Search -->
@ -201,9 +200,4 @@
        <item>Select subtitle track</item>
    </string-array>

-    <string-array name="select_rtsp" translatable="false">
-        <item>UDP</item>
-        <item>TCP</item>
-    </string-array>
-
 </resources>
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
@ -33,7 +33,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
    private String[] caption;
    private String[] render;
    private String[] scale;
-    private String[] rtsp;

    public static SettingPlayerFragment newInstance() {
        return new SettingPlayerFragment();
@ -58,7 +57,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
        mBinding.audioDecodeText.setText(getSwitch(Setting.isAudioPrefer()));
        mBinding.danmakuLoadText.setText(getSwitch(Setting.isDanmakuLoad()));
        mBinding.caption.setVisibility(Setting.hasCaption() ? View.VISIBLE : View.GONE);
-        mBinding.rtspText.setText((rtsp = ResUtil.getStringArray(R.array.select_rtsp))[Setting.getRtsp()]);
        mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]);
        mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]);
        mBinding.captionText.setText((caption = ResUtil.getStringArray(R.array.select_caption))[Setting.isCaption() ? 1 : 0]);
@ -68,7 +66,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
    @Override
    protected void initEvent() {
        mBinding.ua.setOnClickListener(this::onUa);
-        mBinding.rtsp.setOnClickListener(this::setRtsp);
        mBinding.scale.setOnClickListener(this::onScale);
        mBinding.speed.setOnClickListener(this::onSpeed);
        mBinding.buffer.setOnClickListener(this::onBuffer);
@ -91,12 +88,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
        Setting.putUa(ua);
    }

-    private void setRtsp(View view) {
-        int index = Setting.getRtsp();
-        Setting.putRtsp(index = index == rtsp.length - 1 ? 0 : ++index);
-        mBinding.rtspText.setText(rtsp[index]);
-    }
-
    private void onScale(View view) {
        new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_scale).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(scale, Setting.getScale(), (dialog, which) -> {
            mBinding.scaleText.setText(scale[which]);
--- a/app/src/mobile/res/layout/fragment_setting_player.xml
+++ b/app/src/mobile/res/layout/fragment_setting_player.xml
@ -303,33 +303,6 @@

            </LinearLayout>

-            <LinearLayout
-                android:id="@+id/rtsp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/shape_item"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="16dp"
-                    android:text="@string/player_rtsp"
-                    android:textColor="@color/white"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/rtspText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="end"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    tools:text="UDP" />
-
-            </LinearLayout>
-
            <LinearLayout
                android:id="@+id/ua"
                android:layout_width="match_parent"