1.同步最新unblockmusic维护小组脚本

2.移除咪咕Cookie（咪咕源已失效，推荐使用默认pyncmd和kuwo源） 3.适配网易云音乐荣耀定制版（不完美适配）
luoxingran · Nov 25, 2023 · e4d0b98 · e4d0b98
1 parent 9680340
commit e4d0b98
Show file tree

Hide file tree

Showing 7 changed files with 196 additions and 183 deletions.
diff --git a/app/src/main/assets/UnblockNeteaseMusic.zip b/app/src/main/assets/UnblockNeteaseMusic.zip
diff --git a/...java/com/raincat/dolby_beta/Hooklite.java → ...ava/com/raincat/dolby_beta/HookOther.java b/...java/com/raincat/dolby_beta/Hooklite.java → ...ava/com/raincat/dolby_beta/HookOther.java
diff --git a/app/src/main/java/com/raincat/dolby_beta/HookerDispatcher.java b/app/src/main/java/com/raincat/dolby_beta/HookerDispatcher.java
@@ -18,7 +18,7 @@ public class HookerDispatcher implements IHookerDispatcher {
     @Override
     public void dispatch(XC_LoadPackage.LoadPackageParam lpparam) {
         new Hook(lpparam);
-        new Hooklite(lpparam);
+        new HookOther(lpparam);
     }
 }
 

diff --git a/app/src/main/java/com/raincat/dolby_beta/MainHook.java b/app/src/main/java/com/raincat/dolby_beta/MainHook.java
@@ -4,8 +4,6 @@
 
 import com.raincat.dolby_beta.helper.ScriptHelper;
 
-import net.androidwing.hotxposed.HotXposed;
-
 import de.robv.android.xposed.IXposedHookLoadPackage;
 import de.robv.android.xposed.IXposedHookZygoteInit;
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam;
@@ -26,7 +24,9 @@ public void handleLoadPackage(final LoadPackageParam lpparam) throws Exception {
 //            HotXposed.hook(HookerDispatcher.class, lpparam);
                 new Hook(lpparam);
         }else if (!TextUtils.isEmpty(lpparam.packageName) && lpparam.packageName.equals("com.netease.cloudmusic.lite")) {
-            new Hooklite(lpparam);
+            new HookOther(lpparam);
+        }else if (!TextUtils.isEmpty(lpparam.packageName) && lpparam.packageName.equals("com.hihonor.cloudmusic")) {
+            new HookOther(lpparam);
         }
     }
 

diff --git a/app/src/main/java/com/raincat/dolby_beta/helper/SettingHelper.java b/app/src/main/java/com/raincat/dolby_beta/helper/SettingHelper.java
@@ -122,7 +122,7 @@ public class SettingHelper {
 
     public static final String proxy_original_key = "β_proxy_original_key";
     public static final String proxy_original_title = "代理源（空格隔开）";
-    public static final String proxy_original_default = "kuwo pyncmd";
+    public static final String proxy_original_default = "pyncmd kuwo";
 
     public static final String proxy_cover_key = "β_proxy_cover_key";
     public static final String proxy_cover_title = "重新释放脚本";
@@ -225,7 +225,7 @@ public void refreshSetting(Context context) {
 
     }
 
-    public void setSetting(String key, boolean value) {
+    public void  setSetting(String key, boolean value) {
         settingMap.put(key, value);
         sharedPreferences.edit().putBoolean(key, value).apply();
     }

diff --git a/app/src/main/java/com/raincat/dolby_beta/hook/AdAndUpdateHook.java b/app/src/main/java/com/raincat/dolby_beta/hook/AdAndUpdateHook.java
@@ -52,7 +52,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                         //加了一个反营销版权保护的URL，暂时作用未知
                         if (urlObj.toString().contains("appcustomconfig/get")
                                 //去广告
-                                || (SettingHelper.getInstance().isEnable(SettingHelper.black_key) && !urlObj.toString().contains("music.126.net") && (urlObj.toString().contains("resource-exposure/config") || urlObj.toString().contains("api/ad") || urlObj.toString().endsWith(".jpg") || urlObj.toString().endsWith(".mp4")))
+                                || (SettingHelper.getInstance().isEnable(SettingHelper.black_key) && !urlObj.toString().contains("music.126.net") && (urlObj.toString().contains("resource-exposure/config") || urlObj.toString().contains("api/ad") || urlObj.toString().endsWith(".jpg") || urlObj.toString().endsWith(".mp4") || urlObj.toString().contains("ad/get")|| urlObj.toString().contains("ad/loading")))
                                 //去升级
                                 || (SettingHelper.getInstance().isEnable(SettingHelper.update_key) && (urlObj.toString().contains("android/version") || urlObj.toString().contains("android/upgrade")))) {
                             Field url = urlObj.getClass().getDeclaredField(urlFieldString);

diff --git a/app/src/main/java/com/raincat/dolby_beta/hook/SettingHook.java b/app/src/main/java/com/raincat/dolby_beta/hook/SettingHook.java
@@ -333,7 +333,7 @@ private void showProxyConfigurationDialog(final Context context) {
         dialogProxyRoot.addView(proxyOriginalView);
        // dialogProxyRoot.addView(proxykuwoView);
         dialogProxyRoot.addView(proxyqqView);
-        dialogProxyRoot.addView(proxymiguView);
+       // dialogProxyRoot.addView(proxymiguView);
         new AlertDialog.Builder(context)
                 .setView(dialogProxyRoot)
                 .setCancelable(true)