From 84d94f1da947650c8da262963e5d22abab5fbae3 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 20 Oct 2023 11:45:33 +0800 Subject: [PATCH] Clean code --- .../android/tv/ui/activity/SettingActivity.java | 2 +- .../android/tv/ui/activity/VideoActivity.java | 3 +-- .../android/tv/ui/custom/dialog/ConfigDialog.java | 3 +-- .../java/com/fongmi/android/tv/utils/Utils.java | 12 ------------ .../android/tv/ui/activity/VideoActivity.java | 13 +++++++++---- .../android/tv/ui/fragment/SettingFragment.java | 3 +-- 6 files changed, 13 insertions(+), 23 deletions(-) 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 0b904f5a5..5f4f33e38 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 @@ -128,7 +128,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit @Override public void setConfig(Config config) { - if (config.getUrl().startsWith("file") && !Utils.hasPermission(this)) { + if (config.getUrl().startsWith("file") && !PermissionX.isGranted(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { PermissionX.init(this).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> load(config)); } else { load(config); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index d5b48610f..64b9bf902 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -79,7 +79,6 @@ import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Sniffer; import com.fongmi.android.tv.utils.Traffic; -import com.fongmi.android.tv.utils.Utils; import com.github.bassaer.library.MDColor; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Trans; @@ -152,7 +151,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List public static void file(FragmentActivity activity, String path) { if (TextUtils.isEmpty(path)) return; String name = new File(path).getName(); - if (Utils.hasPermission(activity)) start(activity, "push_agent", "file://" + path, name, true); + if (PermissionX.isGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) start(activity, "push_agent", "file://" + path, name, true); else PermissionX.init(activity).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> start(activity, "push_agent", "file://" + path, name, true)); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java index 3193240f8..1ab9ab208 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java @@ -24,7 +24,6 @@ import com.fongmi.android.tv.ui.custom.CustomTextListener; import com.fongmi.android.tv.utils.QRCode; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.UrlUtil; -import com.fongmi.android.tv.utils.Utils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.permissionx.guolindev.PermissionX; @@ -79,8 +78,8 @@ public class ConfigDialog implements DialogInterface.OnDismissListener { binding.text.setText(url = getUrl()); binding.code.setImageBitmap(QRCode.getBitmap(address, 200, 0)); binding.text.setSelection(TextUtils.isEmpty(url) ? 0 : url.length()); - binding.storage.setVisibility(Utils.hasPermission(activity) ? View.GONE : View.VISIBLE); binding.info.setText(ResUtil.getString(R.string.push_info, address).replace("，", "\n")); + binding.storage.setVisibility(PermissionX.isGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) ? View.GONE : View.VISIBLE); } private void initEvent() { diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java index ce2af2d3c..84708ba3e 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java @@ -1,6 +1,5 @@ package com.fongmi.android.tv.utils; -import android.Manifest; import android.app.Activity; import android.content.ClipboardManager; import android.content.Context; @@ -11,10 +10,7 @@ import android.view.Window; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; -import androidx.fragment.app.FragmentActivity; - import com.fongmi.android.tv.App; -import com.permissionx.guolindev.PermissionX; public class Utils { @@ -43,14 +39,6 @@ public class Utils { imm.hideSoftInputFromWindow(windowToken, 0); } - public static boolean isAutoRotate() { - return Settings.System.getInt(App.get().getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) == 1; - } - - public static boolean hasPermission(FragmentActivity activity) { - return PermissionX.isGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE); - } - public static CharSequence getClipText() { return ((ClipboardManager) App.get().getSystemService(Context.CLIPBOARD_SERVICE)).getText(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 67162fe22..9d7ebf616 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -10,6 +10,7 @@ import android.content.res.Configuration; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; +import android.provider.Settings; import android.support.v4.media.MediaMetadataCompat; import android.text.Html; import android.text.SpannableString; @@ -166,7 +167,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo public static void file(FragmentActivity activity, String path) { if (TextUtils.isEmpty(path)) return; String name = new File(path).getName(); - if (Utils.hasPermission(activity)) start(activity, "push_agent", "file://" + path, name); + if (PermissionX.isGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) start(activity, "push_agent", "file://" + path, name); else PermissionX.init(activity).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> start(activity, "push_agent", "file://" + path, name)); } @@ -256,6 +257,10 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo return getCallingActivity() != null && getCallingActivity().getShortClassName().contains(CollectActivity.class.getSimpleName()); } + private boolean isAutoRotate() { + return Settings.System.getInt(getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) == 1; + } + private boolean isLand() { return mBinding.getRoot().getTag().equals("land"); } @@ -932,7 +937,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo return ResUtil.isLand(this) ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT; } else if (isRotate()) { return ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT; - } else if (isPort() && Utils.isAutoRotate()) { + } else if (isPort() && isAutoRotate()) { return ActivityInfo.SCREEN_ORIENTATION_FULL_USER; } else { return ResUtil.isLand(this) ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT; @@ -1009,8 +1014,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void setOrient() { - if (isPort() && Utils.isAutoRotate()) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER); - if (isLand() && Utils.isAutoRotate()) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE); + if (isPort() && isAutoRotate()) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER); + if (isLand() && isAutoRotate()) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE); } private void setR1Callback() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index f4074efd0..5bc785631 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -40,7 +40,6 @@ import com.fongmi.android.tv.utils.FileChooser; import com.fongmi.android.tv.utils.FileUtil; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.ResUtil; -import com.fongmi.android.tv.utils.Utils; import com.github.catvod.bean.Doh; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Path; @@ -135,7 +134,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit @Override public void setConfig(Config config) { - if (config.getUrl().startsWith("file") && !Utils.hasPermission(getActivity())) { + if (config.getUrl().startsWith("file") && !PermissionX.isGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)) { PermissionX.init(this).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> load(config)); } else { load(config);