diff --git a/app/src/main/java/com/fongmi/tv/bean/Func.java b/app/src/leanback/java/com/fongmi/tv/bean/Func.java similarity index 100% rename from app/src/main/java/com/fongmi/tv/bean/Func.java rename to app/src/leanback/java/com/fongmi/tv/bean/Func.java diff --git a/app/src/main/java/com/fongmi/tv/ApiConfig.java b/app/src/main/java/com/fongmi/tv/ApiConfig.java index 9dd923c95..6b64ad306 100644 --- a/app/src/main/java/com/fongmi/tv/ApiConfig.java +++ b/app/src/main/java/com/fongmi/tv/ApiConfig.java @@ -11,9 +11,7 @@ import com.fongmi.tv.net.Callback; import com.fongmi.tv.net.OKHttp; import com.fongmi.tv.utils.FileUtil; import com.fongmi.tv.utils.Json; -import com.fongmi.tv.utils.Notify; import com.fongmi.tv.utils.Prefers; -import com.fongmi.tv.utils.Utils; import com.github.catvod.crawler.JarLoader; import com.github.catvod.crawler.Spider; import com.google.gson.Gson; @@ -65,10 +63,6 @@ public class ApiConfig { } public void loadConfig(Callback callback) { - if (Utils.isPhone()) { - Notify.show(R.string.error_device); - return; - } new Thread(() -> { String url = Prefers.getUrl(); if (url.startsWith("file://")) getFileConfig(url, callback); diff --git a/app/src/main/java/com/fongmi/tv/utils/Utils.java b/app/src/main/java/com/fongmi/tv/utils/Utils.java index bca803036..9c9152647 100644 --- a/app/src/main/java/com/fongmi/tv/utils/Utils.java +++ b/app/src/main/java/com/fongmi/tv/utils/Utils.java @@ -4,7 +4,6 @@ import android.app.Activity; import android.app.PictureInPictureParams; import android.content.Context; import android.content.pm.PackageManager; -import android.content.res.Configuration; import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; @@ -59,8 +58,4 @@ public class Utils { if (snifferMatch.matcher(url).find()) return !url.contains("cdn-tos") || (!url.contains(".js") && !url.contains(".css")); return false; } - - public static boolean isPhone() { - return (App.get().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) < Configuration.SCREENLAYOUT_SIZE_LARGE; - } } diff --git a/app/src/main/res/drawable-hdpi/ic_img_error.png b/app/src/main/res/drawable-hdpi/ic_img_error.png new file mode 100644 index 000000000..dcd7f8b61 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_img_error.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_img_loading.png b/app/src/main/res/drawable-hdpi/ic_img_loading.png new file mode 100644 index 000000000..e20e1ec18 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_img_loading.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_img_error.png b/app/src/main/res/drawable-mdpi/ic_img_error.png new file mode 100644 index 000000000..6fd325f0e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_img_error.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_img_loading.png b/app/src/main/res/drawable-mdpi/ic_img_loading.png new file mode 100644 index 000000000..e5cbfa38d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_img_loading.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_img_error.png b/app/src/main/res/drawable-xhdpi/ic_img_error.png new file mode 100644 index 000000000..b317b1a79 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_img_error.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_img_loading.png b/app/src/main/res/drawable-xhdpi/ic_img_loading.png new file mode 100644 index 000000000..7e3d947d1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_img_loading.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_img_error.png b/app/src/main/res/drawable-xxhdpi/ic_img_error.png new file mode 100644 index 000000000..cb954a44d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_img_error.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_img_loading.png b/app/src/main/res/drawable-xxhdpi/ic_img_loading.png new file mode 100644 index 000000000..079f67365 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_img_loading.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_img_error.png b/app/src/main/res/drawable-xxxhdpi/ic_img_error.png new file mode 100644 index 000000000..3cf8315d3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_img_error.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png b/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png new file mode 100644 index 000000000..04af817a7 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png differ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e02514e72..b52ebf5f5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -46,7 +46,6 @@ 请输入配置接口 - 仅支援电视 配置取得失败 配置解析失败 已经是最后一集了! diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 654f3eb77..5682f69c8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -46,7 +46,6 @@ 請輸入配置接口 - 僅支援電視 配置取得失敗 配置解析失敗 已經是最後一集了! diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ff5a0b50..8bdcd0021 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,7 +46,6 @@ Please enter the configuration url - TV only Configuration get failed Configuration parse failed It\'s the last episode! diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml new file mode 100644 index 000000000..de4420427 --- /dev/null +++ b/app/src/mobile/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/mobile/java/com/fongmi/tv/ui/activity/SplashActivity.java b/app/src/mobile/java/com/fongmi/tv/ui/activity/SplashActivity.java new file mode 100644 index 000000000..05033b81e --- /dev/null +++ b/app/src/mobile/java/com/fongmi/tv/ui/activity/SplashActivity.java @@ -0,0 +1,53 @@ +package com.fongmi.tv.ui.activity; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.annotation.SuppressLint; +import android.view.View; + +import androidx.viewbinding.ViewBinding; + +import com.fongmi.tv.ApiConfig; +import com.fongmi.tv.databinding.ActivitySplashBinding; +import com.fongmi.tv.net.Callback; + +@SuppressLint("CustomSplashScreen") +public class SplashActivity extends BaseActivity { + + private ActivitySplashBinding mBinding; + + @Override + protected ViewBinding getBinding() { + return mBinding = ActivitySplashBinding.inflate(getLayoutInflater()); + } + + @Override + protected void initView() { + mBinding.title.animate().alpha(1).setDuration(2000).setListener(onAnimationEnd()).start(); + } + + private AnimatorListenerAdapter onAnimationEnd() { + return new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + mBinding.title.setVisibility(View.GONE); + mBinding.info.animate().alpha(1).setDuration(500).start(); + loadConfig(); + } + }; + } + + private void loadConfig() { + ApiConfig.get().init().loadConfig(new Callback() { + @Override + public void success() { + + } + + @Override + public void error(int resId) { + + } + }); + } +} diff --git a/app/src/mobile/res/drawable-nodpi/wallpaper_1.jpg b/app/src/mobile/res/drawable-nodpi/wallpaper_1.jpg new file mode 100644 index 000000000..9c1f28b56 Binary files /dev/null and b/app/src/mobile/res/drawable-nodpi/wallpaper_1.jpg differ diff --git a/app/src/mobile/res/layout/activity_splash.xml b/app/src/mobile/res/layout/activity_splash.xml new file mode 100644 index 000000000..97f5b07c8 --- /dev/null +++ b/app/src/mobile/res/layout/activity_splash.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + \ No newline at end of file