choose best density for resource

hsiafan · Oct 12, 2018 · f23aa00 · f23aa00
1 parent 19b1093
commit f23aa00
Showing 1 changed file with 24 additions and 10 deletions.
diff --git a/src/main/java/net/dongliu/apk/parser/struct/ResourceValue.java b/src/main/java/net/dongliu/apk/parser/struct/ResourceValue.java
@@ -1,10 +1,7 @@
 package net.dongliu.apk.parser.struct;
 
+import net.dongliu.apk.parser.struct.resource.*;
 import net.dongliu.apk.parser.utils.Locales;
-import net.dongliu.apk.parser.struct.resource.ResourceEntry;
-import net.dongliu.apk.parser.struct.resource.ResourceTable;
-import net.dongliu.apk.parser.struct.resource.Type;
-import net.dongliu.apk.parser.struct.resource.TypeSpec;
 
 import java.util.List;
 import java.util.Locale;
@@ -119,6 +116,11 @@ public String toStringValue(ResourceTable resourceTable, Locale locale) {
                 return null;
             }
         }
+
+        @Override
+        public String toString() {
+            return value + ":" + stringPool.get(value);
+        }
     }
 
     /**
@@ -147,18 +149,21 @@ public String toStringValue(ResourceTable resourceTable, Locale locale) {
             // read from type resource
             ResourceEntry selected = null;
             TypeSpec typeSpec = null;
-            int currentLevel = -1;
+            int currentLocalMatchLevel = -1;
+            int currentDensityLevel = -1;
             for (ResourceTable.Resource resource : resources) {
                 Type type = resource.getType();
                 typeSpec = resource.getTypeSpec();
                 ResourceEntry resourceEntry = resource.getResourceEntry();
-                int level = Locales.match(locale, type.getLocale());
-                if (level == 2) {
+                int localMatchLevel = Locales.match(locale, type.getLocale());
+                int densityLevel = densityLevel(type.getDensity());
+                if (localMatchLevel > currentLocalMatchLevel) {
                     selected = resourceEntry;
-                    break;
-                } else if (level > currentLevel) {
+                    currentLocalMatchLevel = localMatchLevel;
+                    currentDensityLevel = densityLevel;
+                } else if (densityLevel > currentDensityLevel) {
                     selected = resourceEntry;
-                    currentLevel = level;
+                    currentDensityLevel = densityLevel;
                 }
             }
             String result;
@@ -176,6 +181,15 @@ public long getReferenceResourceId() {
             return value & 0xFFFFFFFFL;
         }
 
+        private static int densityLevel(int density) {
+            if (density == Densities.ANY || density == Densities.NONE) {
+                return -1;
+            }
+            if (density == Densities.DEFAULT) {
+                return Densities.DEFAULT;
+            }
+            return density;
+        }
     }
 
     private static class NullResourceValue extends ResourceValue {