Merge pull request #71 from power721/feature/subtitle-text-size

预览窗口自动适应字幕大小
pull/73/head
Roinlong 3 years ago committed by GitHub
commit ecb3f6d532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      app/src/main/java/com/github/tvbox/osc/event/RefreshEvent.java
  2. 13
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  3. 10
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java

@ -18,6 +18,7 @@ public class RefreshEvent {
public static final int TYPE_PUSH_URL = 9;
public static final int TYPE_EPG_URL_CHANGE = 10;
public static final int TYPE_SETTING_SEARCH_TV = 11;
public static final int TYPE_SUBTITLE_SIZE_CHANGE = 12;
public int type;
public Object obj;

@ -47,6 +47,7 @@ import com.github.tvbox.osc.util.HawkConfig;
import com.github.tvbox.osc.util.LOG;
import com.github.tvbox.osc.util.MD5;
import com.github.tvbox.osc.util.SearchHelper;
import com.github.tvbox.osc.util.SubtitleHelper;
import com.github.tvbox.osc.viewmodel.SourceViewModel;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
@ -652,6 +653,7 @@ public class DetailActivity extends BaseActivity {
llPlayerFragmentContainer.setVisibility(View.VISIBLE);
llPlayerFragmentContainerBlock.setVisibility(View.VISIBLE);
llPlayerFragmentContainerBlock.requestFocus();
toggleSubtitleTextSize();
}
// startQuickSearch();
} else {
@ -934,5 +936,16 @@ public class DetailActivity extends BaseActivity {
tvSort.setFocusable(!fullWindows);
tvCollect.setFocusable(!fullWindows);
tvQuickSearch.setFocusable(!fullWindows);
toggleSubtitleTextSize();
}
void toggleSubtitleTextSize() {
int subtitleTextSize;
if (fullWindows) {
subtitleTextSize = SubtitleHelper.getTextSize(this);
} else {
subtitleTextSize = SubtitleHelper.getSubtitleTextAutoSize(this);
}
EventBus.getDefault().post(new RefreshEvent(RefreshEvent.TYPE_SUBTITLE_SIZE_CHANGE, subtitleTextSize));
}
}

@ -77,6 +77,8 @@ import com.obsez.android.lib.filechooser.ChooserDialog;
import com.orhanobut.hawk.Hawk;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import org.json.JSONObject;
@ -123,6 +125,13 @@ public class PlayFragment extends BaseLazyFragment {
return R.layout.activity_play;
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void refresh(RefreshEvent event) {
if (event.type == RefreshEvent.TYPE_SUBTITLE_SIZE_CHANGE) {
mController.mSubtitleView.setTextSize((int) event.obj);
}
}
@Override
protected void init() {
initView();
@ -131,6 +140,7 @@ public class PlayFragment extends BaseLazyFragment {
}
private void initView() {
EventBus.getDefault().register(this);
mHandler = new Handler(new Handler.Callback() {
@Override
public boolean handleMessage(@NonNull Message msg) {

Loading…
Cancel
Save