diff --git a/app/build.gradle b/app/build.gradle index 519943c7d..dfe6a8865 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { mobile { dimension "mode" versionCode 6 - versionName "20230311#2" + versionName "20230311#3" } java { dimension = "api" diff --git a/app/src/leanback/java/com/fongmi/android/tv/Product.java b/app/src/leanback/java/com/fongmi/android/tv/Product.java index abbf45432..a7138bc83 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Product.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Product.java @@ -12,4 +12,8 @@ public class Product { public static void bootLive() { LiveActivity.start(App.activity()); } + + public static int getEms() { + return Math.min(getScreenWidth() / sp2px(24), 35); + } } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java index 0766a7971..09c7f481d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java @@ -37,7 +37,7 @@ public class EpisodePresenter extends Presenter { Vod.Flag.Episode item = (Vod.Flag.Episode) object; ViewHolder holder = (ViewHolder) viewHolder; holder.binding.text.setText(item.getName()); - holder.binding.text.setMaxEms(ResUtil.getEms()); + holder.binding.text.setMaxEms(Product.getEms()); holder.binding.text.setNextFocusDownId(nextFocus); holder.binding.text.setActivated(item.isActivated()); setOnClickListener(holder, view -> mListener.onItemClick(item)); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/PartPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/PartPresenter.java index 053359db0..6a2c3c497 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/PartPresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/PartPresenter.java @@ -36,7 +36,7 @@ public class PartPresenter extends Presenter { String text = object.toString(); ViewHolder holder = (ViewHolder) viewHolder; holder.binding.text.setText(text); - holder.binding.text.setMaxEms(ResUtil.getEms()); + holder.binding.text.setMaxEms(Product.getEms()); holder.binding.text.setNextFocusUpId(nextFocus); setOnClickListener(holder, view -> mListener.onItemClick(text)); } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java index de9c5e555..69e970dbf 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java @@ -86,10 +86,6 @@ public class ResUtil { return activity.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT; } - public static int getEms() { - return Math.min(getScreenWidth() / sp2px(24), 35); - } - public static int sp2px(int sp) { return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, getDisplayMetrics()); } 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 dd3e6c9ef..9a762bef6 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 @@ -206,6 +206,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis @SuppressLint("ClickableViewAccessibility") protected void initEvent() { mBinding.control.seek.setListener(mPlayers); + mBinding.name.setOnClickListener(view -> onName()); mBinding.more.setOnClickListener(view -> onMore()); mBinding.reverse.setOnClickListener(view -> onReverse()); mBinding.control.full.setOnClickListener(view -> onFull()); @@ -300,6 +301,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void getDetail(Vod item) { getIntent().putExtra("key", item.getSiteKey()); getIntent().putExtra("id", item.getVodId()); + mBinding.scroll.scrollTo(0, 0); Clock.get().setCallback(null); mPlayers.stop(); hideProgress(); @@ -412,6 +414,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis if (scroll) mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition()); } + private void onName() { + String name = mBinding.name.getText().toString(); + Notify.show(getString(R.string.detail_search, name)); + initSearch(name, false); + } + private void onMore() { boolean more = getString(R.string.detail_content_expand).equals(mBinding.more.getText().toString()); mBinding.more.setText(more ? R.string.detail_content_collapse : R.string.detail_content_expand); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java index 471f37500..cc9571fa1 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java @@ -70,7 +70,7 @@ public class EpisodeAdapter extends RecyclerView.Adapter mListener.onItemClick(item)); } diff --git a/app/src/mobile/res/drawable/shape_widget.xml b/app/src/mobile/res/drawable/shape_widget.xml index df2f93c22..a96772220 100644 --- a/app/src/mobile/res/drawable/shape_widget.xml +++ b/app/src/mobile/res/drawable/shape_widget.xml @@ -7,9 +7,9 @@ + android:top="4dp" /> \ No newline at end of file diff --git a/app/src/mobile/res/layout/activity_detail.xml b/app/src/mobile/res/layout/activity_detail.xml index 9a7edbc9a..c9371dd44 100644 --- a/app/src/mobile/res/layout/activity_detail.xml +++ b/app/src/mobile/res/layout/activity_detail.xml @@ -64,6 +64,7 @@ android:layout_below="@+id/video"> diff --git a/app/src/mobile/res/layout/adapter_episode.xml b/app/src/mobile/res/layout/adapter_episode.xml index 6d6cf3e74..5b215c3eb 100644 --- a/app/src/mobile/res/layout/adapter_episode.xml +++ b/app/src/mobile/res/layout/adapter_episode.xml @@ -7,6 +7,8 @@ android:background="@drawable/shape_item" android:ellipsize="marquee" android:gravity="center" + android:maxEms="10" + android:singleLine="true" android:textColor="@color/text" android:textSize="14sp" tools:text="20" /> \ No newline at end of file diff --git a/app/src/mobile/res/layout/view_widget_vod.xml b/app/src/mobile/res/layout/view_widget_vod.xml index 22417a3f1..2c02c0b3a 100644 --- a/app/src/mobile/res/layout/view_widget_vod.xml +++ b/app/src/mobile/res/layout/view_widget_vod.xml @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|center" - android:layout_marginTop="16dp" + android:layout_marginTop="24dp" android:background="@drawable/shape_widget" android:gravity="center" android:orientation="horizontal" @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|center" - android:layout_marginTop="16dp" + android:layout_marginTop="24dp" android:src="@drawable/ic_widget_forward" android:visibility="gone" /> @@ -99,7 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|center" - android:layout_marginTop="16dp" + android:layout_marginTop="24dp" android:background="@drawable/shape_widget" android:gravity="center" android:orientation="horizontal" @@ -127,7 +127,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|center" - android:layout_marginTop="16dp" + android:layout_marginTop="24dp" android:background="@drawable/shape_widget" android:gravity="center" android:orientation="horizontal" diff --git a/app/src/mobile/res/values-zh-rCN/strings.xml b/app/src/mobile/res/values-zh-rCN/strings.xml index 8d0d3b162..4b1f588ea 100644 --- a/app/src/mobile/res/values-zh-rCN/strings.xml +++ b/app/src/mobile/res/values-zh-rCN/strings.xml @@ -8,7 +8,6 @@ 首页 最近观看 更新推荐 - 是否开启「%s」? 线路 @@ -16,5 +15,6 @@ 简介 展开 收起 + 快搜“%s \ 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 1de833167..726e7ca89 100644 --- a/app/src/mobile/res/values-zh-rTW/strings.xml +++ b/app/src/mobile/res/values-zh-rTW/strings.xml @@ -8,7 +8,6 @@ 首頁 最近觀看 更新推薦 - 是否開啟「%s」? 線路 @@ -16,5 +15,6 @@ 簡介 展開 收起 + 快搜「%s \ 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 ccdef2fa3..efd758f49 100644 --- a/app/src/mobile/res/values/strings.xml +++ b/app/src/mobile/res/values/strings.xml @@ -8,7 +8,6 @@ Home History Recommend - Open %s ? Flag @@ -16,5 +15,6 @@ Summary Expand Collapse + Searching %s \ No newline at end of file