Skip to content

Commit

Permalink
[optimize]分离插件API到plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
RyensX committed Feb 3, 2022
1 parent 2641be6 commit 8902a2b
Show file tree
Hide file tree
Showing 84 changed files with 275 additions and 146 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ dependencies {
implementation deps.material_dialogs.input
implementation deps.room.room_runtime
implementation deps.room.room_ktx
implementation project(path: ':plugin')
kapt deps.room.room_compiler
implementation deps.filedownloader.library
implementation deps.cling.cling_core
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.skyd.imomoe.bean

import com.su.mediabox.plugin.standard.been.BaseBean
import java.io.File

class DataSourceFileBean(
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/skyd/imomoe/bean/DoHJsonBean.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.skyd.imomoe.bean

import com.google.gson.annotations.SerializedName
import com.su.mediabox.plugin.standard.been.BaseBean
import java.io.Serializable

class DoHJsonBean(
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/skyd/imomoe/bean/FavoriteAnimeBean.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.skyd.imomoe.config.Const
import com.su.mediabox.plugin.standard.been.BaseBean
import com.su.mediabox.plugin.standard.been.ImageBean
import java.io.Serializable

@Entity(tableName = Const.Database.AppDataBase.FAVORITE_ANIME_TABLE_NAME)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/skyd/imomoe/bean/HistoryBean.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.skyd.imomoe.config.Const
import com.su.mediabox.plugin.standard.been.BaseBean
import com.su.mediabox.plugin.standard.been.ImageBean
import java.io.Serializable

@Entity(tableName = Const.Database.AppDataBase.HISTORY_TABLE_NAME)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/skyd/imomoe/bean/LicenseBean.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.skyd.imomoe.bean

import com.su.mediabox.plugin.standard.been.BaseBean

class LicenseBean(
override var type: String,
override var actionUrl: String,
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/skyd/imomoe/bean/MoreBean.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.skyd.imomoe.bean

import androidx.annotation.DrawableRes
import com.su.mediabox.plugin.standard.been.BaseBean

class MoreBean(
override var type: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.skyd.imomoe.config.Const
import com.su.mediabox.plugin.standard.been.BaseBean

@Entity(tableName = Const.Database.AppDataBase.SEARCH_HISTORY_TABLE_NAME)
class SearchHistoryBean(
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/skyd/imomoe/bean/SkinBean.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.skyd.imomoe.bean

import com.su.mediabox.plugin.standard.been.BaseBean

class SkinBean(
override var type: String,
override var actionUrl: String,
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/skyd/imomoe/bean/UpdateBean.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.skyd.imomoe.bean

import com.google.gson.annotations.SerializedName
import com.su.mediabox.plugin.standard.been.BaseBean

class UpdateBean(
override var type: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.skyd.imomoe.bean.danmaku

import com.google.gson.annotations.SerializedName
import com.skyd.imomoe.bean.BaseBean
import com.su.mediabox.plugin.standard.been.BaseBean

class AnimeSendDanmakuResultBean(
override var type: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.skyd.imomoe.database.converter

import androidx.room.TypeConverter
import com.google.gson.Gson
import com.skyd.imomoe.bean.ImageBean
import com.su.mediabox.plugin.standard.been.ImageBean


class ImageBeanConverter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package com.skyd.imomoe.database.dao

import androidx.room.*
import com.skyd.imomoe.bean.FavoriteAnimeBean
import com.skyd.imomoe.bean.ImageBean
import com.skyd.imomoe.config.Const.Database.AppDataBase.FAVORITE_ANIME_TABLE_NAME
import com.su.mediabox.plugin.standard.been.ImageBean

@Dao
interface FavoriteAnimeDao {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/skyd/imomoe/model/DataSourceManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package com.skyd.imomoe.model
import android.util.LruCache
import com.skyd.imomoe.App
import com.skyd.imomoe.BuildConfig
import com.skyd.imomoe.model.interfaces.IConst
import com.skyd.imomoe.model.interfaces.IRouteProcessor
import com.skyd.imomoe.model.interfaces.IUtil
import com.skyd.imomoe.util.editor
import com.skyd.imomoe.util.logE
import com.skyd.imomoe.util.sharedPreferences
import com.su.mediabox.plugin.interfaces.IConst
import com.su.mediabox.plugin.interfaces.IRouteProcessor
import com.su.mediabox.plugin.interfaces.IUtil
import dalvik.system.DexClassLoader
import java.io.File

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.bean.*
import com.skyd.imomoe.model.interfaces.IAnimeDetailModel
import com.su.mediabox.plugin.interfaces.IAnimeDetailModel
import com.su.mediabox.plugin.standard.been.IAnimeDetailBean
import com.su.mediabox.plugin.standard.been.ImageBean

class AnimeDetailModel : IAnimeDetailModel {
override suspend fun getAnimeDetailData(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.R
import com.skyd.imomoe.bean.*
import com.skyd.imomoe.config.Const
import com.skyd.imomoe.config.Const.ActionUrl.Companion.ANIME_BROWSER
import com.skyd.imomoe.model.interfaces.IAnimeShowModel
import com.su.mediabox.plugin.interfaces.IAnimeShowModel
import com.su.mediabox.plugin.standard.been.*

class AnimeShowModel : IAnimeShowModel {
override suspend fun getAnimeShowData(
Expand All @@ -12,11 +13,11 @@ class AnimeShowModel : IAnimeShowModel {
return Pair(
arrayListOf(
AnimeShowBean(
com.skyd.imomoe.config.Const.ViewHolderTypeString.BANNER_1, "",
Const.ViewHolderTypeString.BANNER_1, "",
"", "", "", null, "",
arrayListOf(
AnimeCoverBean(
com.skyd.imomoe.config.Const.ViewHolderTypeString.ANIME_COVER_6,
Const.ViewHolderTypeString.ANIME_COVER_6,
ANIME_BROWSER + "https://github.com/Ryensu/MediaBox/tree/master/doc/customdatasource/README.md",
"https://github.com/Ryensu/MediaBox/tree/master/doc/customdatasource/README.md",
"请在设置页面选择自定义数据源ads包,以便使用APP\n具体使用方法请点击此处",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.skyd.imomoe.model.impls

import android.app.Activity
import com.skyd.imomoe.bean.AnimeCoverBean
import com.skyd.imomoe.bean.ClassifyBean
import com.skyd.imomoe.bean.PageNumberBean
import com.skyd.imomoe.model.interfaces.IClassifyModel
import com.su.mediabox.plugin.interfaces.IClassifyModel
import com.su.mediabox.plugin.standard.been.AnimeCoverBean
import com.su.mediabox.plugin.standard.been.ClassifyBean
import com.su.mediabox.plugin.standard.been.PageNumberBean

class ClassifyModel : IClassifyModel {
override suspend fun getClassifyData(partUrl: String): Pair<ArrayList<AnimeCoverBean>, PageNumberBean?> {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/skyd/imomoe/model/impls/Const.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.model.interfaces.IConst
import com.su.mediabox.plugin.interfaces.IConst

class Const : IConst {
override val actionUrl = ActionUrl()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.bean.*
import com.skyd.imomoe.model.interfaces.IEverydayAnimeModel
import com.su.mediabox.plugin.interfaces.IEverydayAnimeModel
import com.su.mediabox.plugin.standard.been.AnimeCoverBean
import com.su.mediabox.plugin.standard.been.AnimeShowBean
import com.su.mediabox.plugin.standard.been.TabBean

class EverydayAnimeModel : IEverydayAnimeModel {
override suspend fun getEverydayAnimeData(): Triple<ArrayList<TabBean>, ArrayList<List<AnimeCoverBean>>, AnimeShowBean> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.bean.*
import com.skyd.imomoe.model.interfaces.IEverydayAnimeWidgetModel
import com.su.mediabox.plugin.interfaces.IEverydayAnimeWidgetModel
import com.su.mediabox.plugin.standard.been.AnimeCoverBean

class EverydayAnimeWidgetModel : IEverydayAnimeWidgetModel {
override fun getEverydayAnimeData(): ArrayList<List<AnimeCoverBean>> {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/skyd/imomoe/model/impls/HomeModel.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.bean.TabBean
import com.skyd.imomoe.model.interfaces.IHomeModel
import com.su.mediabox.plugin.interfaces.IHomeModel
import com.su.mediabox.plugin.standard.been.TabBean

class HomeModel : IHomeModel {
override suspend fun getAllTabData(): ArrayList<TabBean> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.bean.AnimeCoverBean
import com.skyd.imomoe.bean.PageNumberBean
import com.skyd.imomoe.model.interfaces.IMonthAnimeModel
import com.su.mediabox.plugin.interfaces.IMonthAnimeModel
import com.su.mediabox.plugin.standard.been.AnimeCoverBean
import com.su.mediabox.plugin.standard.been.PageNumberBean

class MonthAnimeModel : IMonthAnimeModel {
override suspend fun getMonthAnimeData(partUrl: String): Pair<ArrayList<AnimeCoverBean>, PageNumberBean?> {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/skyd/imomoe/model/impls/PlayModel.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.skyd.imomoe.model.impls

import android.app.Activity
import com.skyd.imomoe.bean.*
import com.skyd.imomoe.model.interfaces.IPlayModel
import com.su.mediabox.plugin.interfaces.IPlayModel
import com.su.mediabox.plugin.standard.been.*

class PlayModel : IPlayModel {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.bean.AnimeCoverBean
import com.skyd.imomoe.bean.PageNumberBean
import com.skyd.imomoe.model.interfaces.IRankListModel
import com.su.mediabox.plugin.interfaces.IRankListModel
import com.su.mediabox.plugin.standard.been.AnimeCoverBean
import com.su.mediabox.plugin.standard.been.PageNumberBean

class RankListModel : IRankListModel {
override suspend fun getRankListData(partUrl: String): Pair<MutableList<AnimeCoverBean>, PageNumberBean?> {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/skyd/imomoe/model/impls/RankModel.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.bean.TabBean
import com.skyd.imomoe.model.interfaces.IRankModel
import com.su.mediabox.plugin.interfaces.IRankModel
import com.su.mediabox.plugin.standard.been.TabBean

class RankModel : IRankModel {
override suspend fun getRankTabData(): ArrayList<TabBean> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ package com.skyd.imomoe.model.impls

import android.app.Activity
import android.content.Context
import com.skyd.imomoe.model.interfaces.IRouteProcessor
import com.skyd.imomoe.util.showToast
import com.su.mediabox.plugin.interfaces.IRouteProcessor

class RouteProcessor : IRouteProcessor {
override fun process(context: Context, actionUrl: String): Boolean {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/skyd/imomoe/model/impls/SearchModel.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.bean.AnimeCoverBean
import com.skyd.imomoe.bean.PageNumberBean
import com.skyd.imomoe.model.interfaces.ISearchModel
import com.su.mediabox.plugin.interfaces.ISearchModel
import com.su.mediabox.plugin.standard.been.AnimeCoverBean
import com.su.mediabox.plugin.standard.been.PageNumberBean

class SearchModel : ISearchModel {
override suspend fun getSearchData(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/skyd/imomoe/model/impls/Util.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.skyd.imomoe.model.impls

import com.skyd.imomoe.model.interfaces.IUtil
import com.su.mediabox.plugin.interfaces.IUtil

class Util : IUtil {
override fun getDetailLinkByEpisodeLink(episodeUrl: String): String {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/skyd/imomoe/util/ViewHolderUtil.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.skyd.imomoe.R
import com.skyd.imomoe.bean.BaseBean
import com.skyd.imomoe.view.component.bannerview.BannerView
import com.skyd.imomoe.view.component.textview.TypefaceTextView
import com.skyd.imomoe.view.component.FlowLayout
import com.skyd.imomoe.config.Const.ViewHolderTypeInt
import com.skyd.imomoe.config.Const.ViewHolderTypeString
import com.su.mediabox.plugin.standard.been.BaseBean

//UP_TODO 2022/1/22 12:31 0 ViewHolder直接使用ViewBinding
class ViewHolderUtil {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.skyd.imomoe.util.comparator

import com.skyd.imomoe.bean.AnimeCoverBean
import com.su.mediabox.plugin.standard.been.AnimeCoverBean


/**
* 比较集数名称(title)的字典序,数字按照从大到小,例如90小于100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.skyd.imomoe.App
import com.skyd.imomoe.R
import com.skyd.imomoe.bean.ClassifyBean
import com.skyd.imomoe.bean.ClassifyDataBean
import com.skyd.imomoe.bean.ResponseDataType
import com.skyd.imomoe.databinding.ActivityClassifyBinding
import com.skyd.imomoe.util.Util.getResColor
Expand All @@ -24,6 +22,8 @@ import com.skyd.imomoe.view.adapter.BaseRvAdapter
import com.skyd.imomoe.view.adapter.SearchAdapter
import com.skyd.imomoe.view.listener.dsl.setOnItemSelectedListener
import com.skyd.imomoe.viewmodel.ClassifyViewModel
import com.su.mediabox.plugin.standard.been.ClassifyBean
import com.su.mediabox.plugin.standard.been.ClassifyDataBean


class ClassifyActivity : BaseActivity<ActivityClassifyBinding>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer
import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
import com.skyd.imomoe.App
import com.skyd.imomoe.R
import com.skyd.imomoe.bean.AnimeEpisodeDataBean
import com.skyd.imomoe.bean.FavoriteAnimeBean
import com.skyd.imomoe.config.Api
import com.skyd.imomoe.config.Const
Expand Down Expand Up @@ -57,6 +56,7 @@ import com.skyd.imomoe.view.component.player.DetailPlayerActivity
import com.skyd.imomoe.view.fragment.MoreDialogFragment
import com.skyd.imomoe.view.fragment.ShareDialogFragment
import com.skyd.imomoe.viewmodel.PlayViewModel
import com.su.mediabox.plugin.standard.been.AnimeEpisodeDataBean
import kotlinx.coroutines.*
import tv.danmaku.ijk.media.exo2.Exo2PlayerManager
import tv.danmaku.ijk.media.player.IjkMediaPlayer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.skyd.imomoe.App
import com.skyd.imomoe.R
import com.skyd.imomoe.bean.AnimeCoverBean
import com.skyd.imomoe.bean.AnimeEpisodeDataBean
import com.skyd.imomoe.bean.IAnimeDetailBean
import com.skyd.imomoe.config.Const
import com.skyd.imomoe.database.getAppDataBase
import com.skyd.imomoe.model.DataSourceManager
Expand All @@ -29,6 +26,9 @@ import com.skyd.imomoe.view.activity.AnimeDetailActivity
import com.skyd.imomoe.view.adapter.decoration.AnimeCoverItemDecoration
import com.skyd.imomoe.view.adapter.decoration.AnimeEpisodeItemDecoration
import com.skyd.imomoe.view.component.BottomSheetRecyclerView
import com.su.mediabox.plugin.standard.been.AnimeCoverBean
import com.su.mediabox.plugin.standard.been.AnimeEpisodeDataBean
import com.su.mediabox.plugin.standard.been.IAnimeDetailBean

class AnimeDetailAdapter(
val activity: AnimeDetailActivity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.view.View
import androidx.recyclerview.widget.RecyclerView
import com.skyd.imomoe.App
import com.skyd.imomoe.R
import com.skyd.imomoe.bean.AnimeCoverBean
import com.skyd.imomoe.config.Const
import com.skyd.imomoe.util.AnimeCover7ViewHolder
import com.skyd.imomoe.util.Util.process
Expand All @@ -13,6 +12,7 @@ import com.skyd.imomoe.util.gone
import com.skyd.imomoe.util.invisible
import com.skyd.imomoe.util.visible
import com.skyd.imomoe.view.activity.AnimeDownloadActivity
import com.su.mediabox.plugin.standard.been.AnimeCoverBean

class AnimeDownloadAdapter(
val activity: AnimeDownloadActivity,
Expand Down
Loading

0 comments on commit 8902a2b

Please sign in to comment.