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 57cd0c6b3..32c845a5f 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 @@ -172,8 +172,8 @@ public class DetailActivity extends BaseActivity implements FlagAdapter.OnClickL @SuppressLint("ClickableViewAccessibility") protected void initEvent() { mBinding.control.seek.setListener(mPlayers); - /*mBinding.desc.setOnClickListener(view -> onDesc()); - mBinding.keep.setOnClickListener(view -> onKeep()); + mBinding.more.setOnClickListener(view -> onMore()); + /*mBinding.keep.setOnClickListener(view -> onKeep()); mBinding.video.setOnClickListener(view -> onVideo()); mBinding.control.text.setOnClickListener(this::onTrack); mBinding.control.audio.setOnClickListener(this::onTrack); @@ -384,6 +384,12 @@ public class DetailActivity extends BaseActivity implements FlagAdapter.OnClickL hideInfo(); } + private void onMore() { + boolean more = getString(R.string.vod_content_expand).equals(mBinding.more.getText().toString()); + mBinding.more.setText(more ? R.string.vod_content_collapse : R.string.vod_content_expand); + mBinding.content.setMaxLines(more ? Integer.MAX_VALUE : 4); + } + private void showProgress() { mBinding.widget.progress.setVisibility(View.VISIBLE); App.post(mR2, 0); diff --git a/app/src/mobile/res/layout/activity_detail.xml b/app/src/mobile/res/layout/activity_detail.xml index 4429674c9..df7b08e94 100644 --- a/app/src/mobile/res/layout/activity_detail.xml +++ b/app/src/mobile/res/layout/activity_detail.xml @@ -61,6 +61,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/video" + android:clipChildren="false" + android:clipToPadding="false" android:fillViewport="true" android:paddingTop="16dp" android:paddingBottom="16dp"> @@ -236,6 +238,18 @@ android:textSize="14sp" tools:text="一個身世神秘的少年范閒(張若昀飾),因對自身身世的好奇而離開故鄉澹州,前赴南慶京都。范閒在京中各大勢力之間遊走,以探查自己屢遭刺殺的原因。其間結識靖王世子、二皇子,與太子、長公主等人對抗,並遊歷四方、闖蕩江湖,卻意外發現這世界隱藏著的秘密。本劇第一季上半部主要描述范閒在南慶京都追查刺殺的幕後黑手,京中各式人等對范閒繼承內庫的態度和應對,以及監察院院長陳萍萍希望范閒接掌監察院所做的一切舉動。下半部劇情發生在北齊上京。南慶駐北齊上京諜報首領言冰雲被北齊官方抓獲,慶帝與陳萍萍同意用已被關在監察院大牢多年的前北魏諜報首領肖恩交換言冰雲,並派范閒親率南慶使團負責此事。" /> + + \ No newline at end of file diff --git a/app/src/mobile/res/layout/fragment_site.xml b/app/src/mobile/res/layout/fragment_site.xml index 09527b4bb..c19e2c40b 100644 --- a/app/src/mobile/res/layout/fragment_site.xml +++ b/app/src/mobile/res/layout/fragment_site.xml @@ -16,7 +16,8 @@ android:layout_marginEnd="16dp" android:text="@string/home_history" android:textColor="@color/white" - android:textSize="18sp" /> + android:textSize="18sp" + android:textStyle="bold" /> + android:textSize="18sp" + android:textStyle="bold" /> 最近观看 更新推荐 + + 展开 + 收起 + \ No newline at end of file diff --git a/app/src/mobile/res/values-zh-rTW/strings.xml b/app/src/mobile/res/values-zh-rTW/strings.xml index 4ec3bcdb6..a4462a918 100644 --- a/app/src/mobile/res/values-zh-rTW/strings.xml +++ b/app/src/mobile/res/values-zh-rTW/strings.xml @@ -9,4 +9,8 @@ 最近觀看 更新推薦 + + 展開 + 收起 + \ No newline at end of file diff --git a/app/src/mobile/res/values/strings.xml b/app/src/mobile/res/values/strings.xml index ed8ecb867..45183f37c 100644 --- a/app/src/mobile/res/values/strings.xml +++ b/app/src/mobile/res/values/strings.xml @@ -9,4 +9,8 @@ History Recommend + + Expand + Collapse + \ No newline at end of file