1、修复由于node异常导致的crash

2、脚本错误提示方式改为通知栏

README.md

@@ -1,25 +1,52 @@
 # 杜比大喇叭β版
-### 大喇叭已经很久不维护了，感谢大家的喜爱与支持，大喇叭将再次迎来改版并修复一些遗留的问题，可能需要一到两个星期，敬请期待。
 
-杜比大喇叭的β版迎来了重大的革新，合并了[UnblockMusic Pro](https://github.com/nining377/UnblockMusicPro_Xposed)的所有功能且更加强大，同时UnblockMusicPro_Xposed项目将会停止维护，让我们欢送这位老朋友！
+[![Stars](https://img.shields.io/github/stars/nining377/dolby_beta?label=Stars)](https://github.com/Dr-TSNG)
+[![Release](https://img.shields.io/github/v/release/nining377/dolby_beta?label=Release)](https://github.com/nining377/dolby_beta/releases/latest)
+[![Download](https://img.shields.io/github/downloads/nining377/dolby_beta/total)](https://github.com/nining377/dolby_beta/releases/latest)
+[![License](https://img.shields.io/github/license/nining377/dolby_beta?label=License)](https://choosealicense.com/licenses/mit/)
+
+#### 杜比大喇叭β是一款网易云音乐的音源代理模块，初衷只是我对网易云音乐的热爱，希望让更多的人使用网易云。
+#### 模块工作原理为音源替换而非破解，所以单曲付费与无版权歌曲有几率匹配错误，真心支持歌手请付费！
+#### 模块工作原理为音源替换而非破解，所以单曲付费与无版权歌曲有几率匹配错误，真心支持歌手请付费！
+#### 模块工作原理为音源替换而非破解，所以单曲付费与无版权歌曲有几率匹配错误，真心支持歌手请付费！
+#### 重要事情得说三遍，不要再因为不匹配而提交issue了。
+
+杜比大喇叭β 3.X会有以下改变：
+- 编译版本提高至29并采用AndroidX API
+- 模块被嵌入到网易云音乐的设置中
+- 由于Android R对可执行文件的进一步限制，摒弃了2.X手动选择脚本与Node的方式
+- 架构需与安装的网易云音乐相同，故提供32位与64位版本下载，太极只提交32位版本，太极用户请勿使用64位网易云音乐
+- 当前版本以稳定为主，杜比大喇叭β将能无缝适配最新版网易云音乐，如有问题请提交issue
+- 因本人不使用太极，所以不保证太极等非root框架可以顺利运行，欢迎Fork适配
 
 [快帮我点小星星呀，我要好多好多的小星星！](https://github.com/nining377/dolby_beta)
 
-### ~~！！！因[nondanee/UnblockNeteaseMusic](https://github.com/nondanee/UnblockNeteaseMusic)已长期不维护，故不再提供模块内更新脚本的功能！！！~~
-### 请使用[1715173329/UnblockNeteaseMusic](https://github.com/1715173329/UnblockNeteaseMusic/tree/enhanced)提供的脚本。
+## 下载方式
 
-# 使用方法
-
-考虑到部分人只使用模块的精简功能，且UnblockMusic Pro在SD卡目录中释放脚本文件广为人诟病，杜比大喇叭β版将不再内置脚本文件，需要的可自行下载。
+[GitHub Release](https://github.com/nining377/dolby_beta/releases/latest)
 
 [杜比大喇叭β版](https://wwi.lanzoui.com/b0cqxgwje) 访问密码：brdb
 
-[脚本与node文件，按需取用](https://wwi.lanzoui.com/b0cr00nve) 访问密码：1iti
+##TODO
+
+- 尽可能保证不因模块造成crash（改版网易云往往经过二次混淆，将得不到适配）
+- 部分美化功能的添加
+- 更稳定的代理方式
 
-# 主要功能
+## 主要功能
 
 <img src="https://raw.githubusercontent.com/nining377/dolby_beta/master/image/img_01.png" width="50%">
 
+## 致谢
+
+[nondanee/UnblockNeteaseMusic](https://github.com/nondanee/UnblockNeteaseMusic)
+
+[Unblock Netease Music 维护小组](https://github.com/UnblockNeteaseMusic/server)
+
+[bin456789/Unblock163MusicClient-Xposed](https://github.com/bin456789/Unblock163MusicClient-Xposed)
+
+[Flysky12138/UnblockNeteaseMusic-Android](https://github.com/Flysky12138/UnblockNeteaseMusic-Android)
+
 ## 许可
 
 The MIT License

app/.gitignore

@@ -1 +1 @@
-/build
+/build

app/CMakeLists.txt

@@ -0,0 +1,58 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+ native-lib
+
+ # Sets the library as a shared library.
+ SHARED
+
+ # Provides a relative path to your source file(s).
+ src/main/cpp/native-lib.cpp)
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+find_library( # Sets the name of the path variable.
+ log-lib
+
+ # Specifies the name of the NDK library that
+ # you want CMake to locate.
+ log)
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+target_link_libraries( # Specifies the target library.
+ native-lib
+ libnode
+ # Links the target library to the log library
+ # included in the NDK.
+ ${log-lib})
+
+#Includes node's header files.
+include_directories(libnode/include/node)
+
+add_library(libnode
+ SHARED
+ IMPORTED)
+
+set_target_properties( # Specifies the target library.
+ libnode
+ # Specifies the parameter you want to define.
+ PROPERTIES IMPORTED_LOCATION
+ # Provides the path to the library you want to import.
+ ${CMAKE_SOURCE_DIR}/libnode/bin/${ANDROID_ABI}/libnode.so)

app/build.gradle

@@ -1,19 +1,33 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 28
+ compileSdkVersion 29
  buildToolsVersion "29.0.3"
 
  defaultConfig {
  applicationId "com.raincat.dolby_beta"
- minSdkVersion 14
- targetSdkVersion 23
- versionCode 210
- versionName "2.1.0"
+ minSdkVersion 21
+ targetSdkVersion 29
+ versionCode 320
+ versionName "3.2.0"
+
+ externalNativeBuild {
+ cmake {
+ cppFlags ""
+ arguments "-DANDROID_STL=c++_shared"
+ }
+ }
+
+ ndk {
+ abiFilters "armeabi-v7a"//, "arm64-v8a"
+ }
  }
+
  buildTypes {
  release {
- minifyEnabled true
+ buildConfigField "boolean", "LOG_DEBUG", "false" //不显示log
+// shrinkResources false //资源压缩
+ minifyEnabled false //混淆
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  }
  }
@@ -38,19 +52,24 @@ android {
  lintOptions {
  abortOnError false
  }
+
+ externalNativeBuild {
+ cmake {
+ path "CMakeLists.txt"
+ version "3.10.2"
+ }
+ }
 }
 
 dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation fileTree(dir: "libs", include: ["*.jar"])
+ implementation 'androidx.appcompat:appcompat:1.2.0'
+ implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
  //xposed库
  compileOnly 'de.robv.android.xposed:api:82'
  compileOnly 'de.robv.android.xposed:api:82:sources'
  implementation 'com.annimon:stream:1.2.1'
  implementation 'org.smali:dexlib2:2.3.4'
  implementation 'com.google.guava:guava:28.2-android'
- implementation 'com.google.code.gson:gson:2.8.5'
- implementation 'com.android.support:support-v4:28.0.0'
-
- implementation project(':hotxposed')
- implementation files('libs/tools.jar')
+ implementation 'com.google.code.gson:gson:2.8.6'
 }