diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
index 7185f2a15..1ad785f3e 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
@@ -67,6 +67,10 @@ public class ApiConfig {
return get().getSite("push_agent") != null;
}
+ public static boolean hasParse() {
+ return get().getParses().size() > 0;
+ }
+
public ApiConfig init() {
this.ads = null;
this.wall = null;
diff --git a/app/src/main/res/layout/view_control_seek.xml b/app/src/main/res/layout/view_control_seek.xml
index 930398120..a7ab9f3e1 100644
--- a/app/src/main/res/layout/view_control_seek.xml
+++ b/app/src/main/res/layout/view_control_seek.xml
@@ -11,24 +11,25 @@
android:id="@+id/position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/grey_700"
+ android:textColor="@color/white"
android:textSize="14sp"
+ android:textStyle="bold"
tools:text="00:00:00" />
@@ -36,8 +37,9 @@
android:id="@+id/duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/grey_700"
+ android:textColor="@color/white"
android:textSize="14sp"
+ android:textStyle="bold"
tools:text="00:00:00" />
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index fe1d4546f..c4fe6c272 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -35,15 +35,16 @@
播放
- 下一集
- 上一集
+ 下集
+ 上集
准备播放:%s
字幕
音轨
视轨
反转
跨类
- 片头片尾
+ 片头
+ 片尾
倒序
→
←
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 48d03cc5b..0cbea364b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -35,15 +35,16 @@
播放
- 下一集
- 上一集
+ 下集
+ 上集
準備播放:%s
字幕
音軌
視軌
反轉
跨類
- 片頭片尾
+ 片頭
+ 片尾
倒序
→
←
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 28ea4d372..caf5d106a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,7 +43,8 @@
Video
Invert
Across
- OP&ED
+ OP
+ ED
Reverse
→
←
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index 990e5ddf6..4ce1bdf88 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -79,7 +79,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private boolean mInitAuto;
private boolean mAutoMode;
private boolean mUseParse;
- private boolean mLock;
private boolean mStop;
private boolean mLand;
private int mCurrent;
@@ -201,7 +200,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
mBinding.control.text.setOnClickListener(this::onTrack);
mBinding.control.audio.setOnClickListener(this::onTrack);
mBinding.control.video.setOnClickListener(this::onTrack);
- mBinding.control.lock.setOnClickListener(view -> onLock());
mBinding.control.full.setOnClickListener(view -> onFull());
mBinding.control.next.setOnClickListener(view -> checkNext());
mBinding.control.prev.setOnClickListener(view -> checkPrev());
@@ -264,8 +262,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
mViewModel = new ViewModelProvider(this).get(SiteViewModel.class);
//mViewModel.search.observe(this, result -> setSearch(result.getList()));
mViewModel.player.observe(this, result -> {
- setUseParse(result.getPlayUrl().isEmpty() && ApiConfig.get().getFlags().contains(result.getFlag()) || result.getJx() == 1);
- mBinding.control.parseLayout.setVisibility(mParseAdapter.getItemCount() > 0 && isUseParse() ? View.VISIBLE : View.GONE);
+ setUseParse(ApiConfig.hasParse() && ((result.getPlayUrl().isEmpty() && ApiConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1));
+ mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE);
int timeout = getSite().isChangeable() ? Constant.TIMEOUT_PLAY : -1;
mPlayers.start(result, isUseParse(), timeout);
});
@@ -402,13 +400,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
hideControl();
}
- private void onLock() {
- setR1Callback();
- setLock(!isLock());
- mBinding.control.lock.setImageResource(isLock() ? R.drawable.ic_lock_on : R.drawable.ic_lock_off);
- setRequestedOrientation(isLock() ? (ResUtil.isLand(this) ? ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT) : ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
- }
-
private void onFull() {
setR1Callback();
toggleFullscreen();
@@ -509,7 +500,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private boolean onEndingReset() {
mHistory.setEnding(0);
- mBinding.control.ending.setText(mPlayers.stringToTime(mHistory.getEnding()));
+ mBinding.control.ending.setText(R.string.play_ed);
setR1Callback();
return true;
}
@@ -525,7 +516,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private boolean onOpeningReset() {
mHistory.setOpening(0);
- mBinding.control.opening.setText(mPlayers.stringToTime(mHistory.getOpening()));
+ mBinding.control.opening.setText(R.string.play_op);
setR1Callback();
return true;
}
@@ -589,8 +580,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
}
private void showControl() {
- mBinding.control.parseLayout.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE);
- mBinding.control.actionLayout.setVisibility(isFullscreen() ? View.VISIBLE : View.GONE);
+ mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE);
+ mBinding.control.action.setVisibility(isFullscreen() ? View.VISIBLE : View.GONE);
mBinding.control.getRoot().setVisibility(View.VISIBLE);
setR1Callback();
}
@@ -630,8 +621,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
mHistory = mHistory == null ? createHistory(item) : mHistory;
onItemClick(mHistory.getFlag());
if (mHistory.isRevSort()) reverseEpisode();
- mBinding.control.opening.setText(mPlayers.stringToTime(mHistory.getOpening()));
- mBinding.control.ending.setText(mPlayers.stringToTime(mHistory.getEnding()));
+ mBinding.control.opening.setText(mHistory.getOpening() == 0 ? getString(R.string.play_op) : mPlayers.stringToTime(mHistory.getOpening()));
+ mBinding.control.ending.setText(mHistory.getEnding() == 0 ? getString(R.string.play_ed) : mPlayers.stringToTime(mHistory.getEnding()));
mBinding.control.speed.setText(mPlayers.setSpeed(mHistory.getSpeed()));
mPlayers.setPlayer(getPlayer());
setScale(getScale());
@@ -751,8 +742,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
}
private void onPause(boolean visible) {
- mBinding.widget.exoDuration.setText(mPlayers.getDurationTime());
- mBinding.widget.exoPosition.setText(mPlayers.getPositionTime(0));
if (visible) showInfo();
else hideInfo();
mPlayers.pause();
@@ -803,14 +792,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
this.mUseParse = useParse;
}
- public boolean isLock() {
- return mLock;
- }
-
- public void setLock(boolean lock) {
- this.mLock = lock;
- }
-
public boolean isStop() {
return mStop;
}
diff --git a/app/src/mobile/res/drawable/ic_full_off.xml b/app/src/mobile/res/drawable/ic_full_off.xml
index 0400cb942..57b6398b5 100644
--- a/app/src/mobile/res/drawable/ic_full_off.xml
+++ b/app/src/mobile/res/drawable/ic_full_off.xml
@@ -1,7 +1,7 @@
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_parse.xml b/app/src/mobile/res/layout/adapter_parse.xml
index 643654be6..b669402db 100644
--- a/app/src/mobile/res/layout/adapter_parse.xml
+++ b/app/src/mobile/res/layout/adapter_parse.xml
@@ -4,7 +4,7 @@
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:gravity="center"
android:textColor="@color/text"
android:textSize="14sp"
diff --git a/app/src/mobile/res/layout/view_control_vod.xml b/app/src/mobile/res/layout/view_control_vod.xml
index d69192f69..da7aa44f2 100644
--- a/app/src/mobile/res/layout/view_control_vod.xml
+++ b/app/src/mobile/res/layout/view_control_vod.xml
@@ -4,19 +4,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:background="@drawable/shape_controller"
android:orientation="vertical"
- android:paddingStart="16dp"
- android:paddingTop="4dp"
- android:paddingEnd="16dp"
- android:paddingBottom="4dp">
+ android:paddingStart="12dp"
+ android:paddingEnd="12dp"
+ android:paddingBottom="6dp">
@@ -26,20 +23,12 @@
android:gravity="center_vertical"
android:orientation="horizontal">
-
-
@@ -49,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:text="@string/play_prev"
android:textColor="@color/white"
android:textSize="14sp" />
@@ -59,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="刷新" />
@@ -69,7 +58,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="EXO" />
@@ -79,7 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="硬解" />
@@ -89,7 +78,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="1.00" />
@@ -99,7 +88,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="預設" />
@@ -109,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:tag="3"
android:text="@string/play_track_text"
android:textColor="@color/white"
@@ -122,7 +111,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:tag="1"
android:text="@string/play_track_audio"
android:textColor="@color/white"
@@ -135,7 +124,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:tag="2"
android:text="@string/play_track_video"
android:textColor="@color/white"
@@ -143,20 +132,12 @@
android:visibility="gone"
tools:visibility="visible" />
-
-
@@ -165,7 +146,7 @@
android:id="@+id/ending"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/shape_text"
+ android:background="@drawable/shape_action"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="00:00" />
@@ -173,33 +154,16 @@
-
-
-
-
-
-
-
+ tools:itemCount="1"
+ tools:listitem="@layout/adapter_parse"
+ tools:visibility="visible" />
-
-
diff --git a/app/src/mobile/res/layout/view_widget_vod.xml b/app/src/mobile/res/layout/view_widget_vod.xml
index e00b4d686..be45d213d 100644
--- a/app/src/mobile/res/layout/view_widget_vod.xml
+++ b/app/src/mobile/res/layout/view_widget_vod.xml
@@ -66,7 +66,7 @@
android:layout_gravity="center"
android:orientation="vertical"
android:visibility="gone"
- tools:visibility="visible">
+ tools:visibility="gone">
@@ -122,7 +122,7 @@
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone"
- tools:visibility="gone">
+ tools:visibility="visible">
-
-
-
-
-
-
-
-
-
\ No newline at end of file