modify getResources().getIdentifier()

limpoxe · limpoxe · commit 582f2983db6b · 2016-01-12T20:21:40.000+08:00
diff --git a/PluginCore/src/com/plugin/core/PluginCreator.java b/PluginCore/src/com/plugin/core/PluginCreator.java
@@ -48,8 +48,11 @@ public static DexClassLoader createPluginClassLoader(String absolutePluginApkPat
 	 *            插件apk文件路径
 	 * @return
 	 */
-	public static Resources createPluginResource(Application application, String absolutePluginApkPath,
-			boolean isStandalone, String[] dependencies) {
+	public static Resources createPluginResource(Application application, PluginDescriptor pluginDescriptor) {
+		String absolutePluginApkPath = pluginDescriptor.getInstalledPath();
+		boolean isStandalone = pluginDescriptor.isStandalone();
+		String[] dependencies = pluginDescriptor.getDependencies();
+
 		try {
 
 			// 插件运行时可能会通过getActivityInfo等
@@ -67,7 +70,7 @@ public static Resources createPluginResource(Application application, String abs
 
 			Resources mainRes = application.getResources();
 			Resources pluginRes = new PluginResourceWrapper(assetMgr, mainRes.getDisplayMetrics(),
-					mainRes.getConfiguration());
+					mainRes.getConfiguration(), pluginDescriptor);
 
 			return pluginRes;
 		} catch (Exception e) {
diff --git a/PluginCore/src/com/plugin/core/PluginLoader.java b/PluginCore/src/com/plugin/core/PluginLoader.java
@@ -435,8 +435,7 @@ static void ensurePluginInited(PluginDescriptor pluginDescriptor) {
 
 				LogUtil.d("是否为独立插件", pluginDescriptor.isStandalone());
 
-				Resources pluginRes = PluginCreator.createPluginResource(sApplication, pluginDescriptor.getInstalledPath(),
-						pluginDescriptor.isStandalone(), pluginDescriptor.getDependencies());
+				Resources pluginRes = PluginCreator.createPluginResource(sApplication, pluginDescriptor);
 
 				pluginClassLoader = PluginCreator.createPluginClassLoader(pluginDescriptor.getInstalledPath(),
 						pluginDescriptor.isStandalone(), pluginDescriptor.getDependencies());
diff --git a/PluginCore/src/com/plugin/core/PluginResourceWrapper.java b/PluginCore/src/com/plugin/core/PluginResourceWrapper.java
@@ -5,16 +5,22 @@
 import android.content.res.Resources;
 import android.util.DisplayMetrics;
 
+import com.plugin.content.PluginDescriptor;
+import com.plugin.util.LogUtil;
+
 /**
  * 根据不同的rom，可能需要重写更多的方法，目前发现的几个机型的问题暂时只需要重写下面2个方法。
  * @author cailiming
  *
  */
 public class PluginResourceWrapper extends Resources {
 
+	private PluginDescriptor mPluginDescriptor;
+
 	public PluginResourceWrapper(AssetManager assets, DisplayMetrics metrics,
-			Configuration config) {
+			Configuration config, PluginDescriptor pluginDescriptor) {
 		super(assets, metrics, config);
+		this.mPluginDescriptor = pluginDescriptor;
 	}
 	
 	@Override
@@ -56,6 +62,12 @@ private static boolean isMainResId(int resid) {
 		//默认宿主的资源id以0x7f开头
 		return resid>>24 == 0x7f;
 	}
-     
+
+	@Override
+	public int getIdentifier(String name, String defType, String defPackage) {
+		LogUtil.e("packageName", defPackage, "重置为：", mPluginDescriptor.getPackageName());
+		defPackage = mPluginDescriptor.getPackageName();
+		return super.getIdentifier(name, defType, defPackage);
+	}
 }
 
