重写下载模板：完成基本下载功能

storytellerF · Jul 19, 2023 · 87dd1e5 · 87dd1e5
1 parent a3941f6
commit 87dd1e5
Show file tree

Hide file tree

Showing 60 changed files with 2,044 additions and 1,565 deletions.
diff --git a/...miao/widget/player/BiliDanmukuParser.java → ...aku/danmaku/parser/BiliDanmukuParser.java b/...miao/widget/player/BiliDanmukuParser.java → ...aku/danmaku/parser/BiliDanmukuParser.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2013 Chen Hui <calmer91@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.a10miaomiao.bilimiao.widget.player;
+package master.flame.danmaku.danmaku.parser;
 
 import android.graphics.Color;
 import android.text.TextUtils;
@@ -36,7 +21,6 @@
 import master.flame.danmaku.danmaku.model.IDisplayer;
 import master.flame.danmaku.danmaku.model.SpecialDanmaku;
 import master.flame.danmaku.danmaku.model.android.Danmakus;
-import master.flame.danmaku.danmaku.parser.BaseDanmakuParser;
 import master.flame.danmaku.danmaku.model.android.DanmakuFactory;
 import master.flame.danmaku.danmaku.parser.android.AndroidFileSource;
 import master.flame.danmaku.danmaku.util.DanmakuUtils;
@@ -320,4 +304,4 @@ public BaseDanmakuParser setDisplayer(IDisplayer disp) {
         mDispScaleY = mDispHeight / DanmakuFactory.BILI_PLAYER_HEIGHT;
         return this;
     }
-}
+}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -130,18 +130,15 @@ dependencies {
     annotationProcessor(Libraries.glideCompiler)
 
     implementation(project(":bilimiao-comm"))
+    implementation(project(":bilimiao-download"))
     implementation(project(":bilimiao-cover"))
 //    implementation project(":bilimiao-appwidget")
     implementation(project(":bilimiao-compose"))
-    implementation(project(":download"))
     implementation(project(":miao-binding"))
     implementation(project(":miao-binding-android"))
     // 弹幕引擎
     implementation(project(":DanmakuFlameMaster"))
 
-    // ijpplayer
-//    implementation project(":ijkplayer-java")
-//    implementation project(":player")
 
     // 百度统计
     implementation(Libraries.baiduMobstat)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -71,7 +71,8 @@
             android:exported="true"/>
         <service android:name="cn.a10miaomiao.download.DownloadService"
             android:exported="true"/>
-
+        <service android:name="cn.a10miaomiao.bilimiao.download.DownloadService"
+            android:exported="true"/>
 <!--        <receiver-->
 <!--            android:label="@string/app_widget_name_new"-->
 <!--            android:name="cn.a10miaomiao.bilimiao.appwidget.NoteWidgetProvider_2x2"-->

diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/MainActivity.kt b/app/src/main/java/com/a10miaomiao/bilimiao/MainActivity.kt
@@ -26,12 +26,12 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentOnAttachListener
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
-import com.a10miaomiao.bilimiao.comm.delegate.download.DownloadDelegate
 import com.a10miaomiao.bilimiao.comm.delegate.helper.StatusBarHelper
 import com.a10miaomiao.bilimiao.comm.delegate.helper.SupportHelper
 import com.a10miaomiao.bilimiao.comm.delegate.player.BasePlayerDelegate
@@ -52,6 +52,7 @@ import com.a10miaomiao.bilimiao.widget.comm.behavior.AppBarBehavior
 import com.a10miaomiao.bilimiao.widget.comm.behavior.PlayerBehavior
 import com.baidu.mobstat.StatService
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.launch
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.bindSingleton
@@ -70,14 +71,12 @@ class MainActivity
         store.loadStoreModules(this)
         bindSingleton { basePlayerDelegate }
         bindSingleton { themeDelegate }
-        bindSingleton { downloadDelegate }
         bindSingleton { statusBarHelper }
         bindSingleton { supportHelper }
     }
 
     private val store by lazy { Store(this, di) }
     private val themeDelegate by lazy { ThemeDelegate(this, di) }
-    private val downloadDelegate by lazy { DownloadDelegate(this, di) }
     private val basePlayerDelegate: BasePlayerDelegate by lazy { PlayerDelegate2(this, di) }
     private val bottomSheetDelegate by lazy { BottomSheetDelegate(this, ui) }
     private val statusBarHelper by lazy { StatusBarHelper(this) }
@@ -93,7 +92,6 @@ class MainActivity
         ui = MainUi(this)
         setContentView(ui.root)
         basePlayerDelegate.onCreate(savedInstanceState)
-        downloadDelegate.onCreate(savedInstanceState)
         bottomSheetDelegate.onCreate(savedInstanceState)
         store.onCreate(savedInstanceState)
         ui.root.showPlayer = basePlayerDelegate.isPlaying()
@@ -167,7 +165,6 @@ class MainActivity
                 ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.POST_NOTIFICATIONS), 1)
             }
         }
-
 //        DebugMiao.log(IMiaoNavList.navList)
     }
 
@@ -369,7 +366,6 @@ class MainActivity
 
     override fun onDestroy() {
         basePlayerDelegate.onDestroy()
-        downloadDelegate.onDestroy()
         bottomSheetDelegate.onDestroy()
         store.onDestroy()
         navController.removeOnDestinationChangedListener(this)

diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/MainNavGraph.kt b/app/src/main/java/com/a10miaomiao/bilimiao/MainNavGraph.kt
@@ -13,7 +13,6 @@ import com.a10miaomiao.bilimiao.page.WebFragment
 import com.a10miaomiao.bilimiao.page.auth.H5LoginFragment
 import com.a10miaomiao.bilimiao.page.bangumi.BangumiDetailFragment
 import com.a10miaomiao.bilimiao.page.bangumi.BangumiPagesFragment
-import com.a10miaomiao.bilimiao.page.download.DownloadFragment
 import com.a10miaomiao.bilimiao.page.download.DownloadVideoCreateFragment
 import com.a10miaomiao.bilimiao.page.filter.*
 import com.a10miaomiao.bilimiao.page.rank.RankFragment
@@ -93,7 +92,6 @@ object MainNavGraph {
             addFragment(SearchResultFragment::class, SearchResultFragment.Companion)
             addFragment(VideoRegionFragment::class, VideoRegionFragment.Companion)
 
-            addFragment(DownloadFragment::class, DownloadFragment.Companion)
             addFragment(DownloadVideoCreateFragment::class, DownloadVideoCreateFragment.Companion)
 
             addFragment(AboutFragment::class, AboutFragment.Companion)

diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/download/DownloadDelegate.kt b/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/download/DownloadDelegate.kt
diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/download/DownloadNotify.kt b/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/download/DownloadNotify.kt
diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/player/PlayerParamInfo.kt b/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/player/PlayerParamInfo.kt
@@ -1,6 +1,5 @@
 package com.a10miaomiao.bilimiao.comm.delegate.player
 
-import cn.a10miaomiao.download.BiliVideoEntry
 
 class PlayerParamInfo {
     var type = ""
@@ -9,7 +8,6 @@ class PlayerParamInfo {
     var epid = ""
     var sid = ""
     var title = ""
-    var localEntry: BiliVideoEntry? = null
 
     fun setVideo(aid: String, cid: String, title: String) {
         this.type = VIDEO
@@ -26,14 +24,6 @@ class PlayerParamInfo {
         this.title = title
     }
 
-    fun setLocalVideo(biliVideo: BiliVideoEntry) {
-        this.localEntry = biliVideo
-        this.type = LOCAL_VIDEO
-        this.aid = biliVideo.avid.toString()
-        this.cid = biliVideo.page_data.cid.toString()
-        this.title = biliVideo.title
-    }
-
     fun reset() {
         this.type = ""
         this.aid = ""

diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/player/model/BangumiPlayerSource.kt b/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/player/model/BangumiPlayerSource.kt
@@ -10,13 +10,11 @@ import com.a10miaomiao.bilimiao.comm.network.ApiHelper
 import com.a10miaomiao.bilimiao.comm.network.BiliApiService
 import com.a10miaomiao.bilimiao.comm.network.MiaoHttp
 import com.a10miaomiao.bilimiao.comm.network.MiaoHttp.Companion.gson
-import com.a10miaomiao.bilimiao.comm.proxy.ProxyServerInfo
 import com.a10miaomiao.bilimiao.comm.utils.CompressionTools
 import com.a10miaomiao.bilimiao.comm.utils.UrlUtil
-import com.a10miaomiao.bilimiao.widget.player.BiliDanmukuParser
-import com.a10miaomiao.bilimiao.widget.player.DanmakuVideoPlayer
 import master.flame.danmaku.danmaku.loader.android.DanmakuLoaderFactory
 import master.flame.danmaku.danmaku.parser.BaseDanmakuParser
+import master.flame.danmaku.danmaku.parser.BiliDanmukuParser
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 

diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/player/model/DashSource.kt b/app/src/main/java/com/a10miaomiao/bilimiao/comm/delegate/player/model/DashSource.kt
@@ -23,7 +23,7 @@ class DashSource(
 
     fun getDashAudio(): PlayerAPI.DashItem? {
         val audioList = dashData.audio
-        if (audioList.isNotEmpty()) {
+        if (audioList?.isNotEmpty() == true) {
             return audioList[0]
         }
         return null