1.兼容UnblockNeteaseMusic/server#107 的更改

nining377 · Aug 17, 2021 · ca7682a · ca7682a
1 parent e3459c4
commit ca7682a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,18 +1,20 @@
 # 杜比大喇叭β版
+### 大喇叭已经很久不维护了，感谢大家的喜爱与支持，大喇叭将再次迎来改版并修复一些遗留的问题，可能需要一到两个星期，敬请期待。
 
 杜比大喇叭的β版迎来了重大的革新，合并了[UnblockMusic Pro](https://github.com/nining377/UnblockMusicPro_Xposed)的所有功能且更加强大，同时UnblockMusicPro_Xposed项目将会停止维护，让我们欢送这位老朋友！
 
 [快帮我点小星星呀，我要好多好多的小星星！](https://github.com/nining377/dolby_beta)
 
-### ！！！因[nondanee/UnblockNeteaseMusic](https://github.com/nondanee/UnblockNeteaseMusic)已长期不维护，故不再提供模块内更新脚本的功能！！！
+### ~~！！！因[nondanee/UnblockNeteaseMusic](https://github.com/nondanee/UnblockNeteaseMusic)已长期不维护，故不再提供模块内更新脚本的功能！！！~~
+### 请使用[1715173329/UnblockNeteaseMusic](https://github.com/1715173329/UnblockNeteaseMusic/tree/enhanced)提供的脚本。
 
 # 使用方法
 
 考虑到部分人只使用模块的精简功能，且UnblockMusic Pro在SD卡目录中释放脚本文件广为人诟病，杜比大喇叭β版将不再内置脚本文件，需要的可自行下载。
 
-[杜比大喇叭β版](https://wwi.lanzous.com/b0cqxgwje) 访问密码：brdb
+[杜比大喇叭β版](https://wwi.lanzoui.com/b0cqxgwje) 访问密码：brdb
 
-[脚本与node文件，按需取用](https://wwi.lanzous.com/b0cr00nve) 访问密码：1iti
+[脚本与node文件，按需取用](https://wwi.lanzoui.com/b0cr00nve) 访问密码：1iti
 
 # 主要功能
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.raincat.dolby_beta"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 202
-        versionName "2.0.2"
+        versionCode 203
+        versionName "2.0.3"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/raincat/dolby_beta/hook/UnblockMusicHook.java b/app/src/main/java/com/raincat/dolby_beta/hook/UnblockMusicHook.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.widget.Toast;
 
 import com.raincat.dolby_beta.db.ExtraDao;
 import com.raincat.dolby_beta.utils.Setting;
@@ -156,11 +155,11 @@ public void commandOutput(int id, String line) {
     private void quality() {
         List<String> scriptList = Tools.readFileFromSD(dataPath + File.separator + "src" + File.separator + "provider" + File.separator + "select.js");
         for (int i = 0; i < scriptList.size(); i++) {
-            if (scriptList.get(i).contains("ENABLE_FLAC")) {
+            if (scriptList.get(i).contains("env.ENABLE_FLAC")) {
                 if (Setting.isQualityEnabled())
-                    scriptList.set(i, "module.exports.ENABLE_FLAC = 'true'");
+                    scriptList.set(i, "(process.env.ENABLE_FLAC || 'true').toLowerCase() === 'true';");
                 else
-                    scriptList.set(i, "module.exports.ENABLE_FLAC = (process.env.ENABLE_FLAC || '').toLowerCase() === 'true'");
+                    scriptList.set(i, "(process.env.ENABLE_FLAC || '').toLowerCase() === 'true';");
                 break;
             }
         }
@@ -175,9 +174,9 @@ private void force() {
         for (int i = 0; i < scriptList.size(); i++) {
             if (scriptList.get(i).contains("item.code") && scriptList.get(i).contains("item.freeTrialInfo")) {
                 if (Setting.isForceEnabled())
-                    scriptList.set(i, "\t\tif ((item.code != 200 || item.freeTrialInfo || item.br <= 128000) && (target == 0 || item.id == target)) {");
+                    scriptList.set(i, "\t\t(item.code != 200 || item.freeTrialInfo || item.br <= 128000) &&");
                 else
-                    scriptList.set(i, "\t\tif ((item.code != 200 || item.freeTrialInfo) && (target == 0 || item.id == target)) {");
+                    scriptList.set(i, "\t\t(item.code != 200 || item.freeTrialInfo) &&");
                 break;
             }
         }