diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt index ef0cc2aea..c84b052f2 100644 --- a/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt @@ -170,12 +170,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) { setCover(book, epubBook) //set css - epubBook.resources.add( - Resource( - "h1 {color: blue;}p {text-indent:2em;}".encodeToByteArray(), - "css/style.css" - ) - ) + setCSS(epubBook) //设置正文 setEpubContent(book, epubBook) @@ -195,32 +190,39 @@ class CacheViewModel(application: Application) : BaseViewModel(application) { setEpubMetadata(book, epubBook) //set cover setCover(book, epubBook) + //set css + setCSS(epubBook) + + + val bookPath = FileUtils.getPath(file, filename) + val bookFile = FileUtils.createFileWithReplace(bookPath) + //设置正文 + setEpubContent(book, epubBook) + EpubWriter().write(epubBook, FileOutputStream(bookFile)) + } + private fun setCSS(epubBook: EpubBook) { //set css epubBook.resources.add( Resource( - "h1 {color: blue;}p {text-indent:2em;}".encodeToByteArray(), + "body{background:white;margin:0;}h2{color:#005a9c;text-align:left;}p{text-indent:2em;text-align:justify;}".encodeToByteArray(), "css/style.css" ) ) - val bookPath = FileUtils.getPath(file, filename) - val bookFile = FileUtils.createFileWithReplace(bookPath) - //设置正文 - setEpubContent(book, epubBook) - EpubWriter().write(epubBook, FileOutputStream(bookFile)) } + private fun setCover(book: Book, epubBook: EpubBook) { Glide.with(context) .asBitmap() .load(book.coverUrl) - .into(object : CustomTarget(){ + .into(object : CustomTarget() { override fun onResourceReady(resource: Bitmap, transition: Transition?) { val stream = ByteArrayOutputStream() resource.compress(Bitmap.CompressFormat.JPEG, 100, stream) val byteArray: ByteArray = stream.toByteArray() resource.recycle() - epubBook.coverImage= Resource(byteArray,"cover.jpg") + epubBook.coverImage = Resource(byteArray, "cover.jpg") } override fun onLoadCleared(placeholder: Drawable?) { @@ -238,7 +240,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) { val content1 = contentProcessor .getContent(book, chapter.title, content ?: "null", false, useReplace) .joinToString("\n") - .replace(chapter.title,"") + .replace(chapter.title, "") epubBook.addSection( chapter.title, @@ -248,7 +250,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) { } } - private fun setEpubMetadata(book: Book,epubBook: EpubBook) { + private fun setEpubMetadata(book: Book, epubBook: EpubBook) { val metadata = Metadata() metadata.titles.add(book.name)//书籍的名称 metadata.authors.add(Author(book.author))//书籍的作者 @@ -257,7 +259,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) { metadata.publishers.add("Legado APP")//数据的创建者 metadata.descriptions.add(book.getDisplayIntro())//书籍的简介 //metadata.subjects.add("")//书籍的主题,在静读天下里面有使用这个分类书籍 - epubBook.metadata=metadata + epubBook.metadata = metadata } //////end of EPUB diff --git a/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java b/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java index 96212f253..eccf1d657 100644 --- a/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java +++ b/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java @@ -71,7 +71,7 @@ public class ResourceUtil { html += "" + title + "" + "" + ""; - html += "

" + title + "

" + + html += "

" + title + "

" + body + ""; @@ -81,8 +81,8 @@ public class ResourceUtil { /** * 快速从File创建Resource * @param file File - * @return - * @throws IOException + * @return Resource + * @throws IOException IOException */ @SuppressWarnings("unused")