Merge pull request #768 from Celeter/master

解决文件下载异常，在线语音可正常播放

.github/workflows/legado.yml

@@ -28,13 +28,13 @@ jobs:
       # 蓝奏云里的文件夹名（需手动在蓝奏云创建）
       LANZOU_FOLDER: '阅读3测试版'
       # 是否上传到artifact
-      UPLOAD_ARTIFACT: 'false'
+      UPLOAD_ARTIFACT: 'true'
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 1.8
+      - name: set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 14
       - name: clear 18PlusList.txt
         run: |
           echo "清空18PlusList.txt"
@@ -87,4 +87,4 @@ jobs:
         if: ${{ env.LANZOU_PSD }}
         run: python $GITHUB_WORKSPACE/.github/lzy.py
         env:
-          UPLOAD_FOLDER: ${{ github.workspace }}/app/build/outputs/apk/app/release/
+          UPLOAD_FOLDER: ${{ github.workspace }}/app/build/outputs/apk/app/release/

README.md

@@ -1,6 +1,15 @@
-# legado
+<div>
+  <img width="192" height="192" align="left" src="https://github.com/gedoor/legado/raw/master/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" alt="legado"/>
+  <h1>Legado</h1>
+  <br>
+  <p>阅读3.0, 阅读是一款可以自定义来源阅读网络内容的工具，为广大网络文学爱好者提供一种方便、快捷舒适的试读体验。</p>
+</div>
 
-[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)  [![Build Action](https://github.com/gedoor/legado/workflows/Android%20CI/badge.svg)](https://github.com/gedoor/legado/actions)
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![Build Action](https://github.com/gedoor/legado/workflows/Android%20CI/badge.svg)](https://github.com/gedoor/legado/actions)
+[![Downloads](https://img.shields.io/github/downloads/gedoor/legado/total.svg)](https://github.com/gedoor/legado/releases/latest)
+[![GitHub issues](https://img.shields.io/github/issues/gedoor/legado)](https://github.com/gedoor/legado/issues)
+[![GitHub contributors](https://img.shields.io/github/contributors/gedoor/legado)](https://github.com/gedoor/legado/graphs/contributors)
 
 ## 阅读3.0
 * [书源规则](https://alanskycn.gitee.io/teachme/)
@@ -8,9 +17,9 @@
 * [帮助文档](/app/src/main/assets/help/appHelp.md)
 
 ## 下载
-<a href="https://play.google.com/store/apps/details?id=io.legado.play.release"><img width="200px" alt="Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"/></a> or <a href="https://www.coolapk.com/apk/io.legado.app.release"><img width="100px" height="100px" alt="CoolApk" src="https://static.coolapk.com/static/web/v8/images/header-logo.png"/></a> or [Releases](https://github.com/gedoor/legado/releases/latest)
+<a href="https://play.google.com/store/apps/details?id=io.legado.play.release"><img width="200px" alt="Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"/></a> or <a href="https://www.coolapk.com/apk/io.legado.app.release"><img width="100px" height="100px" alt="CoolApk" src="https://github.com/Celeter/build/raw/master/.github/scripts/coolapk.png"/></a> or [Releases](https://github.com/gedoor/legado/releases/latest)
 
-### 阅读API
+## 阅读API
 阅读3.0 提供了2种方式的API：`Web方式`和`Content Provider方式`。您可以在[这里](api.md)根据需要自行调用。 
 
 ## 感谢

app/src/main/java/io/legado/app/help/JsExtensions.kt

@@ -66,7 +66,7 @@ interface JsExtensions {
         FileUtils.deleteFile(zipPath)
         val zipFile = FileUtils.createFileIfNotExist(zipPath)
         StringUtils.hexStringToByte(content).let {
-            if (it != null) {
+            if (it.isNotEmpty()) {
                 zipFile.writeBytes(it)
             }
         }

app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt

@@ -358,6 +358,7 @@ class AnalyzeUrl(
                 .setAssemblyEnabled(false)
                 .setOkClient(HttpHelper.getProxyClient(proxy))
                 .addAllEncoded(fieldMap)
+                .addAllHeader(headerMap)
                 .toByteArray().await()
         }
     }