添加对5.x和2.x系统主题的支持

limpoxe · limpoxe · commit c0415ba99f41 · 2015-05-14T15:41:14.000+08:00
Signed-off-by: Cai Liming &lt;405977146@163.com&gt;
diff --git a/PluginCore/src/com/plugin/core/PluginCompat.java b/PluginCore/src/com/plugin/core/PluginCompat.java
@@ -2,37 +2,44 @@
 
 import android.content.Context;
 import android.os.Build;
+import android.util.Log;
 
 public class PluginCompat {
 	
 	/**
 	 * 
 	 * @param pluginContext
-	 * @param resId    宿主程序中定义的主题资源ID
+	 * @param resId    主题资源ID
 	 * @param clazz
 	 */
-	public static void applyHostTheme(Context pluginContext, int resId, @SuppressWarnings("rawtypes") Class clazz) {
-		//使用主程序资源Id不需要区分版本
-		pluginContext.setTheme(resId);
-	}
-	
-	/**
-	 * 
-	 * @param pluginContext
-	 * @param resId  插件程序中定义的主题资源ID
-	 * @param clazz
-	 */
-	public static void applyPluginTheme(Context pluginContext, int resId, @SuppressWarnings("rawtypes") Class clazz) {
-		//使用插件程序主题资源Id的时候需要区分版本
-		if (Build.VERSION.SDK_INT >= 14 && Build.VERSION.SDK_INT <= 20) {
+	public static void setTheme(Context pluginContext, int resId, @SuppressWarnings("rawtypes") Class clazz) {
+		
+		boolean isThemeInHostResouce = false;
+		try {
+			String themeEntryName = PluginLoader.getApplicatoin().getResources().getResourceEntryName(resId);
+			Log.v("PluginCompat", "" +themeEntryName);
+			
+			//“main_style_”是在pluglic.xml文件中定义的！
+			if (themeEntryName != null && !themeEntryName.startsWith("main_style_")) {
+				isThemeInHostResouce = true;
+			}
+		} catch (Exception e) {
+		}
+		
+		if (isThemeInHostResouce) {
+			//使用主程序资源Id不需要区分版本
 			pluginContext.setTheme(resId);
 		} else {
-			PluginDescriptor pd = PluginLoader.getPluginDescriptorByClassName(clazz.getName());
-			((PluginContextTheme)pluginContext).mResources = PluginCreator.createPluginResourceFor5(PluginLoader.getApplicatoin(), pd.getInstalledPath());
-			((PluginContextTheme)pluginContext).mTheme = null;
-			pluginContext.setTheme(resId);
+			//使用插件程序主题资源Id的时候需要区分版本
+			if (Build.VERSION.SDK_INT >= 14 && Build.VERSION.SDK_INT <= 20) {
+				pluginContext.setTheme(resId);
+			} else {
+				PluginDescriptor pd = PluginLoader.getPluginDescriptorByClassName(clazz.getName());
+				((PluginContextTheme)pluginContext).mResources = PluginCreator.createPluginResourceFor5(PluginLoader.getApplicatoin(), pd.getInstalledPath());
+				((PluginContextTheme)pluginContext).mTheme = null;
+				pluginContext.setTheme(resId);
+			}
 		}
 	}
- 
 	
 }
diff --git a/PluginTest/src/com/example/plugintest/fragment/PluginSpecFragment.java b/PluginTest/src/com/example/plugintest/fragment/PluginSpecFragment.java
@@ -41,7 +41,9 @@ public void onCreate(Bundle savedInstanceState) {
 		//默认是宿主程序Application主题
 		pluginContext = PluginLoader.getNewPluginContext(PluginSpecFragment.class);
 		// 设置主题为插件程序主题
-		PluginCompat.applyHostTheme(pluginContext, com.example.pluginsharelib.R.style.ShareTheme, PluginSpecFragment.class);
+		PluginCompat.setTheme(pluginContext, R.style.PluginTheme, PluginSpecFragment.class);
+		// 设置主题为宿主程序主题
+		//PluginCompat.setTheme(pluginContext, com.example.pluginsharelib.R.style.ShareTheme, PluginSpecFragment.class);
 
 		pluginInflater = (LayoutInflater) pluginContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 	}
