1、适配android13:getPackageInfo flags int -> long

2、读取meta-data时数据类型转换错误

Author: limpoxe

FairyPlugin/src/main/java/com/limpoxe/fairy/content/PluginDescriptor.java

@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.os.Bundle;
 
@@ -75,7 +76,7 @@ public class PluginDescriptor implements Serializable {
 
 private transient Bundle metaData;
 
-private HashMap<String, String> metaDataString = new HashMap<String, String>();
+private HashMap<String, Object> metaDataObject = new HashMap<String, Object>();
 private HashMap<String, Integer> metaDataResource = new HashMap<String, Integer>();
 private HashMap<String, String> metaDataTobeInflate = new HashMap<String, String>();
 
@@ -134,7 +135,7 @@ public class PluginDescriptor implements Serializable {
 
 private ArrayList<String> muliDexList;
 
-private transient HashMap<Integer, PackageInfo> packageInfoHashMap;
+private transient HashMap<Object, PackageInfo> packageInfoHashMap;
 
 //=============getter and setter======================
 
@@ -256,11 +257,20 @@ public static void inflateMetaData(PluginDescriptor descriptor, Resources plugin
 //todo cailiming bugfix metadata需要按manifest中的节点分开存储，不能合并成一个大bundle
 descriptor.setMetaData(metaData);
 
-Iterator<Map.Entry<String, String>> strItr = descriptor.getMetaDataString().entrySet().iterator();
+Iterator<String> strItr = descriptor.getMetaDataObject().keySet().iterator();
 while(strItr.hasNext()) {
-Map.Entry<String, String> entry = strItr.next();
-LogUtil.d(entry.getKey(), entry.getValue());
-metaData.putString(entry.getKey(), entry.getValue());
+String key = strItr.next();
+Object value = descriptor.getMetaDataObject().get(key);
+LogUtil.d(key, value);
+if (value instanceof Boolean) {
+metaData.putBoolean(key, (Boolean) value);
+} else if (value instanceof Float) {
+metaData.putFloat(key, (Float) value);
+} else if (value instanceof Integer) {
+metaData.putInt(key, (Integer) value);
+} else if (value instanceof String) {
+metaData.putString(key, (String) value);
+}
 }
 
 Iterator<Map.Entry<String, Integer>> resItr = descriptor.getMetaDataResource().entrySet().iterator();
@@ -327,12 +337,12 @@ public void setMetaData(Bundle metaData) {
 this.metaData = metaData;
 }
 
-public HashMap<String, String> getMetaDataString() {
-return metaDataString;
+public HashMap<String, Object> getMetaDataObject() {
+return metaDataObject;
 }
 
-public void setMetaDataString(HashMap<String, String> metaDataString) {
-this.metaDataString = metaDataString;
+public void setMetaDataObject(HashMap<String, Object> metaDataObj) {
+this.metaDataObject = metaDataObj;
 }
 
 public HashMap<String, Integer> getMetaDataResource() {
@@ -710,13 +720,17 @@ private static ArrayList<String> findClassNameByIntent(Intent intent, HashMap<St
 return null;
 }
 
-public PackageInfo getPackageInfo(Integer flags) {
+public PackageInfo getPackageInfo(Object flags) {
 if (packageInfoHashMap == null) {
 packageInfoHashMap = new HashMap<>();
 }
 PackageInfo packageInfo = packageInfoHashMap.get(flags);
 if (packageInfo == null) {
-packageInfo = FairyGlobal.getHostApplication().getPackageManager().getPackageArchiveInfo(getInstalledPath(), flags);
+if (flags instanceof Integer) {
+packageInfo = FairyGlobal.getHostApplication().getPackageManager().getPackageArchiveInfo(getInstalledPath(), (int)flags);
+} else {
+packageInfo = FairyGlobal.getHostApplication().getPackageManager().getPackageArchiveInfo(getInstalledPath(), PackageManager.PackageInfoFlags.of((long)flags));
+}
 if (packageInfo != null && packageInfo.applicationInfo != null) {
 packageInfo.applicationInfo.sourceDir = getInstalledPath();
 packageInfo.applicationInfo.publicSourceDir = getInstalledPath();

FairyPlugin/src/main/java/com/limpoxe/fairy/core/proxy/systemservice/AndroidAppIPackageManager.java

@@ -97,7 +97,7 @@ public Object beforeInvoke(Object target, Method method, Object[] args) {
  if (!packageName.equals(FairyGlobal.getHostApplication().getPackageName())) {
  PluginDescriptor pluginDescriptor = PluginManagerHelper.getPluginDescriptorByPluginId(packageName);
  if (pluginDescriptor != null) {
- PackageInfo packageInfo = pluginDescriptor.getPackageInfo((int) args[1]);
+ PackageInfo packageInfo = pluginDescriptor.getPackageInfo(args[1]);
  return packageInfo;
  }
  }
@@ -398,13 +398,15 @@ public Object beforeInvoke(Object target, Method method, Object[] args) {
  providerInfo.name = info.getName();
  providerInfo.packageName = getPackageName(pluginDescriptor);
  providerInfo.icon = pluginDescriptor.getApplicationIcon();
+ //todo
  providerInfo.metaData = pluginDescriptor.getMetaData();
  providerInfo.enabled = true;
  providerInfo.exported = info.isExported();
  providerInfo.applicationInfo = getApplicationInfo(pluginDescriptor);
  providerInfo.authority = info.getAuthority();
  return providerInfo;
  }
+ LogUtil.d("null authorities", args[0]);
  return null;
  }
  }

FairyPlugin/src/main/java/com/limpoxe/fairy/manager/PluginManifestParser.java

@@ -146,7 +146,22 @@ public static PluginDescriptor parseManifest(String pluginPath) {
  //等插件初始化的时候再处理这类meta信息
  desciptor.getMetaDataTobeInflate().put(name, ResourceUtil.covent2Hex(value));
  } else if (value != null) {
- desciptor.getMetaDataString().put(name, ResourceUtil.covent2Hex(value));
+ //meta-data支持的数据类型：Boolean、Float、Integer、String
+ if ("true".equals(value) || "false".equals(value)) {
+ desciptor.getMetaDataObject().put(name, Boolean.parseBoolean(value));
+ } else if (value.contains(".")) {
+ try {
+ desciptor.getMetaDataObject().put(name, Float.parseFloat(value));
+ } catch (Exception e) {
+ desciptor.getMetaDataObject().put(name, ResourceUtil.covent2Hex(value));
+ }
+ } else {
+ try {
+ desciptor.getMetaDataObject().put(name, Integer.parseInt(value));
+ } catch (Exception e) {
+ desciptor.getMetaDataObject().put(name, ResourceUtil.covent2Hex(value));
+ }
+ }
  } else if (resource != null && resource.startsWith("@")) {
  desciptor.getMetaDataResource().put(name, ResourceUtil.parseResId(ResourceUtil.covent2Hex(resource)));
  }

FairyPlugin/src/main/java/com/limpoxe/fairy/util/FileUtil.java

@@ -98,6 +98,7 @@ public static boolean copySo2(File sourceDir, String soName, String dest, ArrayL
 LogUtil.d("try supported abi:", abi);
 File sourceSoFile = new File(sourceDir, "lib" + File.separator + abi + File.separator + soName);
 if (sourceSoFile.exists()) {
+LogUtil.d("安装 " + sourceSoFile + " 到 " + dest + File.separator + soName);
 isSuccess = copyFile(sourceSoFile.getAbsolutePath(), dest + File.separator + soName);
 break;
 }