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

Remove exo http setting

Browse Source
pull/362/head
FongMi 2 years ago
parent 3b1d65c11d
commit 8b41f5c410
11 changed files with 3 additions and 107 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. 1
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
  2. 11
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
  3. 29
      app/src/leanback/res/layout/activity_setting_player.xml
  4. 8
      app/src/main/java/com/fongmi/android/tv/Setting.java
  5. 5
      app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java
  6. 6
      app/src/main/res/values-zh-rCN/strings.xml
  7. 6
      app/src/main/res/values-zh-rTW/strings.xml
  8. 6
      app/src/main/res/values/strings.xml
  9. 1
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
  10. 10
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
  11. 27
      app/src/mobile/res/layout/fragment_setting_player.xml

1
app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
Unescape View File

@ -295,6 +295,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
@Override
public void setDoh(Doh doh) {
ExoUtil.reset();
OkHttp.get().setDoh(doh);
Notify.progress(getActivity());
Setting.putDoh(doh.toString());

11
app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
Unescape View File

@ -16,7 +16,6 @@ import com.fongmi.android.tv.impl.DanmuLineCallback;
import com.fongmi.android.tv.impl.DanmuSizeCallback;
import com.fongmi.android.tv.impl.SubtitleCallback;
import com.fongmi.android.tv.impl.UaCallback;
import com.fongmi.android.tv.player.ExoUtil;
import com.fongmi.android.tv.player.Players;
import com.fongmi.android.tv.ui.base.BaseActivity;
import com.fongmi.android.tv.ui.dialog.BufferDialog;
@ -37,7 +36,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
private String[] player;
private String[] render;
private String[] scale;
private String[] http;
public static void start(Activity activity) {
activity.startActivity(new Intent(activity, SettingPlayerActivity.class));
@ -64,7 +62,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.danmuSizeText.setText(format.format(Setting.getDanmuSize()));
mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(3)));
mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha()));
mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]);
mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]);
mBinding.playerText.setText((player = ResUtil.getStringArray(R.array.select_player))[Setting.getPlayer()]);
mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]);
@ -74,7 +71,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
@Override
protected void initEvent() {
mBinding.ua.setOnClickListener(this::onUa);
mBinding.http.setOnClickListener(this::setHttp);
mBinding.scale.setOnClickListener(this::setScale);
mBinding.buffer.setOnClickListener(this::onBuffer);
mBinding.player.setOnClickListener(this::setPlayer);
@ -103,13 +99,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
Setting.putUa(ua);
}
private void setHttp(View view) {
int index = Setting.getHttp();
Setting.putHttp(index = index == http.length - 1 ? 0 : ++index);
mBinding.httpText.setText(http[index]);
ExoUtil.reset();
}
private void setScale(View view) {
int index = Setting.getScale();
Setting.putScale(index = index == scale.length - 1 ? 0 : ++index);

29
app/src/leanback/res/layout/activity_setting_player.xml
Unescape View File

@ -114,35 +114,6 @@
tools:text="關" />
</LinearLayout>
<LinearLayout
android:id="@+id/http"
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_exo_http"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:id="@+id/httpText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="OkHttp" />
</LinearLayout>
</LinearLayout>
<LinearLayout

8
app/src/main/java/com/fongmi/android/tv/Setting.java
Unescape View File

@ -153,14 +153,6 @@ public class Setting {
Prefers.put("subtitle", subtitle);
}
public static int getHttp() {
return Prefers.getInt("exo_http", 1);
}
public static void putHttp(int http) {
Prefers.put("exo_http", http);
}
public static int getBuffer() {
return Math.min(Math.max(Prefers.getInt("exo_buffer"), 1), 10);
}

5
app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java
Unescape View File

@ -15,7 +15,6 @@ import androidx.media3.database.DatabaseProvider;
import androidx.media3.database.StandaloneDatabaseProvider;
import androidx.media3.datasource.DataSource;
import androidx.media3.datasource.DefaultDataSource;
import androidx.media3.datasource.DefaultHttpDataSource;
import androidx.media3.datasource.HttpDataSource;
import androidx.media3.datasource.cache.Cache;
import androidx.media3.datasource.cache.CacheDataSource;
@ -56,8 +55,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import okhttp3.Call;
public class ExoUtil {
private static HttpDataSource.Factory httpDataSourceFactory;
@ -184,7 +181,7 @@ public class ExoUtil {
}
private static synchronized HttpDataSource.Factory getHttpDataSourceFactory() {
if (httpDataSourceFactory == null) httpDataSourceFactory = Setting.getHttp() == 0 ? new DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true) : new OkHttpDataSource.Factory((Call.Factory) OkHttp.client());
if (httpDataSourceFactory == null) httpDataSourceFactory = new OkHttpDataSource.Factory(OkHttp.client());
return httpDataSourceFactory;
}

6
app/src/main/res/values-zh-rCN/strings.xml
Unescape View File

@ -89,7 +89,6 @@
<string name="player_danmu_alpha">弹幕透明</string>
<string name="player_background">后台播放</string>
<string name="player_exo_tunnel">隧道模式</string>
<string name="player_exo_http">连线方式</string>
<string name="player_exo_buffer">缓冲时间</string>
<string name="player_ua">User-Agent</string>
@ -176,11 +175,6 @@
<item>重播</item>
</string-array>
<string-array name="select_exo_http">
<item>预设</item>
<item>OkHttp</item>
</string-array>
<string-array name="select_caption">
<item>预设</item>
<item>系统</item>

6
app/src/main/res/values-zh-rTW/strings.xml
Unescape View File

@ -89,7 +89,6 @@
<string name="player_danmu_alpha">彈幕透明</string>
<string name="player_background">背景播放</string>
<string name="player_exo_tunnel">隧道模式</string>
<string name="player_exo_http">連線方式</string>
<string name="player_exo_buffer">緩衝時間</string>
<string name="player_ua">User-Agent</string>
@ -176,11 +175,6 @@
<item>重播</item>
</string-array>
<string-array name="select_exo_http">
<item>預設</item>
<item>OkHttp</item>
</string-array>
<string-array name="select_caption">
<item>預設</item>
<item>系統</item>

6
app/src/main/res/values/strings.xml
Unescape View File

@ -89,7 +89,6 @@
<string name="player_danmu_alpha">Danmu alpha</string>
<string name="player_background">Background play</string>
<string name="player_exo_tunnel">Tunnel mode</string>
<string name="player_exo_http">HTTP method</string>
<string name="player_exo_buffer">Buffer time</string>
<string name="player_ua">User-Agent</string>
@ -181,11 +180,6 @@
<item>Replay</item>
</string-array>
<string-array name="select_exo_http">
<item>Default</item>
<item>OkHttp</item>
</string-array>
<string-array name="select_caption">
<item>Default</item>
<item>System</item>

1
app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
Unescape View File

@ -299,6 +299,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
}
private void setDoh(Doh doh) {
ExoUtil.reset();
OkHttp.get().setDoh(doh);
Notify.progress(getActivity());
Setting.putDoh(doh.toString());

10
app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
Unescape View File

@ -42,7 +42,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
private String[] player;
private String[] render;
private String[] scale;
private String[] http;
public static SettingPlayerFragment newInstance() {
return new SettingPlayerFragment();
@ -69,7 +68,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.danmuSizeText.setText(format.format(Setting.getDanmuSize()));
mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(2)));
mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha()));
mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]);
mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]);
mBinding.playerText.setText((player = ResUtil.getStringArray(R.array.select_player))[Setting.getPlayer()]);
mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]);
@ -80,7 +78,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
@Override
protected void initEvent() {
mBinding.ua.setOnClickListener(this::onUa);
mBinding.http.setOnClickListener(this::setHttp);
mBinding.scale.setOnClickListener(this::onScale);
mBinding.buffer.setOnClickListener(this::onBuffer);
mBinding.player.setOnClickListener(this::setPlayer);
@ -110,13 +107,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
Setting.putUa(ua);
}
private void setHttp(View view) {
int index = Setting.getHttp();
Setting.putHttp(index = index == http.length - 1 ? 0 : ++index);
mBinding.httpText.setText(http[index]);
ExoUtil.reset();
}
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]);

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

@ -140,33 +140,6 @@
tools:text="關" />
</LinearLayout>
<LinearLayout
android:id="@+id/http"
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_exo_http"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/httpText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="OkHttp" />
</LinearLayout>
</LinearLayout>
<LinearLayout

Write Preview
Loading…
Cancel
Save