update loader for 5.x and 2.x

limpoxe · limpoxe · commit 1c5de23fac3e · 2015-05-14T14:20:21.000+08:00
Signed-off-by: Cai Liming &lt;405977146@163.com&gt;
diff --git a/PluginCore/src/com/plugin/core/PluginLoader.java b/PluginCore/src/com/plugin/core/PluginLoader.java
@@ -223,14 +223,30 @@ public static Context getDefaultPluginContext(@SuppressWarnings("rawtypes") Clas
 	public static Context getNewPluginContext(@SuppressWarnings("rawtypes") Class clazz) {
 
 		Context pluginContext = getDefaultPluginContext(clazz);
+		//为了使5.0支持主题， 这里做api版本区分
+		if (Build.VERSION.SDK_INT >= 14 && Build.VERSION.SDK_INT <= 20 ) {
+			
+			if (pluginContext != null) {
+				pluginContext = PluginCreator.createPluginApplicationContext(sApplication,
+						pluginContext.getResources(), (DexClassLoader)pluginContext.getClassLoader());
+				pluginContext.setTheme(sApplication.getApplicationContext().getApplicationInfo().theme);
+			}
+			
+			return pluginContext;
+			
+		} else {
+			PluginDescriptor pd = getPluginDescriptorByClassName(clazz.getName());
 
-		if (pluginContext != null) {
-			pluginContext = PluginCreator.createPluginApplicationContext(sApplication,
-					pluginContext.getResources(), (DexClassLoader)pluginContext.getClassLoader());
-			pluginContext.setTheme(sApplication.getApplicationContext().getApplicationInfo().theme);
+			Resources resFor5 = PluginCreator.createPluginResourceFor5(sApplication, pd.getInstalledPath());
+			
+			if (pluginContext != null) {
+				pluginContext = PluginCreator.createPluginApplicationContext(sApplication,
+						resFor5, (DexClassLoader)pluginContext.getClassLoader());
+				pluginContext.setTheme(sApplication.getApplicationContext().getApplicationInfo().theme);
+			}
+			return null;
 		}
 		
-		return pluginContext;
 	}
 
 	/**
