修复 kuwo 和 qq 过滤机制

moyess · Sep 29, 2020 · ceb2e1a · ceb2e1a
1 parent b5e27da
commit ceb2e1a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/Easy163/app/build.gradle b/Easy163/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "org.ndroi.easy163"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 21
-        versionName "1.8.0"
+        versionCode 22
+        versionName "1.8.1"
     }
     buildTypes {
         release {

diff --git a/Easy163/app/src/main/AndroidManifest.xml b/Easy163/app/src/main/AndroidManifest.xml
@@ -20,6 +20,8 @@
                 <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
+        <service android:name=".ui.EasyTileService" />
+
         <activity
             android:name=".ui.MainActivity"
             android:label="@string/app_name"

diff --git a/Easy163/app/src/main/java/org/ndroi/easy163/providers/KuwoMusic.java b/Easy163/app/src/main/java/org/ndroi/easy163/providers/KuwoMusic.java
@@ -1,5 +1,7 @@
 package org.ndroi.easy163.providers;
 
+import android.util.Log;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
@@ -46,12 +48,6 @@ public void collectCandidateKeywords()
                     for (Object obj : candidates)
                     {
                         JSONObject songJsonObject = (JSONObject) obj;
-                        // I think it means 'isListenFree'
-                        boolean isListenFree = songJsonObject.getBooleanValue("isListenFee");
-                        if(!isListenFree)
-                        {
-                            continue;
-                        }
                         Keyword candidateKeyword = new Keyword();
                         candidateKeyword.songName = songJsonObject.getString("name");
                         candidateKeyword.singers = Arrays.asList(songJsonObject.getString("artist").split("&"));
@@ -105,6 +101,7 @@ public Song fetchSongByJson(JSONObject jsonObject)
             {
                 byte[] content = ReadStream.read(connection.getInputStream());
                 String songUrl = new String(content);
+                Log.d("Kuwo", songUrl);
                 if (songUrl.startsWith("http"))
                 {
                     song = generateSong(songUrl);

diff --git a/Easy163/app/src/main/java/org/ndroi/easy163/providers/Provider.java b/Easy163/app/src/main/java/org/ndroi/easy163/providers/Provider.java
@@ -200,8 +200,8 @@ public static List<Provider> getProviders(Keyword targetKeyword)
         List<Provider> providers = Arrays.asList(
                 new KuwoMusic(targetKeyword),
                 new MiguMusic(targetKeyword),
-                new QQMusic(targetKeyword),
-                new KugouMusic(targetKeyword)
+                new QQMusic(targetKeyword)
+                //new KugouMusic(targetKeyword)
         );
         return providers;
     }

diff --git a/Easy163/app/src/main/java/org/ndroi/easy163/providers/QQMusic.java b/Easy163/app/src/main/java/org/ndroi/easy163/providers/QQMusic.java
@@ -51,6 +51,11 @@ public void collectCandidateKeywords()
                         {
                             continue;
                         }
+                        int fnote = songJsonObject.getIntValue("fnote");
+                        if (fnote == 4002)
+                        {
+                            continue;
+                        }
                         JSONObject files = songJsonObject.getJSONObject("file");
                         if(files.getIntValue("size_128") == 0 && files.getIntValue("size_320") == 0)
                         {

diff --git a/Easy163/app/src/main/java/org/ndroi/easy163/ui/EasyTileService.java b/Easy163/app/src/main/java/org/ndroi/easy163/ui/EasyTileService.java
@@ -0,0 +1,8 @@
+package org.ndroi.easy163.ui;
+
+import android.service.quicksettings.TileService;
+
+public class EasyTileService extends TileService
+{
+
+}