diff --git a/app/build.gradle b/app/build.gradle index 31aa91943..367b87000 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,12 +21,12 @@ android { leanback { dimension "mode" versionCode 200 - versionName "20230630#3" + versionName "20230630#4" } mobile { dimension "mode" versionCode 200 - versionName "20230630#3" + versionName "20230630#4" } java { dimension "api" diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 514d3ddd0..9de7f2331 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -355,7 +355,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void checkId() { - if (TextUtils.isEmpty(getId())) setEmpty(); + if (TextUtils.isEmpty(getId()) || getId().startsWith("msearch:")) setEmpty(); else getDetail(); } 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 46617acb8..b78a946f8 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 @@ -10,6 +10,7 @@ import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; import android.text.Html; +import android.text.TextUtils; import android.util.TypedValue; import android.view.MotionEvent; import android.view.View; @@ -221,7 +222,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust mBinding.swipeLayout.setRefreshing(true); getIntent().putExtras(intent); setOrient(); - getDetail(); + checkId(); } @Override @@ -245,7 +246,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust setVideoView(); setViewModel(); showProgress(); - getDetail(); + checkId(); } @Override @@ -344,6 +345,11 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust }); } + private void checkId() { + if (TextUtils.isEmpty(getId()) || getId().startsWith("msearch:")) setEmpty(); + else getDetail(); + } + private void getDetail() { mViewModel.detailContent(getKey(), getId()); }