书架默认按照阅读时间倒序排序排列

书架首次进入阅读页默认展示历史阅读章节阅读器增加上下方向键翻页，左右方向键键翻章
4 years ago · 28bbcf0f5d
parent b9d472af24
commit 28bbcf0f5d
17 changed files with 149 additions and 463 deletions
--- a/app/src/main/assets/web/new/bookshelf.css
+++ b/app/src/main/assets/web/new/bookshelf.css
@ -1,176 +0,0 @@
 html, body {
    height: 100%;
    margin: 0;
 }
 .hide {
    display: none;
 }
 .top, .showchapter, .hidebooks {
    width: 60px;
    height: 50px;
    position: absolute;
    right: 30px;
    bottom: 30px;
    color: black;
    font-size: 28px;
    background-color: #ddd;
    opacity: 0.85;
 }
 .top {
    bottom: 150px;
 }
 .showchapter {
    bottom: 90px;
    bottom: 90px;
 }
 .address {
    width: 270px;
 }
 .nav {
    border-bottom: solid 1px #ccc;
 }
 input, button {
    width: 110px;
    line-height: 34px;
    background-color: #eee;
    color: #555;
    border: none;
    margin: 10px 5px;
    font-weight: 500;
    border-radius: 2px;
    outline: none;
    cursor: pointer;
 }
 input {
    padding: 0 10px;
    cursor: text;
 }
    input:hover, button:hover {
        border-color: #aaa;
        background-color: #efefef;
        color: #222;
        outline: solid 1px #ccc;
    }
 .allcontent {
    height: calc(100% - 60px);
 }
 .allscreen {
    height: 100%
 }
 .books > div {
    display: inline-block;
    margin: 10px;
    vertical-align: top;
    border: solid 1px #ddd;
 }
 .read > .books {
    width: 420px;
    float: left;
    height: 100%;
    overflow: auto;
    border-right: solid 1px #ccc;
 }
    .read > .books > div {
        margin-right: 0;
        border-right: none;
    }
 .more {
    overflow-y: auto;
    height: 100%;
    display: none;
 }
 .read .more {
    display: block;
 }
 .books > div > img {
    width: 120px;
    height: 180px;
    float: left;
    margin-right: 10px;
    cursor: pointer;
 }
 .info {
    padding: 10px 20px 0 20px;
    width: 600px;
    margin: 0 auto;
 }
    .info > img {
        width: 600px;
        height: 900px;
    }
    .info p {
        line-height: 1.5;
        text-align: justify;
        margin: 0;
    }
 .books tr:nth-child(n+2) td {
    border-top: solid 1px #999;
 }
 .books td:nth-child(1) {
    vertical-align: top;
    width: 50px;
 }
 .books td:nth-child(2) {
    vertical-align: top;
    width: 200px;
 }
 .clear {
    clear: both;
 }
 .chapter {
    margin: 10px;
    max-height: 500px;
    overflow-y: auto;
    border-top: solid 1px #333;
    border-bottom: solid 1px #333;
 }
    .chapter button {
        width: 230px;
        text-align: left;
        text-indent: 14px;
        margin: 10px 4px;
    }
 .content {
    padding: 20px;
    text-align: justify;
    min-height: 1000px;
    padding-bottom: 200px;
 }
    .content h2 {
        font-family: "Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu;
        font-weight: 500;
        text-align: center;
        line-height: 100px;
        font-size: 40px;
        margin: 0;
    }
--- a/app/src/main/assets/web/new/bookshelf.html
+++ b/app/src/main/assets/web/new/bookshelf.html
@ -1,46 +1,3 @@
-<!DOCTYPE html>
+<!DOCTYPE html><html lang=en style="padding: 0;height:100%"><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="favicon.ico" /><![endif]--><title>yd-web-tool</title><link href=css/about.8c965d87.css rel=prefetch><link href=css/detail.fb767a87.css rel=prefetch><link href=js/about.a0534951.js rel=prefetch><link href=js/about~detail.47586100.js rel=prefetch><link href=js/detail.ff471d08.js rel=prefetch><link href=css/app.e1c0d2e4.css rel=preload as=style><link href=css/chunk-vendors.ad4ff18f.css rel=preload as=style><link href=js/app.a7aae935.js rel=preload as=script><link href=js/chunk-vendors.c98251cd.js rel=preload as=script><link href=css/chunk-vendors.ad4ff18f.css rel=stylesheet><link href=css/app.e1c0d2e4.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png><link rel=manifest href=manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=yd-web-tool><link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><style>body::-webkit-scrollbar {
 <html lang=en style="padding: 0;height:100%">
 <head>
  <meta charset=utf-8>
  <meta http-equiv=X-UA-Compatible content="IE=edge">
  <meta name=viewport content="width=device-width,initial-scale=1">
  <!--[if IE]><link rel="icon" href="favicon.ico" /><![endif]-->
  <title>yd-web-tool</title>
  <link href=css/about.f23c15cb.css rel=prefetch>
  <link href=css/detail.42c41bd6.css rel=prefetch>
  <link href=js/about.2589b5fe.js rel=prefetch>
  <link href=js/about~detail.08c372e6.js rel=prefetch>
  <link href=js/detail.043d6e39.js rel=prefetch>
  <link href=css/app.e1c0d2e4.css rel=preload as=style>
  <link href=css/chunk-vendors.ad4ff18f.css rel=preload as=style>
  <link href=js/app.b25f3cec.js rel=preload as=script>
  <link href=js/chunk-vendors.b3838a2d.js rel=preload as=script>
  <link href=css/chunk-vendors.ad4ff18f.css rel=stylesheet>
  <link href=css/app.e1c0d2e4.css rel=stylesheet>
  <link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png>
  <link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png>
  <link rel=manifest href=manifest.json>
  <meta name=theme-color content=#4DBA87>
  <meta name=apple-mobile-web-app-capable content=no>
  <meta name=apple-mobile-web-app-status-bar-style content=default>
  <meta name=apple-mobile-web-app-title content=yd-web-tool>
  <link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png>
  <link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87>
  <meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png>
  <meta name=msapplication-TileColor content=#000000>
 </head>
 <style>
  body::-webkit-scrollbar {
      display: none;
-  }
+    }</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.c98251cd.js></script><script src=js/app.a7aae935.js></script></body></html>
 </style>
 <body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without
      JavaScript enabled. Please enable it to continue.</strong></noscript>
  <div id=app></div>
  <script src=js/chunk-vendors.b3838a2d.js></script>
  <script src=js/app.b25f3cec.js></script>
 </body>
 </html>
--- a/app/src/main/assets/web/new/bookshelf.js
+++ b/app/src/main/assets/web/new/bookshelf.js
@ -1,203 +0,0 @@
 var $ = document.querySelector.bind(document)
    , $$ = document.querySelectorAll.bind(document)
    , $c = document.createElement.bind(document)
    , randomImg = "http://api.mtyqx.cn/api/random.php"
    , randomImg2 = "http://img.xjh.me/random_img.php"
    , books
    ;
 var now_chapter = -1;
 var sum_chapter = 0;
 var formatTime = value => {
    return new Date(value).toLocaleString('zh-CN', {
        hour12: false, year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"
    }).replace(/\//g, "-");
 };
 var apiMap = {
    "getBookshelf": "/getBookshelf",
    "getChapterList": "/getChapterList",
    "getBookContent": "/getBookContent",
    "saveBook": "/saveBook"
 };
 var apiAddress = (apiName, url, index) => {
    let address = $('#address').value || window.location.host;
    if (!(/^http|^\/\//).test(address)) {
        address = "//" + address;
    }
    if (!(/:\d{4,}/).test(address.split("//")[1].split("/")[0])) {
        address += ":1122";
    }
    localStorage.setItem('address', address);
    if (apiName == "getBookContent") {
        return address + apiMap[apiName] + (url ? "?url=" + encodeURIComponent(url) : "") + "&index=" + index;
    }
    return address + apiMap[apiName] + (url ? "?url=" + encodeURIComponent(url) : "");
 };
 var init = () => {
    $('#allcontent').classList.remove("read");
    $('#books').innerHTML = "";
    fetch(apiAddress("getBookshelf"), { mode: "cors" })
        .then(res => res.json())
        .then(data => {
            if (!data.isSuccess) {
                alert(getBookshelf.errorMsg);
                return;
            }
            books = data.data;
            books.forEach((book, i) => {
                let bookDiv = $c("div");
                let img = $c("img");
                img.src = book.coverUrl || randomImg;
                img.setAttribute("data-series-num", i);
                bookDiv.appendChild(img);
                bookDiv.innerHTML += `<table><tbody>
                                <tr><td>书名：</td><td>${book.name}</td></tr>
                                <tr><td>作者：</td><td>${book.author}</td></tr>
                                <tr><td>阅读：</td><td>${book.durChapterTitle}<br>${formatTime(book.durChapterTime)}</td></tr>
                                <tr><td>更新：</td><td>${book.latestChapterTitle}<br>${formatTime(book.latestChapterTime)}</td></tr>
                                <tr><td>来源：</td><td>${book.origin}</td></tr>
                                </tbody></table>`;
                $('#books').appendChild(bookDiv);
            });
            $$('#books img').forEach(bookImg =>
                bookImg.addEventListener("click", () => {
                    now_chapter = -1;
                    sum_chapter = 0;
                    $('#allcontent').classList.add("read");
                    var book = books[bookImg.getAttribute("data-series-num")];
                    $("#info").innerHTML = `<img src="${bookImg.src}">
                                        <p>　　来源：${book.origin}</p>
                                        <p>　　书名：${book.name}</p>
                                        <p>　　作者：${book.author}</p>
                                        <p>阅读章节：${book.durChapterName}</p>
                                        <p>阅读时间：${formatTime(book.durChapterTime)}</p>
                                        <p>最新章节：${book.latestChapterTitle}</p>
                                        <p>检查时间：${formatTime(book.lastCheckTime)}</p>
                                        <p>　　简介：${book.intro.trim().replace(/\n/g, "<br>")}</p>`;
                    window.location.hash = "";
                    window.location.hash = "#info";
                    $("#content").innerHTML = "章节列表加载中...";
                    $("#chapter").innerHTML = "";
                    fetch(apiAddress("getChapterList", book.bookUrl), { mode: "cors" })
                        .then(res => res.json())
                        .then(data => {
                            if (!data.isSuccess) {
                                alert(data.errorMsg);
                                $("#content").innerHTML = "章节列表加载失败！";
                                return;
                            }
                            data.data.forEach(chapter => {
                                let ch = $c("button");
                                ch.setAttribute("data-url", chapter.bookUrl);
                                ch.setAttribute("data-index", chapter.index);
                                ch.setAttribute("title", chapter.title);
                                ch.innerHTML = chapter.title.length > 15 ? chapter.title.substring(0, 14) + "..." : chapter.title;
                                $("#chapter").appendChild(ch);
                            });
                            sum_chapter = data.data.length;
                            $('#chapter').scrollTop = 0;
                            $("#content").innerHTML = "章节列表加载完成！";
                        });
                }));
        });
 };
 $("#back").addEventListener("click", () => {
    if (window.location.hash === "#content") {
        window.location.hash = "#chapter";
    } else if (window.location.hash === "#chapter") {
        window.location.hash = "#info";
    } else {
        $('#allcontent').classList.remove("read");
    }
 });
 $("#refresh").addEventListener("click", init);
 $('#hidebooks').addEventListener("click", () => {
    $("#books").classList.toggle("hide");
    $(".nav").classList.toggle("hide");
    $("#allcontent").classList.toggle("allscreen");
 });
 $('#top').addEventListener("click", () => {
    window.location.hash = "";
    window.location.hash = "#info";
 });
 $('#showchapter').addEventListener("click", () => {
    window.location.hash = "";
    window.location.hash = "#chapter";
 });
 $('#up').addEventListener('click', e => {
    if (now_chapter > 0) {
        now_chapter--;
        let clickEvent = document.createEvent('MouseEvents');
        clickEvent.initEvent("click", true, false);
        $('[data-index="' + now_chapter + '"]').dispatchEvent(clickEvent);
    } else if (now_chapter == 0) {
        alert("已经是第一章了^_^!")
    } else {
    }
 });
 $('#down').addEventListener('click', e => {
    if (now_chapter > -1) {
        if (now_chapter < sum_chapter - 1) {
            now_chapter++;
            let clickEvent = document.createEvent('MouseEvents');
            clickEvent.initEvent("click", true, false);
            $('[data-index="' + now_chapter + '"]').dispatchEvent(clickEvent);
        } else {
            alert("已经是最后一章了^_^!")
        }
    }
 });
 $('#chapter').addEventListener("click", (e) => {
    if (e.target.tagName === "BUTTON") {
        var url = e.target.getAttribute("data-url");
        var index = e.target.getAttribute("data-index");
        var name = e.target.getAttribute("title");
        if (!url) {
            alert("未取得书籍地址");
        }
        if (!index && (0 != index)) {
            alert("未取得章节索引");
        }
        now_chapter = parseInt(index);
        $("#content").innerHTML = "<p>" + name + " 加载中...</p>";
        fetch(apiAddress("getBookContent", url, index), { mode: "cors" })
            .then(res => res.json())
            .then(data => {
                if (!data.isSuccess) {
                    alert(data.errorMsg);
                    $("#content").innerHTML = "<p>" + name + " 加载失败！</p>";
                    return;
                }
                var content = data.data.trim().split("\n\n");
                if (content.length === 2) {
                    $("#content").innerHTML = `<h2>${content[0]}</h2>　　（全文 ${content[1].length} 字）<br><br>　　` + content[1].trim().replace(/\n/g, "<br><br>");
                } else {
                    $("#content").innerHTML = `<h2>${name || e.target.innerHTML}</h2>　　（全文 ${data.data.length} 字）<br><br>　　` + data.data.trim().replace(/\n/g, "<br><br>");
                }
                window.location.hash = "";
                window.location.hash = "#content";
            });
    }
 });
 $('#address').setAttribute("placeholder", "阅读APP地址或IP：" + window.location.host);
 if (!$('#address').value && typeof localStorage && localStorage.getItem('address')) {
    $('#address').value = localStorage.getItem('address');
 }
 init();
--- a/app/src/main/assets/web/new/css/about.8c965d87.css
+++ b/app/src/main/assets/web/new/css/about.8c965d87.css
--- a/app/src/main/assets/web/new/css/detail.fb767a87.css
+++ b/app/src/main/assets/web/new/css/detail.fb767a87.css
--- a/app/src/main/assets/web/new/favicon.ico
+++ b/app/src/main/assets/web/new/favicon.ico
--- a/app/src/main/assets/web/new/js/about.2589b5fe.js
+++ b/app/src/main/assets/web/new/js/about.2589b5fe.js
--- a/app/src/main/assets/web/new/js/about.a0534951.js
+++ b/app/src/main/assets/web/new/js/about.a0534951.js
--- a/app/src/main/assets/web/new/js/about~detail.47586100.js
+++ b/app/src/main/assets/web/new/js/about~detail.47586100.js
--- a/app/src/main/assets/web/new/js/app.a7aae935.js
+++ b/app/src/main/assets/web/new/js/app.a7aae935.js
--- a/app/src/main/assets/web/new/js/app.b25f3cec.js
+++ b/app/src/main/assets/web/new/js/app.b25f3cec.js
--- a/app/src/main/assets/web/new/js/chunk-vendors.b3838a2d.js
+++ b/app/src/main/assets/web/new/js/chunk-vendors.b3838a2d.js
--- a/app/src/main/assets/web/new/js/chunk-vendors.c98251cd.js
+++ b/app/src/main/assets/web/new/js/chunk-vendors.c98251cd.js
--- a/app/src/main/assets/web/new/js/detail.043d6e39.js
+++ b/app/src/main/assets/web/new/js/detail.043d6e39.js
--- a/app/src/main/assets/web/new/js/detail.ff471d08.js
+++ b/app/src/main/assets/web/new/js/detail.ff471d08.js
--- a/app/src/main/assets/web/new/precache-manifest.9ae0b839acd886dbe2adc2f9d92aeabf.js
+++ b/app/src/main/assets/web/new/precache-manifest.9ae0b839acd886dbe2adc2f9d92aeabf.js
@ -0,0 +1,74 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
  {
    "revision": "80a8de284bb3fa9a4a9f",
    "url": "css/about.8c965d87.css"
  },
  {
    "revision": "9da3e990110565bfa57c",
    "url": "css/app.e1c0d2e4.css"
  },
  {
    "revision": "c900d6091039998c94b9",
    "url": "css/chunk-vendors.ad4ff18f.css"
  },
  {
    "revision": "607ffe83acdcd9c9180e",
    "url": "css/detail.fb767a87.css"
  },
  {
    "revision": "535877f50039c0cb49a6196a5b7517cd",
    "url": "fonts/element-icons.535877f5.woff"
  },
  {
    "revision": "732389ded34cb9c52dd88271f1345af9",
    "url": "fonts/element-icons.732389de.ttf"
  },
  {
    "revision": "f9a3fb0e145017e166dd4d91d9280cc4",
    "url": "fonts/iconfont.f9a3fb0e.woff"
  },
  {
    "revision": "f39ecc1a1d2a1eff3aca8aadd818bb61",
    "url": "fonts/popfont.f39ecc1a.ttf"
  },
  {
    "revision": "6c094b6d4ae9404dbed273c41b06fae8",
    "url": "fonts/shelffont.6c094b6d.ttf"
  },
  {
    "revision": "b5c48bc1e1fe73212a31be704875b71f",
    "url": "img/noCover.b5c48bc1.jpeg"
  },
  {
    "revision": "1006935c8b91408961a7012a08445ffd",
    "url": "index.html"
  },
  {
    "revision": "80a8de284bb3fa9a4a9f",
    "url": "js/about.a0534951.js"
  },
  {
    "revision": "8e5e793e10c338503af6",
    "url": "js/about~detail.47586100.js"
  },
  {
    "revision": "9da3e990110565bfa57c",
    "url": "js/app.a7aae935.js"
  },
  {
    "revision": "c900d6091039998c94b9",
    "url": "js/chunk-vendors.c98251cd.js"
  },
  {
    "revision": "607ffe83acdcd9c9180e",
    "url": "js/detail.ff471d08.js"
  },
  {
    "revision": "b46d04eb43bc31ca0f9f95121646440d",
    "url": "manifest.json"
  },
  {
    "revision": "735ab4f94fbcd57074377afca324c813",
    "url": "robots.txt"
  }
 ]);
--- a/app/src/main/assets/web/new/service-worker.js
+++ b/app/src/main/assets/web/new/service-worker.js
@ -0,0 +1,34 @@
 /**
 * Welcome to your Workbox-powered service worker!
 *
 * You'll need to register this file in your web app and you should
 * disable HTTP caching for this file too.
 * See https://goo.gl/nhQhGp
 *
 * The rest of the code is auto-generated. Please don't update this file
 * directly; instead, make changes to your Workbox build configuration
 * and re-run your build process.
 * See https://goo.gl/2aRDsh
 */
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 importScripts(
  "precache-manifest.9ae0b839acd886dbe2adc2f9d92aeabf.js"
 );
 workbox.core.setCacheNameDetails({prefix: "yd-web-tool"});
 self.addEventListener('message', (event) => {
  if (event.data && event.data.type === 'SKIP_WAITING') {
    self.skipWaiting();
  }
 });
 /**
 * The workboxSW.precacheAndRoute() method efficiently caches and responds to
 * requests for URLs in the manifest.
 * See https://goo.gl/S9QRab
 */
 self.__precacheManifest = [].concat(self.__precacheManifest || []);
 workbox.precaching.precacheAndRoute(self.__precacheManifest, {});