diff --git a/app/build.gradle b/app/build.gradle index 219c4767b..9aba5701a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 33 - versionCode 40 - versionName "1.4.0" + versionCode 41 + versionName "1.4.1" ndk { abiFilters "armeabi-v7a" } } 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 ed1a5631e..f799b2ebd 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 @@ -53,6 +53,7 @@ import com.fongmi.android.tv.utils.Prefers; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.ui.StyledPlayerView; +import com.google.android.exoplayer2.util.Log; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -266,7 +267,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void setFlagActivated(Vod.Flag item) { - if (item.isActivated()) return; + if (mFlagAdapter.size() == 0 || item.isActivated()) return; for (int i = 0; i < mFlagAdapter.size(); i++) ((Vod.Flag) mFlagAdapter.get(i)).setActivated(item); mBinding.flag.setSelectedPosition(mFlagAdapter.indexOf(item)); mEpisodeAdapter.setItems(item.getEpisodes(), null); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index f6b36ad71..a593d482d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -92,7 +92,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit } private void checkPermission() { - if (config.getUrl().startsWith("file/") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Environment.isExternalStorageManager()) { + if (config.getUrl().startsWith("file") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Environment.isExternalStorageManager()) { openSetting(); } else if (config.getUrl().startsWith("file") && Build.VERSION.SDK_INT < Build.VERSION_CODES.R && ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { launcherString.launch(Manifest.permission.READ_EXTERNAL_STORAGE);