getIdentifier

limpoxe · limpoxe · commit 910c848bdf15 · 2016-01-12T22:17:33.000+08:00
diff --git a/PluginCore/src/com/plugin/core/PluginResourceWrapper.java b/PluginCore/src/com/plugin/core/PluginResourceWrapper.java
@@ -124,12 +124,16 @@ public int getIdentifier(String name, String defType, String defPackage) {
 			// 判断是否在真的在宿主中
 			Class rClass = null;
 			try {
-				rClass = this.getClass().getClassLoader().loadClass(packageName + ".R$" + type);
+				String className = packageName + ".R$" + type;
+				rClass = this.getClass().getClassLoader().loadClass(className);
 				Field field = rClass.getDeclaredField(entry);
-				if (field == null) {//不在宿主中，换成插件的
+				if (field == null) {
+					//不在宿主中，换成插件的
 					packageName = mPluginDescriptor.getPackageName();
 				}
 			} catch (Exception e) {
+				//不在宿主中，换成插件的
+				packageName = mPluginDescriptor.getPackageName();
 			}
 		}
 		return super.getIdentifier(entry, type, packageName);

Original file line number	Diff line number	Diff line change
`@@ -124,12 +124,16 @@ public int getIdentifier(String name, String defType, String defPackage) {`
`124`	`124`	`// 判断是否在真的在宿主中`
`125`	`125`	`Class rClass = null;`
`126`	`126`	`try {`
`127`		`- rClass = this.getClass().getClassLoader().loadClass(packageName + ".R$" + type);`
	`127`	`+ String className = packageName + ".R$" + type;`
	`128`	`+ rClass = this.getClass().getClassLoader().loadClass(className);`
`128`	`129`	`Field field = rClass.getDeclaredField(entry);`
`129`		`- if (field == null) {//不在宿主中，换成插件的`
	`130`	`+ if (field == null) {`
	`131`	`+ //不在宿主中，换成插件的`
`130`	`132`	`packageName = mPluginDescriptor.getPackageName();`
`131`	`133`	`}`
`132`	`134`	`} catch (Exception e) {`
	`135`	`+ //不在宿主中，换成插件的`
	`136`	`+ packageName = mPluginDescriptor.getPackageName();`
`133`	`137`	`}`
`134`	`138`	`}`
`135`	`139`	`return super.getIdentifier(entry, type, packageName);`