Support CloudMusic 5.8.x

bin456789 · Jan 25, 2019 · 1fba78a · 1fba78a
1 parent 2ab8fd0
commit 1fba78a
Show file tree

Hide file tree

Showing 35 changed files with 942 additions and 834 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,11 +8,11 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-27.0.3
-    - android-27
+    - build-tools-28.0.3
+    - android-28
 
 before_install:
-  - yes | sdkmanager "platforms;android-27"
+  - yes | sdkmanager "platforms;android-28"
 
 script:
   - if [[ "${TRAVIS_PULL_REQUEST}" = "false" ]]; then

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Xposed version of EraserKing's [Unblock163MusicClient](https://github.com/EraserKing/Unblock163MusicClient).
 
-Compatible with app v3/v4/v5.
+Compatible with app ≈ v5.8.x .
 
 
 ## Thanks

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,9 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
-    useLibrary 'org.apache.http.legacy'
+    compileSdkVersion 28
     signingConfigs {
         release {
             if (System.getenv()["CI"]) {
@@ -23,9 +21,9 @@ android {
     }
     defaultConfig {
         applicationId "bin.xposed.Unblock163MusicClient"
-        minSdkVersion 9
-        targetSdkVersion 27
-        versionCode 27
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionCode 28
         versionName = "0.0.${versionCode}"
         archivesBaseName = "${applicationId}-${versionName}"
     }
@@ -50,15 +48,16 @@ android {
 dependencies {
     compileOnly 'de.robv.android.xposed:api:53'
     compileOnly 'de.robv.android.xposed:api:53:sources'
-    implementation 'dnsjava:dnsjava:2.1.8'
-    implementation 'com.annimon:stream:1.2.0'
+    implementation 'com.annimon:stream:1.2.1'
+    implementation project(':hotxposed')
 }
 
 afterEvaluate {
     installDebug.doLast {
-        updateVirtualXposedAPP.execute()
-        rebootVirtualXposedAPP.execute()
-        launchVirtualXposedAPP.execute()
+//        updateVirtualXposedAPP.execute()
+//        rebootVirtualXposedAPP.execute()
+//        launchVirtualXposedAPP.execute()
+        restartCloudMusic.execute()
     }
 }
 
@@ -74,4 +73,12 @@ task rebootVirtualXposedAPP(type: Exec) {
 task launchVirtualXposedAPP(type: Exec) {
     def pkg = "com.netease.cloudmusic"
     commandLine android.adbExecutable, 'shell', 'am', 'broadcast', '-a', 'io.va.exposed.CMD', '-e', 'cmd', 'launch', '-e', 'pkg', pkg
+    commandLine android.adbExecutable, 'shell', 'am', 'force-stop', pkg
 }
+
+task restartCloudMusic(type: Exec) {
+    def pkg = "com.netease.cloudmusic"
+    commandLine 'adb', 'shell', 'am', 'force-stop', pkg
+    commandLine 'adb', 'shell', 'monkey', '-p', pkg, "1"
+}
+
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -16,9 +16,13 @@
 #   public *;
 #}
 
--dontwarn org.xbill.DNS.spi.DNSJavaNameServiceDescriptor
--keep public class bin.xposed.Unblock163MusicClient.Main
+-keep class bin.xposed.Unblock163MusicClient.Main
+
+-keepclassmembers class bin.xposed.Unblock163MusicClient.HookerDispatcher* {
+  void dispatch(***);
+}
+
 -keepclassmembernames class bin.xposed.Unblock163MusicClient.ui.SettingsActivity {
-    int getActivatedModuleVersion();
+    boolean isModuleActive();
 }