[mobile] display video title

pull/501/head
okjack 2 years ago
parent a83ceb81cb
commit 2b8608df88
  1. 8
      app/src/main/java/com/fongmi/android/tv/Setting.java
  2. 2
      app/src/main/res/values-zh-rCN/strings.xml
  3. 2
      app/src/main/res/values-zh-rTW/strings.xml
  4. 2
      app/src/main/res/values/strings.xml
  5. 3
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  6. 7
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  7. 9
      app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java
  8. 101
      app/src/mobile/res/layout/dialog_control.xml
  9. 2
      app/src/mobile/res/layout/view_control_vod.xml
  10. 28
      app/src/mobile/res/layout/view_widget_display.xml

@ -374,12 +374,12 @@ public class Setting {
Prefers.put("display_mini_progress", display);
}
public static boolean isDisplayVideoInformation() {
return Prefers.getBoolean("display_video_information", false);
public static boolean isDisplayVideoTitle() {
return Prefers.getBoolean("display_video_title", false);
}
public static void putDisplayVideoInformation(boolean display) {
Prefers.put("display_video_information", display);
public static void putDisplayVideoTitle(boolean display) {
Prefers.put("display_video_title", display);
}
public static float getPlaySpeed() {

@ -40,7 +40,7 @@
<string name="play_netspeed">网速</string>
<string name="play_duration">进度</string>
<string name="play_mini_progress">迷你进度</string>
<string name="play_video_information">影片/频道 资料</string>
<string name="play_video_title">标题</string>
<string name="play_danmu">弹幕</string>
<string name="play_display">屏显</string>
<string name="play_speed">倍速</string>

@ -40,7 +40,7 @@
<string name="play_netspeed">網速</string>
<string name="play_duration">進度</string>
<string name="play_mini_progress">迷你進度</string>
<string name="play_video_information">影片/頻道 資料</string>
<string name="play_video_title">標題</string>
<string name="play_danmu">彈幕</string>
<string name="play_display">屏顯</string>
<string name="play_speed">倍速</string>

@ -40,7 +40,7 @@
<string name="play_netspeed">Net Speed</string>
<string name="play_duration">Duration</string>
<string name="play_mini_progress">Mini Progress</string>
<string name="play_video_information">Video/Channel Info</string>
<string name="play_video_title">Title</string>
<string name="play_danmu">Danmu</string>
<string name="play_display">Display</string>
<string name="play_speed">Speed</string>

@ -545,6 +545,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom
mBinding.display.clock.setVisibility(Setting.isDisplayTime() && visible ? View.VISIBLE : View.GONE);
mBinding.display.netspeed.setVisibility(Setting.isDisplaySpeed() && visible ? View.VISIBLE : View.GONE);
mBinding.display.duration.setVisibility(View.GONE);
mBinding.display.titleLayout.setVisibility(Setting.isDisplayVideoTitle()&& visible ? View.VISIBLE : View.GONE);
}
private void onTimeChangeDisplaySpeed() {
@ -685,6 +686,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom
mChannel.loadLogo(mBinding.widget.logo);
mBinding.widget.name.setText(mChannel.getName());
mBinding.control.title.setText(mChannel.getName());
mBinding.display.title.setText(mChannel.getName());
mBinding.widget.namePip.setText(mChannel.getName());
mBinding.widget.line.setText(mChannel.getLineText());
mBinding.widget.number.setText(mChannel.getNumber());
@ -818,6 +820,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom
setTrackVisible(true);
checkPlayImg(mPlayers.isPlaying());
mBinding.control.size.setText(mPlayers.getSizeText());
mBinding.display.size.setText(mPlayers.getSizeText());
if (isVisible(mBinding.control.getRoot())) showControl();
break;
case Player.STATE_ENDED:

@ -583,6 +583,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
private void getPlayer(Flag flag, Episode episode, boolean replay) {
mBinding.control.title.setText(getString(R.string.detail_title, mBinding.name.getText(), episode.getName()));
mBinding.display.title.setText(mBinding.control.title.getText());
mViewModel.playerContent(getKey(), flag.getFlag(), episode.getUrl());
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
updateHistory(episode, replay);
@ -933,7 +934,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
mBinding.display.clock.setVisibility(Setting.isDisplayTime() && visible ? View.VISIBLE : View.GONE);
mBinding.display.netspeed.setVisibility(Setting.isDisplaySpeed() && visible ? View.VISIBLE : View.GONE);
mBinding.display.duration.setVisibility(Setting.isDisplayDuration() && visible ? View.VISIBLE : View.GONE);
mBinding.display.progress.setVisibility(Setting.isDisplayMiniProgress() && visible && (mPlayers.getDuration() > 60000) ? View.VISIBLE : View.GONE);
mBinding.display.progress.setVisibility(Setting.isDisplayMiniProgress() && visible && (mPlayers.isVod()) ? View.VISIBLE : View.GONE);
mBinding.display.titleLayout.setVisibility(Setting.isDisplayVideoTitle()&& visible ? View.VISIBLE : View.GONE);
}
private void onTimeChangeDisplaySpeed() {
@ -942,7 +944,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
long position = mPlayers.getPosition();
if (Setting.isDisplaySpeed() && visible) Traffic.setSpeed(mBinding.display.netspeed);
if (Setting.isDisplayDuration() && visible && position > 0) mBinding.display.duration.setText(mPlayers.getPositionTime(0) + "/" + mPlayers.getDurationTime());
if (Setting.isDisplayMiniProgress() && visible && position > 0 && (mPlayers.getDuration() > 60000)) mBinding.display.progress.setProgress((int)(position * 100 / mPlayers.getDuration()));
if (Setting.isDisplayMiniProgress() && visible && position > 0 && (mPlayers.isVod())) mBinding.display.progress.setProgress((int)(position * 100 / mPlayers.getDuration()));
showDisplayInfo();
}
@ -1267,6 +1269,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
checkPlayImg(mPlayers.isPlaying());
mHistory.setPlayer(mPlayers.getPlayer());
mBinding.control.size.setText(mPlayers.getSizeText());
mBinding.display.size.setText(mPlayers.getSizeText());
if (isVisible(mBinding.control.getRoot())) showControl();
break;
case Player.STATE_ENDED:

@ -99,6 +99,7 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis
binding.dpspeed.setActivated(Setting.isDisplaySpeed());
binding.dpduration.setActivated(Setting.isDisplayDuration());
binding.dpminiprogress.setActivated(Setting.isDisplayMiniProgress());
binding.dpvideotitle.setActivated(Setting.isDisplayVideoTitle());
setTrackVisible();
setScaleText();
setPlayer();
@ -125,6 +126,7 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis
binding.dpspeed.setOnClickListener(v -> displaySpeed());
binding.dpduration.setOnClickListener(v -> displayDuration());
binding.dpminiprogress.setOnClickListener(v -> displayMiniProgress());
binding.dpvideotitle.setOnClickListener(v -> displayVideoTitle());
}
private void displayTime() {
@ -155,6 +157,13 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis
binding.dpminiprogress.setActivated(!display);
}
private void displayVideoTitle() {
boolean display = Setting.isDisplayVideoTitle();
parent.display.titleLayout.setVisibility(!display ? View.VISIBLE : View.GONE);
Setting.putDisplayVideoTitle(!display);
binding.dpvideotitle.setActivated(!display);
}
private void onTimer(View view) {
App.post(() -> TimerDialog.create().show(activity), 200);
dismiss();

@ -256,61 +256,68 @@
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp" />
<LinearLayout
android:layout_width="wrap_content"
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/dptime"
android:fillViewport="true"
android:scrollbars="none">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_time"
android:textColor="@color/control"
android:textSize="14sp" />
android:orientation="horizontal">
<TextView
android:id="@+id/dpspeed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_netspeed"
android:textColor="@color/control"
android:textSize="14sp" />
<TextView
android:id="@+id/dptime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_time"
android:textColor="@color/control"
android:textSize="14sp" />
<TextView
android:id="@+id/dpduration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_duration"
android:textColor="@color/control"
android:textSize="14sp" />
<TextView
android:id="@+id/dpspeed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_netspeed"
android:textColor="@color/control"
android:textSize="14sp" />
<TextView
android:id="@+id/dpminiprogress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_accent"
android:text="@string/play_mini_progress"
android:textColor="@color/control"
android:textSize="14sp" />
<TextView
android:id="@+id/dpduration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_duration"
android:textColor="@color/control"
android:textSize="14sp" />
<TextView
android:id="@+id/dpvideoinformation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_video_information"
android:textColor="@color/control"
android:textSize="14sp" />
<TextView
android:id="@+id/dpminiprogress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_mini_progress"
android:textColor="@color/control"
android:textSize="14sp" />
</LinearLayout>
<TextView
android:id="@+id/dpvideotitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_accent"
android:text="@string/play_video_title"
android:textColor="@color/control"
android:textSize="14sp" />
</LinearLayout>
</HorizontalScrollView>
<TextView
android:id="@+id/other"

@ -104,7 +104,7 @@
android:layout_gravity="center"
android:textSize="8sp"
android:maxLength="5"
android:layout_marginTop="-4dp"
android:layout_marginTop="-2dp"
android:background="?attr/selectableItemBackgroundBorderless"
tools:text="20:00:00" />

@ -4,6 +4,34 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/titleLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:letterSpacing="0.02"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="慶餘年第一季:第一集" />
<TextView
android:id="@+id/size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="1920 x 1080" />
</LinearLayout>
<TextView
android:id="@+id/clock"
android:padding="8dp"

Loading…
Cancel
Save