合并累积更新 版本:2.63

README.md

@@ -13,6 +13,9 @@
         <a href="https://img.shields.io/badge/Android-5.0%2B-brightgreen" style="text-decoration:none" >
             <img src="https://img.shields.io/badge/Android-5.0%2B-brightgreen" alt="Android version"/>
         </a>
+        <a href="https://pd.qq.com/s/1cii5y637" style="text-decoration:none" >
+            <img src="https://img.shields.io/badge/QQ-频道-red" alt="GitHub license"/>
+        </a>
         <a href="https://discord.com/invite/K5GN7FaQuX" style="text-decoration:none" >
             <img src="https://img.shields.io/discord/1201109322936090637?logo=discord" alt="GitHub license"/>
         </a>
@@ -61,7 +64,7 @@
 * #### ⭐**Star**鼓励开发者
 * #### 👁️Watch关注开发进度
 * #### 📇Pull requests(**请尽量贴合项目的源码和commit风格**)
-* #### 💡加入[群组](https://discord.com/invite/K5GN7FaQuX)讨论反馈
+* #### 💡加入[群组](https://pd.qq.com/s/1cii5y637)讨论反馈
 
 ## 安全说明
 

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />

app/src/main/java/com/su/mediabox/App.kt

@@ -3,6 +3,8 @@ package com.su.mediabox
 import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.webkit.WebView
 import com.liulishuo.filedownloader.FileDownloader
@@ -83,6 +85,7 @@ class App : Application() {
     companion object {
         @SuppressLint("StaticFieldLeak")
         lateinit var context: Context
+        val mainHandler = Handler(Looper.getMainLooper())
 
         init {
             // 防止内存泄漏

app/src/main/java/com/su/mediabox/config/Const.kt

@@ -31,7 +31,7 @@ interface Const {
                 "https://ryensx.github.io/MediaBoxPluginRepository/"
             const val GITHUB_PLUGIN_REPO_DEV_DOC_URL = "https://github.com/RyensX/MediaBox/wiki"
             const val USER_NOTICE_VERSION = 2
-            const val GROUP_URL = "https://discord.com/invite/K5GN7FaQuX"
+            const val GROUP_URL = "https://pd.qq.com/s/1cii5y637"
             const val ANNOUNCEMENT="https://raw.githubusercontent.com/RyensX/MediaBox/dev/doc/announcement.json"
 
             val licenses = listOf(

app/src/main/java/com/su/mediabox/net/DnsServer.kt

@@ -29,7 +29,7 @@ object DnsServer {
         override fun equals(other: Any?): Boolean {
             return when (other) {
                 null -> false
-                other === this -> true
+                (other === this) -> true
                 is String -> other == dnsServer
                 is Dns -> other.dnsServer == this.dnsServer && other.dnsName == this.dnsName
                 else -> false

app/src/main/java/com/su/mediabox/plugin/Plugin.kt

@@ -40,6 +40,8 @@ import java.io.File
 
 object PluginManager {
 
+    private const val TAG = "PluginManager"
+
     val appApiVersion by unsafeLazy {
         val appInfo: ApplicationInfo = App.context.packageManager
             .getApplicationInfo(
@@ -284,7 +286,7 @@ object PluginManager {
      * @param pluginInfo 至少要保证包含有效[PluginInfo.sourcePath]（作为下载地址）
      * @param directInstall 直接下载安装，一般只用于官方仓库插件，不经安装器验证直接安装
      */
-    fun downloadPlugin(pluginInfo: PluginInfo, directInstall: Boolean = false) {
+    fun downloadPlugin(pluginInfo: PluginInfo, directInstall: Boolean = false) = runCatching {
         val downloadManager =
             App.context.getSystemService(AppCompatActivity.DOWNLOAD_SERVICE) as DownloadManager
         val uri: Uri = Uri
@@ -302,6 +304,10 @@ object PluginManager {
             setAllowedOverRoaming(true)
         }
         downloadManager.enqueue(request)
+    }.onFailure {
+        logE(TAG, "downloadPlugin: error=${it.message} directInstall=$directInstall pluginInfo=$pluginInfo")
+        "插件下载失败: ${it.message}".showToast()
+        it.printStackTrace()
     }
 
     fun initPluginEnv() {

app/src/main/java/com/su/mediabox/util/Activity.kt

@@ -29,12 +29,12 @@ fun <T : Action> putAction(action: T) {
 }
 
 @Suppress("UNCHECKED_CAST")
-fun <T : Action> getActionIns(actionClass: Class<T>): T? =
+fun <T : Action> consumeActionIns(actionClass: Class<T>): T? =
     (actionPoolMap[actionClass.simpleName] as? T)?.also {
         actionPoolMap.remove(actionClass.simpleName)
     }
 
-inline fun <reified T : Action> getAction(): T? = getActionIns(T::class.java)
+inline fun <reified T : Action> consumeAction(): T? = consumeActionIns(T::class.java)
 
 fun <VB : ViewBinding> Activity.viewBind(inflater: (LayoutInflater) -> VB) =
     lazy(LazyThreadSafetyMode.NONE) {

app/src/main/java/com/su/mediabox/util/CoroutineUtil.kt

@@ -52,10 +52,10 @@ private class ViewCoroutineInterceptor(
     private class ViewStateListener(private val view: View, private val job: Job) :
         View.OnAttachStateChangeListener, CompletionHandler {
 
-        override fun onViewAttachedToWindow(v: View?) {}
+        override fun onViewAttachedToWindow(v: View) {}
 
         //在Recyclerview上使用LinearLayoutManager可能并不会调用，取决于mRecycleChildrenOnDetach，因此必须手动调用setRecycleChildrenOnDetach(true)
-        override fun onViewDetachedFromWindow(v: View?) {
+        override fun onViewDetachedFromWindow(v: View) {
             logD("View协程", "分离视图->取消")
             view.removeOnAttachStateChangeListener(this)
             job.cancel()

app/src/main/java/com/su/mediabox/util/coil/CoilUtil.kt

@@ -53,6 +53,7 @@ object CoilUtil {
             logE("loadImage", "图片来源有误！")
             return@runCatching
         }
+        logD("加载图片","url=$urlOrBase64")
         val time = System.currentTimeMillis()
         when {
             urlOrBase64.startsWith("data:image") -> {
@@ -90,10 +91,10 @@ object CoilUtil {
                         ?.let {
                             addHeader("Referer", it)
                         }
-                    addHeader("Host", URL(urlOrBase64).host)
-                    addHeader("Accept", "*/*")
-                    addHeader("Accept-Encoding", "gzip, deflate")
-                    addHeader("Connection", "keep-alive")
+//                    addHeader("Host", URL(urlOrBase64).host)
+//                    addHeader("Accept", "*/*")
+//                    addHeader("Accept-Encoding", "gzip, deflate")
+//                    addHeader("Connection", "keep-alive")
                     addHeader("User-Agent", Constant.Request.getRandomUserAgent())
                     listener { _, _ ->
                         logD("图片加载完毕", "time=$time url=$urlOrBase64", false)

app/src/main/java/com/su/mediabox/util/html/source/web/GettingWebView.kt

@@ -40,8 +40,6 @@ class GettingWebView @JvmOverloads constructor(
         }
         mWebSettings.javaScriptCanOpenWindowsAutomatically = true
         mWebSettings.loadsImagesAutomatically = false
-        mWebSettings.setAppCacheEnabled(true)
-        mWebSettings.setAppCachePath(context.cacheDir.absolutePath)
         mWebSettings.databaseEnabled = true
         mWebSettings.setGeolocationDatabasePath(context.getDir("database", 0).path)
         mWebSettings.setGeolocationEnabled(true)

app/src/main/java/com/su/mediabox/view/activity/MediaClassifyActivity.kt

@@ -128,11 +128,12 @@ class MediaClassifyActivity : BasePluginActivity() {
                     mBinding.mediaClassifyFabProgress.invisible()
                     "加载分类错误：${it.throwable?.message}".showToast()
                 }
+                else -> {}
             }
         }
 
         //如果传入分类，则直接开始加载分类数据，否则自动加载分类项数据并打开弹窗
-        getAction<ClassifyAction>()?.also {
+        consumeAction<ClassifyAction>()?.also {
             mediaClassify.currentClassifyAction = it
             viewModel.getClassifyData(it)
         } ?: viewModel.getClassifyItemData()

app/src/main/java/com/su/mediabox/view/activity/MediaDetailActivity.kt

@@ -32,7 +32,7 @@ class MediaDetailActivity : BasePluginActivity() {
 
         logD("获取VM", "@${viewModel}")
 
-        getAction<DetailAction>()?.also {
+        consumeAction<DetailAction>()?.also {
             viewModel.partUrl = it.url
         }
 
@@ -111,7 +111,7 @@ class MediaDetailActivity : BasePluginActivity() {
     override fun startActivity(intent: Intent?, options: Bundle?) {
         //主动向下一级路由目标提供一些信息
         intent?.apply {
-            getAction<PlayAction>()?.apply {
+            consumeAction<PlayAction>()?.apply {
                 coverUrl = viewModel.cover
                 detailPartUrl = viewModel.partUrl
                 videoName = viewModel.title

app/src/main/java/com/su/mediabox/view/activity/MediaSearchActivity.kt

@@ -133,7 +133,7 @@ class MediaSearchActivity : BasePluginActivity() {
             }
         }
 
-        getAction<SearchAction>()?.also {
+        consumeAction<SearchAction>()?.also {
             viewModel.getSearchData(it.keyWork)
         }
     }

app/src/main/java/com/su/mediabox/view/activity/VideoMediaPlayActivity.kt

@@ -36,7 +36,6 @@ class VideoMediaPlayActivity : BasePluginActivity(),
     VideoMediaPlayer.PlayOperatingProxy {
 
     companion object {
-        var playList: List<EpisodeData>? = null
         private const val DEFAULT_SEEK_LENGTH = 15000L
         const val DEFAULT_VIDEO_PRELOAD_SIZE = 5
     }
@@ -63,10 +62,12 @@ class VideoMediaPlayActivity : BasePluginActivity(),
 
         setFullScreen(window)
 
-        getAction<PlayAction>()?.also { action ->
+        consumeAction<PlayAction>()?.also { action ->
             this.action = action
             init()
             viewModel.apply {
+                val playList = action.extraData as? List<EpisodeData>
+                playList?.let { init(it) }
                 detailPartUrl = action.detailPartUrl
                 coverUrl = action.coverUrl
                 videoName = action.videoName
@@ -85,6 +86,7 @@ class VideoMediaPlayActivity : BasePluginActivity(),
                                 }
                                 visible()
                             }
+
                         is DataState.Success -> dataState.data?.also {
                             mBinding.vmPlay.playVideo(
                                 it.videoPlayUrl,
@@ -93,6 +95,7 @@ class VideoMediaPlayActivity : BasePluginActivity(),
                             mBinding.vmLoadingLayer.gone()
                             mBinding.vmErrorRetry.gone()
                         }
+
                         is DataState.Failed -> {
                             dataState.throwable?.message?.showToast()
                             mBinding.vmLoadingLayer.apply {
@@ -102,6 +105,7 @@ class VideoMediaPlayActivity : BasePluginActivity(),
                                 visible()
                             }
                         }
+
                         else -> Unit
                     }
                 }
@@ -211,6 +215,7 @@ class VideoMediaPlayActivity : BasePluginActivity(),
                         onVideoResume()
                     }
                 }
+
                 KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_MEDIA_STEP_BACKWARD ->
                     //减速
                     if (event?.isShiftPressed == true) {
@@ -270,8 +275,6 @@ class VideoMediaPlayActivity : BasePluginActivity(),
             mBinding.vmPlay.setVideoAllCallBack(null)
             GSYVideoManager.releaseAllVideos()
             orientationUtils.releaseListener()
-            //释放播放列表
-            playList = null
         }
         super.onDestroy()
     }

app/src/main/java/com/su/mediabox/view/activity/WebViewActivity.kt

@@ -12,7 +12,7 @@ import com.su.mediabox.databinding.ActivityWebViewBinding
 import com.su.mediabox.plugin.WebUtilImpl.clearWeb
 import com.su.mediabox.pluginapi.action.WebBrowserAction
 import com.su.mediabox.util.Util.openUrl
-import com.su.mediabox.util.getAction
+import com.su.mediabox.util.consumeAction
 import com.su.mediabox.util.logD
 import com.su.mediabox.util.logE
 import com.su.mediabox.util.viewBind
@@ -27,7 +27,7 @@ class WebViewActivity : BasePluginActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        mAction = getAction() ?: run {
+        mAction = consumeAction() ?: run {
             finish()
             return
         }

app/src/main/java/com/su/mediabox/view/component/PointView.kt

@@ -31,10 +31,10 @@ class PointView(context: Context, attributeSet: AttributeSet) : View(context, at
         }
         get() = paint.color
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         val radius = pointSize / 2
-        canvas?.drawCircle(width / 2F, height / 2F, radius, paint)
+        canvas.drawCircle(width / 2F, height / 2F, radius, paint)
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {