Skip to content

Commit

Permalink
支持安卓4失败
Browse files Browse the repository at this point in the history 
This reverts commit 364e0fc.
  • Loading branch information
@watson1982
watson1982 committed Feb 27, 2024
1 parent f1b5c2e commit 1ab74f7
Show file tree
Hide file tree
Showing 49 changed files with 151 additions and 2,002 deletions.
123 changes: 57 additions & 66 deletions app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.content.DialogInterface;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
Expand Down Expand Up @@ -66,15 +65,15 @@ public class ModelSettingFragment extends BaseLazyFragment {
private TextView tvApi;
// Home Section
private TextView tvHomeApi;
private TextView tvHomeDefaultShow;
private TextView tvHomeDefaultShow;
private TextView tvHomeShow;
private TextView tvHomeIcon;
private TextView tvHomeRec;
private TextView tvHomeNum;

// Player Section
private TextView tvShowPreviewText;
private TextView tvScale;
private TextView tvScale;
private TextView tvPlay;
private TextView tvMediaCodec;
private TextView tvVideoPurifyText;
Expand Down Expand Up @@ -104,7 +103,7 @@ protected int getLayoutResID() {

@Override
protected void init() {
tvFastSearchText = findViewById(R.id.showFastSearchText);
tvFastSearchText = findViewById(R.id.showFastSearchText);
tvFastSearchText.setText(Hawk.get(HawkConfig.FAST_SEARCH_MODE, false) ? "已开启" : "已关闭");
tvDebugOpen = findViewById(R.id.tvDebugOpen);
tvDebugOpen.setText(Hawk.get(HawkConfig.DEBUG_OPEN, false) ? "开启" : "关闭");
Expand All @@ -123,7 +122,7 @@ protected void init() {
tvShowPreviewText = findViewById(R.id.showPreviewText);
tvShowPreviewText.setText(Hawk.get(HawkConfig.SHOW_PREVIEW, true) ? "开启" : "关闭");
tvScale = findViewById(R.id.tvScaleType);
tvScale.setText(PlayerHelper.getScaleName(Hawk.get(HawkConfig.PLAY_SCALE, 0)));
tvScale.setText(PlayerHelper.getScaleName(Hawk.get(HawkConfig.PLAY_SCALE, 0)));
tvPlay = findViewById(R.id.tvPlay);
tvPlay.setText(PlayerHelper.getPlayerName(Hawk.get(HawkConfig.PLAY_TYPE, 0)));
tvMediaCodec = findViewById(R.id.tvMediaCodec);
Expand All @@ -135,12 +134,8 @@ protected void init() {
// System Section
tvLocale = findViewById(R.id.tvLocale);
tvLocale.setText(getLocaleView(Hawk.get(HawkConfig.HOME_LOCALE, 0)));

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
tvTheme = findViewById(R.id.tvTheme);
tvTheme.setText(getThemeView(Hawk.get(HawkConfig.THEME_SELECT, 0)));
}

tvTheme = findViewById(R.id.tvTheme);
tvTheme.setText(getThemeView(Hawk.get(HawkConfig.THEME_SELECT, 0)));
tvRender = findViewById(R.id.tvRenderType);
tvRender.setText(PlayerHelper.getRenderName(Hawk.get(HawkConfig.PLAY_RENDER, 0)));
tvParseWebView = findViewById(R.id.tvParseWebView);
Expand All @@ -149,7 +144,7 @@ protected void init() {
tvSearchView.setText(getSearchView(Hawk.get(HawkConfig.SEARCH_VIEW, 0)));
tvDns = findViewById(R.id.tvDns);
tvDns.setText(OkGoHelper.dnsHttpsList.get(Hawk.get(HawkConfig.DOH_URL, 0)));
tvHomeDefaultShow = findViewById(R.id.tvHomeDefaultShow);
tvHomeDefaultShow = findViewById(R.id.tvHomeDefaultShow);
tvHomeDefaultShow.setText(Hawk.get(HawkConfig.HOME_DEFAULT_SHOW, false) ? "开启" : "关闭");

//takagen99 : Set HomeApi as default
Expand Down Expand Up @@ -430,7 +425,6 @@ public void click(String value, int pos) {
tvBgPlayType.setText(value);
Hawk.put(HawkConfig.BACKGROUND_PLAY_TYPE, pos);
}

@Override
public String getDisplay(String val) {
return val;
Expand All @@ -440,14 +434,13 @@ public String getDisplay(String val) {
public boolean areItemsTheSame(@NonNull @NotNull String oldItem, @NonNull @NotNull String newItem) {
return oldItem.equals(newItem);
}

@Override
public boolean areContentsTheSame(@NonNull @NotNull String oldItem, @NonNull @NotNull String newItem) {
return oldItem.equals(newItem);
}
}, bgPlayTypes, defaultBgPlayTypePos);
}, bgPlayTypes,defaultBgPlayTypePos);
dialog.show();
});
});
// Select PLAYER Type --------------------------------------------
findViewById(R.id.llPlay).setOnClickListener(new View.OnClickListener() {
@Override
Expand Down Expand Up @@ -787,58 +780,56 @@ public void onDismiss(DialogInterface dialog) {
}
});
// Select App Theme Color -------------------------------------
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
findViewById(R.id.llTheme).setOnClickListener(new View.OnClickListener() {
private final int chkTheme = Hawk.get(HawkConfig.THEME_SELECT, 0);
findViewById(R.id.llTheme).setOnClickListener(new View.OnClickListener() {
private final int chkTheme = Hawk.get(HawkConfig.THEME_SELECT, 0);

@Override
public void onClick(View v) {
FastClickCheckUtil.check(v);
int defaultPos = Hawk.get(HawkConfig.THEME_SELECT, 0);
ArrayList<Integer> types = new ArrayList<>();
types.add(0);
types.add(1);
types.add(2);
types.add(3);
types.add(4);
types.add(5);
types.add(6);
SelectDialog<Integer> dialog = new SelectDialog<>(mActivity);
dialog.setTip(getString(R.string.dia_theme));
dialog.setAdapter(null, new SelectDialogAdapter.SelectDialogInterface<Integer>() {
@Override
public void click(Integer value, int pos) {
Hawk.put(HawkConfig.THEME_SELECT, value);
tvTheme.setText(getThemeView(value));
}
@Override
public void onClick(View v) {
FastClickCheckUtil.check(v);
int defaultPos = Hawk.get(HawkConfig.THEME_SELECT, 0);
ArrayList<Integer> types = new ArrayList<>();
types.add(0);
types.add(1);
types.add(2);
types.add(3);
types.add(4);
types.add(5);
types.add(6);
SelectDialog<Integer> dialog = new SelectDialog<>(mActivity);
dialog.setTip(getString(R.string.dia_theme));
dialog.setAdapter(null, new SelectDialogAdapter.SelectDialogInterface<Integer>() {
@Override
public void click(Integer value, int pos) {
Hawk.put(HawkConfig.THEME_SELECT, value);
tvTheme.setText(getThemeView(value));
}

@Override
public String getDisplay(Integer val) {
return getThemeView(val);
}
}, new DiffUtil.ItemCallback<Integer>() {
@Override
public boolean areItemsTheSame(@NonNull @NotNull Integer oldItem, @NonNull @NotNull Integer newItem) {
return oldItem.intValue() == newItem.intValue();
}
@Override
public String getDisplay(Integer val) {
return getThemeView(val);
}
}, new DiffUtil.ItemCallback<Integer>() {
@Override
public boolean areItemsTheSame(@NonNull @NotNull Integer oldItem, @NonNull @NotNull Integer newItem) {
return oldItem.intValue() == newItem.intValue();
}

@Override
public boolean areContentsTheSame(@NonNull @NotNull Integer oldItem, @NonNull @NotNull Integer newItem) {
return oldItem.intValue() == newItem.intValue();
}
}, types, defaultPos);
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
if (chkTheme != Hawk.get(HawkConfig.THEME_SELECT, 0)) {
reloadActivity();
}
@Override
public boolean areContentsTheSame(@NonNull @NotNull Integer oldItem, @NonNull @NotNull Integer newItem) {
return oldItem.intValue() == newItem.intValue();
}
}, types, defaultPos);
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
if (chkTheme != Hawk.get(HawkConfig.THEME_SELECT, 0)) {
reloadActivity();
}
});
dialog.show();
}
});
}
}
});
dialog.show();
}
});
// About App -----------------------------------------------
findViewById(R.id.llAbout).setOnClickListener(new View.OnClickListener() {
@Override
Expand All @@ -848,8 +839,8 @@ public void onClick(View v) {
dialog.show();
}
});

findViewById(R.id.llHomeLive).setOnClickListener(new View.OnClickListener() {
findViewById(R.id.llHomeLive).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
FastClickCheckUtil.check(v);
Expand Down
21 changes: 0 additions & 21 deletions app/src/main/res/drawable-v21/button_detail_collect.xml
View file

This file was deleted.

18 changes: 0 additions & 18 deletions app/src/main/res/drawable-v21/button_home_sort_focus.xml
View file

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/drawable-v21/item_right_bg.xml
View file

This file was deleted.

19 changes: 0 additions & 19 deletions app/src/main/res/drawable-v21/play_progress_horizontal.xml
View file

This file was deleted.

19 changes: 0 additions & 19 deletions app/src/main/res/drawable-v21/play_progress_vertical.xml
View file

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/drawable-v21/set_hm.xml
View file

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/drawable-v21/set_play.xml
View file

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/drawable-v21/set_setting.xml
View file

This file was deleted.

27 changes: 0 additions & 27 deletions app/src/main/res/drawable-v21/shape_live_focus.xml
View file

This file was deleted.

27 changes: 0 additions & 27 deletions app/src/main/res/drawable-v21/shape_live_select.xml
View file

This file was deleted.

22 changes: 0 additions & 22 deletions app/src/main/res/drawable-v21/shape_player_control_vod_seek.xml
View file

This file was deleted.

1 comment on commit 1ab74f7

@cdn-stray
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PG的jar 玩偶哥哥 阿里云盘 不兼容了 播放不了

Please sign in to comment.