From 394771e46b1b74a3566c3fe6392e1aff29125746 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 31 Jan 2020 20:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/model/README.md | 6 +++++- app/src/main/java/io/legado/app/model/WebBook.kt | 8 ++++---- .../app/model/{localbook => localBook}/AnalyzeTxtFile.kt | 2 +- .../app/model/{webbook => webBook}/BookChapterList.kt | 2 +- .../legado/app/model/{webbook => webBook}/BookContent.kt | 2 +- .../io/legado/app/model/{webbook => webBook}/BookInfo.kt | 2 +- .../io/legado/app/model/{webbook => webBook}/BookList.kt | 2 +- .../legado/app/model/{webbook => webBook}/ChapterData.kt | 2 +- .../legado/app/model/{webbook => webBook}/ContentData.kt | 2 +- 9 files changed, 16 insertions(+), 12 deletions(-) rename app/src/main/java/io/legado/app/model/{localbook => localBook}/AnalyzeTxtFile.kt (92%) rename app/src/main/java/io/legado/app/model/{webbook => webBook}/BookChapterList.kt (99%) rename app/src/main/java/io/legado/app/model/{webbook => webBook}/BookContent.kt (99%) rename app/src/main/java/io/legado/app/model/{webbook => webBook}/BookInfo.kt (98%) rename app/src/main/java/io/legado/app/model/{webbook => webBook}/BookList.kt (99%) rename app/src/main/java/io/legado/app/model/{webbook => webBook}/ChapterData.kt (79%) rename app/src/main/java/io/legado/app/model/{webbook => webBook}/ContentData.kt (67%) diff --git a/app/src/main/java/io/legado/app/model/README.md b/app/src/main/java/io/legado/app/model/README.md index 0b9c08ba9..d791c861e 100644 --- a/app/src/main/java/io/legado/app/model/README.md +++ b/app/src/main/java/io/legado/app/model/README.md @@ -1,2 +1,6 @@ ## 放置一些模块类 -* 书源解析 +* analyzeRule 书源规则解析 +* localBook 本地书籍解析 +* rss 订阅规则解析 +* webBook 获取网络书籍 + diff --git a/app/src/main/java/io/legado/app/model/WebBook.kt b/app/src/main/java/io/legado/app/model/WebBook.kt index e28c09519..4cc2544f5 100644 --- a/app/src/main/java/io/legado/app/model/WebBook.kt +++ b/app/src/main/java/io/legado/app/model/WebBook.kt @@ -6,10 +6,10 @@ import io.legado.app.data.entities.BookSource import io.legado.app.data.entities.SearchBook import io.legado.app.help.coroutine.Coroutine import io.legado.app.model.analyzeRule.AnalyzeUrl -import io.legado.app.model.webbook.BookChapterList -import io.legado.app.model.webbook.BookContent -import io.legado.app.model.webbook.BookInfo -import io.legado.app.model.webbook.BookList +import io.legado.app.model.webBook.BookChapterList +import io.legado.app.model.webBook.BookContent +import io.legado.app.model.webBook.BookInfo +import io.legado.app.model.webBook.BookList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/app/src/main/java/io/legado/app/model/localbook/AnalyzeTxtFile.kt b/app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt similarity index 92% rename from app/src/main/java/io/legado/app/model/localbook/AnalyzeTxtFile.kt rename to app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt index a3df30783..6eb5d4a18 100644 --- a/app/src/main/java/io/legado/app/model/localbook/AnalyzeTxtFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.localbook +package io.legado.app.model.localBook import android.content.Context import android.net.Uri diff --git a/app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt b/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt similarity index 99% rename from app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt rename to app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt index c8fd7c9f8..82f06e54a 100644 --- a/app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.webbook +package io.legado.app.model.webBook import android.text.TextUtils import io.legado.app.App diff --git a/app/src/main/java/io/legado/app/model/webbook/BookContent.kt b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt similarity index 99% rename from app/src/main/java/io/legado/app/model/webbook/BookContent.kt rename to app/src/main/java/io/legado/app/model/webBook/BookContent.kt index 43e90c4cb..b9455e6ff 100644 --- a/app/src/main/java/io/legado/app/model/webbook/BookContent.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.webbook +package io.legado.app.model.webBook import io.legado.app.App import io.legado.app.R diff --git a/app/src/main/java/io/legado/app/model/webbook/BookInfo.kt b/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt similarity index 98% rename from app/src/main/java/io/legado/app/model/webbook/BookInfo.kt rename to app/src/main/java/io/legado/app/model/webBook/BookInfo.kt index e56c25347..75d5f94ba 100644 --- a/app/src/main/java/io/legado/app/model/webbook/BookInfo.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.webbook +package io.legado.app.model.webBook import io.legado.app.App import io.legado.app.R diff --git a/app/src/main/java/io/legado/app/model/webbook/BookList.kt b/app/src/main/java/io/legado/app/model/webBook/BookList.kt similarity index 99% rename from app/src/main/java/io/legado/app/model/webbook/BookList.kt rename to app/src/main/java/io/legado/app/model/webBook/BookList.kt index ed440b9f2..56f511815 100644 --- a/app/src/main/java/io/legado/app/model/webbook/BookList.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookList.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.webbook +package io.legado.app.model.webBook import io.legado.app.App import io.legado.app.R diff --git a/app/src/main/java/io/legado/app/model/webbook/ChapterData.kt b/app/src/main/java/io/legado/app/model/webBook/ChapterData.kt similarity index 79% rename from app/src/main/java/io/legado/app/model/webbook/ChapterData.kt rename to app/src/main/java/io/legado/app/model/webBook/ChapterData.kt index bbbf6060b..6b06eb508 100644 --- a/app/src/main/java/io/legado/app/model/webbook/ChapterData.kt +++ b/app/src/main/java/io/legado/app/model/webBook/ChapterData.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.webbook +package io.legado.app.model.webBook import io.legado.app.data.entities.BookChapter diff --git a/app/src/main/java/io/legado/app/model/webbook/ContentData.kt b/app/src/main/java/io/legado/app/model/webBook/ContentData.kt similarity index 67% rename from app/src/main/java/io/legado/app/model/webbook/ContentData.kt rename to app/src/main/java/io/legado/app/model/webBook/ContentData.kt index 195778ce8..65185d806 100644 --- a/app/src/main/java/io/legado/app/model/webbook/ContentData.kt +++ b/app/src/main/java/io/legado/app/model/webBook/ContentData.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.webbook +package io.legado.app.model.webBook data class ContentData( var content: String = "",