Merge pull request #201 from Celeter/master

更新书源格式
5 years ago · d22669f4af
parent 827793ca28 f2e68a382a
commit d22669f4af
37 changed files with 133 additions and 105 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,4 +9,7 @@
 /release
 /tmp
 node_modules/
 /app/app
 /app/google
 /app/gradle.properties
 package-lock.json
--- a/app/src/main/assets/web/book.html
+++ b/app/src/main/assets/web/book.html
@ -1,39 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
    <meta charset="utf-8" />
    <title>阅读3.0书架</title>
    <link rel="icon" href="favicon.ico">
    <link href="book.css" rel="stylesheet" />
 </head>
 <body>
    <button id="top" class="top">↑</button>
    <button id="showchapter" class="showchapter">≡</button>
    <button id="hidebooks" class="hidebooks">❑</button>
    <div class="nav">
        <button id="back">返回</button>
        <button id="type">所有书籍 ▼</button>
        <button id="sort">手动排序 ▼</button>
        <button id="setting">阅读设置</button>
        <input type="text" class="address" id="address" title="阅读APP地址或IP" value="" />
        <button id="refresh">重新加载</button>
    </div>
    <div class="allcontent" id="allcontent">
        <div id="books" class="books"></div>
        <div id="more" class="more">
            <div id="info" class="info"></div>
            <div class="clear"></div>
            <div id="chapter" class="chapter"></div>
            <div id="content" class="content"></div>
            <div id="page" class="button">
                <center><button id='up'>上一章</button><button id='down'>下一章</button></center>
            </div>
        </div>
    </div>
    <script src="book.js"></script>
 </body>
 </html>
--- a/app/src/main/assets/web/bookshelf.html
+++ b/app/src/main/assets/web/bookshelf.html
@ -1,46 +1,39 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
-<html lang=en style="padding: 0;height:100%">
+<html>
 <head>
-  <meta charset=utf-8>
+    <meta charset="utf-8" />
-  <meta http-equiv=X-UA-Compatible content="IE=edge">
+    <title>阅读3.0书架</title>
-  <meta name=viewport content="width=device-width,initial-scale=1">
+    <link rel="icon" href="favicon.ico">
-  <!--[if IE]><link rel="icon" href="favicon.ico" /><![endif]-->
+    <link href="bookshelf.css" rel="stylesheet" />
  <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
+<body>
-      JavaScript enabled. Please enable it to continue.</strong></noscript>
+    <button id="top" class="top">↑</button>
-  <div id=app></div>
+    <button id="showchapter" class="showchapter">≡</button>
-  <script src=js/chunk-vendors.b3838a2d.js></script>
+    <button id="hidebooks" class="hidebooks">❑</button>
-  <script src=js/app.b25f3cec.js></script>
+    <div class="nav">
        <button id="back">返回</button>
        <button id="type">所有书籍 ▼</button>
        <button id="sort">手动排序 ▼</button>
        <button id="setting">阅读设置</button>
        <input type="text" class="address" id="address" title="阅读APP地址或IP" value="" />
        <button id="refresh">重新加载</button>
    </div>
    <div class="allcontent" id="allcontent">
        <div id="books" class="books"></div>
        <div id="more" class="more">
            <div id="info" class="info"></div>
            <div class="clear"></div>
            <div id="chapter" class="chapter"></div>
            <div id="content" class="content"></div>
            <div id="page" class="button">
                <center><button id='up'>上一章</button><button id='down'>下一章</button></center>
            </div>
        </div>
    </div>
    <script src="bookshelf.js"></script>
 </body>
 </html>
--- a/app/src/main/assets/web/index.html
+++ b/app/src/main/assets/web/index.html
@ -359,8 +359,8 @@
                                <br>(?i) 前缀表示忽略大小写
                            </div>
                            <a target="_blank" href="https://www.beta.browxy.com/">代码在线运行工具</a>
-                            <a target="_blank" href="book.html">阅读书架(经典)</a>
+                            <a target="_blank" href="bookshelf.html">阅读书架(经典)</a>
-							<a target="_blank" href="bookshelf.html">阅读书架(新潮)</a>
+							<a target="_blank" href="new/bookshelf.html">阅读书架(新潮)</a>
                        </div>
                    </div>
                </div>
--- a/app/src/main/assets/web/index.js
+++ b/app/src/main/assets/web/index.js
@ -36,23 +36,28 @@ const RuleJSON = (() => {
 	// 搜索规则
 	$$('.rules .ruleSearch').forEach(item => searchJson[item.title] = '');
-	ruleJson.ruleSearch = JSON.stringify(searchJson);
+	//ruleJson.ruleSearch = JSON.stringify(searchJson);
 	ruleJson.ruleSearch = searchJson;
 	// 发现规则
 	$$('.rules .ruleExplore').forEach(item => exploreJson[item.title] = '');
-	ruleJson.ruleExplore = JSON.stringify(exploreJson);
+	//ruleJson.ruleExplore = JSON.stringify(exploreJson);
 	ruleJson.ruleExplore = exploreJson;
 	// 详情页规则
 	$$('.rules .ruleBookInfo').forEach(item => bookInfoJson[item.title] = '');
-	ruleJson.ruleBookInfo = JSON.stringify(bookInfoJson);
+	//ruleJson.ruleBookInfo = JSON.stringify(bookInfoJson);
 	ruleJson.ruleBookInfo = bookInfoJson;
 	// 目录规则
 	$$('.rules .ruleToc').forEach(item => tocJson[item.title] = '');
-	ruleJson.ruleToc = JSON.stringify(tocJson);
+	//ruleJson.ruleToc = JSON.stringify(tocJson);
 	ruleJson.ruleToc = tocJson;
 	// 正文规则
 	$$('.rules .ruleContent').forEach(item => contentJson[item.title] = '');
-	ruleJson.ruleContent = JSON.stringify(contentJson);
+	//ruleJson.ruleContent = JSON.stringify(contentJson);
 	ruleJson.ruleContent = contentJson;
 	return ruleJson;
 })();
@ -110,38 +115,48 @@ function rule2json() {
 	// 转换搜索规则
 	let searchJson = {};
-	Object.keys(JSON.parse(RuleJSON.ruleSearch)).forEach(key => {
+	//Object.keys(JSON.parse(RuleJSON.ruleSearch)).forEach(key => {
 	Object.keys(RuleJSON.ruleSearch).forEach(key => {
 		searchJson[key] = $('#' + 'ruleSearch_' + key).value;
 	});
-	RuleJSON.ruleSearch = JSON.stringify(searchJson);
+	//RuleJSON.ruleSearch = JSON.stringify(searchJson);
 	RuleJSON.ruleSearch = searchJson;
 	// 转换发现规则
 	let exploreJson = {};
-	Object.keys(JSON.parse(RuleJSON.ruleExplore)).forEach(key => {
+	//Object.keys(JSON.parse(RuleJSON.ruleExplore)).forEach(key => {
 	Object.keys(RuleJSON.ruleExplore).forEach(key => {
 		exploreJson[key] = $('#' + 'ruleExplore_' + key).value;
 	});
-	RuleJSON.ruleExplore = JSON.stringify(exploreJson);
+	//RuleJSON.ruleExplore = JSON.stringify(exploreJson);
 	RuleJSON.ruleExplore = exploreJson;
 	// 转换详情页规则
 	let bookInfoJson = {};
-	Object.keys(JSON.parse(RuleJSON.ruleBookInfo)).forEach(key => {
+	//Object.keys(JSON.parse(RuleJSON.ruleBookInfo)).forEach(key => {
 	Object.keys(RuleJSON.ruleBookInfo).forEach(key => {
 		bookInfoJson[key] = $('#' + 'ruleBookInfo_' + key).value;
 	});
-	RuleJSON.ruleBookInfo = JSON.stringify(bookInfoJson);
+	//RuleJSON.ruleBookInfo = JSON.stringify(bookInfoJson);
 	RuleJSON.ruleBookInfo = bookInfoJson;
 	// 转换目录规则
 	let tocJson = {};
-	Object.keys(JSON.parse(RuleJSON.ruleToc)).forEach(key => {
+	//Object.keys(JSON.parse(RuleJSON.ruleToc)).forEach(key => {
 	Object.keys(RuleJSON.ruleToc).forEach(key => {
 		tocJson[key] = $('#' + 'ruleToc_' + key).value;
 	});
-	RuleJSON.ruleToc = JSON.stringify(tocJson);
+	//RuleJSON.ruleToc = JSON.stringify(tocJson);
 	RuleJSON.ruleToc = tocJson;
 	// 转换正文规则
 	let contentJson = {};
-	Object.keys(JSON.parse(RuleJSON.ruleContent)).forEach(key => {
+	//Object.keys(JSON.parse(RuleJSON.ruleContent)).forEach(key => {
 	Object.keys(RuleJSON.ruleContent).forEach(key => {
 		contentJson[key] = $('#' + 'ruleContent_' + key).value;
 	});
-	RuleJSON.ruleContent = JSON.stringify(contentJson);
+	//RuleJSON.ruleContent = JSON.stringify(contentJson);
 	RuleJSON.ruleContent = contentJson;
 	RuleJSON.lastUpdateTime = RuleJSON.lastUpdateTime == '' ? 0 : parseInt(RuleJSON.lastUpdateTime);
 	RuleJSON.customOrder = RuleJSON.customOrder == '' ? 0 : parseInt(RuleJSON.customOrder);
@ -171,40 +186,50 @@ function json2rule(RuleEditor) {
 	// 转换搜索规则
 	if (RuleEditor.ruleSearch) {
-		let searchJson = JSON.parse(RuleEditor.ruleSearch);
+		//let searchJson = JSON.parse(RuleEditor.ruleSearch);
-		Object.keys(JSON.parse(RuleJSON.ruleSearch)).forEach(key => {
+		let searchJson = RuleEditor.ruleSearch;
 		//Object.keys(JSON.parse(RuleJSON.ruleSearch)).forEach(key => {
 		Object.keys(RuleJSON.ruleSearch).forEach(key => {
 			$('#' + 'ruleSearch_' + key).value = searchJson[key] ? searchJson[key] : '';
 		});
 	}
 	// 转换发现规则
 	if (RuleEditor.ruleExplore) {
-		let exploreJson = JSON.parse(RuleEditor.ruleExplore);
+		//let exploreJson = JSON.parse(RuleEditor.ruleExplore);
-		Object.keys(JSON.parse(RuleJSON.ruleExplore)).forEach(key => {
+		//Object.keys(JSON.parse(RuleJSON.ruleExplore)).forEach(key => {
 		let exploreJson = RuleEditor.ruleExplore;
 		Object.keys(RuleJSON.ruleExplore).forEach(key => {
 			$('#' + 'ruleExplore_' + key).value = exploreJson[key] ? exploreJson[key] : '';
 		});
 	}
 	// 转换详情页规则
 	if (RuleEditor.ruleBookInfo) {
-		let bookInfoJson = JSON.parse(RuleEditor.ruleBookInfo);
+		//let bookInfoJson = JSON.parse(RuleEditor.ruleBookInfo);
-		Object.keys(JSON.parse(RuleJSON.ruleBookInfo)).forEach(key => {
+		//Object.keys(JSON.parse(RuleJSON.ruleBookInfo)).forEach(key => {
 		let bookInfoJson = RuleEditor.ruleBookInfo;
        Object.keys(RuleJSON.ruleBookInfo).forEach(key => {
 			$('#' + 'ruleBookInfo_' + key).value = bookInfoJson[key] ? bookInfoJson[key] : '';
 		});
 	}
 	// 转换目录规则
 	if (RuleEditor.ruleToc) {
-		let tocJson = JSON.parse(RuleEditor.ruleToc);
+		//let tocJson = JSON.parse(RuleEditor.ruleToc);
-		Object.keys(JSON.parse(RuleJSON.ruleToc)).forEach(key => {
+		//Object.keys(JSON.parse(RuleJSON.ruleToc)).forEach(key => {
 		let tocJson = RuleEditor.ruleToc;
 		Object.keys(RuleJSON.ruleToc).forEach(key => {
 			$('#' + 'ruleToc_' + key).value = tocJson[key] ? tocJson[key] : '';
 		});
 	}
 	// 转换正文规则
 	if (RuleEditor.ruleContent) {
-		let contentJson = JSON.parse(RuleEditor.ruleContent);
+		//let contentJson = JSON.parse(RuleEditor.ruleContent);
-		Object.keys(JSON.parse(RuleJSON.ruleContent)).forEach(key => {
+		//Object.keys(JSON.parse(RuleJSON.ruleContent)).forEach(key => {
 		let contentJson = RuleEditor.ruleContent;
        Object.keys(RuleJSON.ruleContent).forEach(key => {
 			$('#' + 'ruleContent_' + key).value = contentJson[key] ? contentJson[key] : '';
 		});
 	}
--- a/app/src/main/assets/web/new/bookshelf.css
+++ b/app/src/main/assets/web/new/bookshelf.css
--- a/app/src/main/assets/web/new/bookshelf.html
+++ b/app/src/main/assets/web/new/bookshelf.html
@ -0,0 +1,46 @@
 <!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.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.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
--- a/app/src/main/assets/web/new/css/about.f23c15cb.css
+++ b/app/src/main/assets/web/new/css/about.f23c15cb.css
--- a/app/src/main/assets/web/new/css/app.e1c0d2e4.css
+++ b/app/src/main/assets/web/new/css/app.e1c0d2e4.css
--- a/app/src/main/assets/web/new/css/chunk-vendors.ad4ff18f.css
+++ b/app/src/main/assets/web/new/css/chunk-vendors.ad4ff18f.css
--- a/app/src/main/assets/web/new/css/detail.42c41bd6.css
+++ b/app/src/main/assets/web/new/css/detail.42c41bd6.css
--- a/app/src/main/assets/web/new/fonts/element-icons.535877f5.woff
+++ b/app/src/main/assets/web/new/fonts/element-icons.535877f5.woff
--- a/app/src/main/assets/web/new/fonts/element-icons.732389de.ttf
+++ b/app/src/main/assets/web/new/fonts/element-icons.732389de.ttf
--- a/app/src/main/assets/web/new/fonts/iconfont.f9a3fb0e.woff
+++ b/app/src/main/assets/web/new/fonts/iconfont.f9a3fb0e.woff
--- a/app/src/main/assets/web/new/fonts/popfont.f39ecc1a.ttf
+++ b/app/src/main/assets/web/new/fonts/popfont.f39ecc1a.ttf
--- a/app/src/main/assets/web/new/fonts/shelffont.6c094b6d.ttf
+++ b/app/src/main/assets/web/new/fonts/shelffont.6c094b6d.ttf
--- a/app/src/main/assets/web/new/img/icons/android-chrome-192x192.png
+++ b/app/src/main/assets/web/new/img/icons/android-chrome-192x192.png
--- a/app/src/main/assets/web/new/img/icons/android-chrome-512x512.png
+++ b/app/src/main/assets/web/new/img/icons/android-chrome-512x512.png
--- a/app/src/main/assets/web/new/img/icons/apple-touch-icon-120x120.png
+++ b/app/src/main/assets/web/new/img/icons/apple-touch-icon-120x120.png
--- a/app/src/main/assets/web/new/img/icons/apple-touch-icon-152x152.png
+++ b/app/src/main/assets/web/new/img/icons/apple-touch-icon-152x152.png
--- a/app/src/main/assets/web/new/img/icons/apple-touch-icon-180x180.png
+++ b/app/src/main/assets/web/new/img/icons/apple-touch-icon-180x180.png
--- a/app/src/main/assets/web/new/img/icons/apple-touch-icon-60x60.png
+++ b/app/src/main/assets/web/new/img/icons/apple-touch-icon-60x60.png
--- a/app/src/main/assets/web/new/img/icons/apple-touch-icon-76x76.png
+++ b/app/src/main/assets/web/new/img/icons/apple-touch-icon-76x76.png
--- a/app/src/main/assets/web/new/img/icons/apple-touch-icon.png
+++ b/app/src/main/assets/web/new/img/icons/apple-touch-icon.png
--- a/app/src/main/assets/web/new/img/icons/favicon-16x16.png
+++ b/app/src/main/assets/web/new/img/icons/favicon-16x16.png
--- a/app/src/main/assets/web/new/img/icons/favicon-32x32.png
+++ b/app/src/main/assets/web/new/img/icons/favicon-32x32.png
--- a/app/src/main/assets/web/new/img/icons/msapplication-icon-144x144.png
+++ b/app/src/main/assets/web/new/img/icons/msapplication-icon-144x144.png
--- a/app/src/main/assets/web/new/img/icons/mstile-150x150.png
+++ b/app/src/main/assets/web/new/img/icons/mstile-150x150.png
--- a/app/src/main/assets/web/new/img/icons/safari-pinned-tab.svg
+++ b/app/src/main/assets/web/new/img/icons/safari-pinned-tab.svg
--- a/app/src/main/assets/web/new/img/noCover.b5c48bc1.jpeg
+++ b/app/src/main/assets/web/new/img/noCover.b5c48bc1.jpeg
--- 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~detail.08c372e6.js
+++ b/app/src/main/assets/web/new/js/about~detail.08c372e6.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/detail.043d6e39.js
+++ b/app/src/main/assets/web/new/js/detail.043d6e39.js
--- a/app/src/main/assets/web/new/manifest.json
+++ b/app/src/main/assets/web/new/manifest.json