1

cantalou · cantalou · commit 413cf4dff10e · 2016-01-31T23:33:20.000+08:00
diff --git a/src/com/cantalou/skin/CacheKeyAndIdManager.java b/src/com/cantalou/skin/CacheKeyAndIdManager.java
@@ -61,7 +61,7 @@ public final class CacheKeyAndIdManager {
 	/**
 	 * 资源管理对象
 	 */
-	private SkinManager skinManager = SkinManager.getInstance();
+	private SkinManager skinManager ;
 
 	private static class InstanceHolder {
 		static final CacheKeyAndIdManager INSTANCE = new CacheKeyAndIdManager();
@@ -88,6 +88,9 @@ public synchronized void registerDrawable(int id) {
 			return;
 		}
 
+		if(skinManager == null){
+			skinManager = SkinManager.getInstance();
+		}
 		Resources defaultResources = skinManager.getDefaultResources();
 		Log.v("register drawable {} 0x{}", defaultResources.getResourceName(id), Integer.toHexString(id));
 
@@ -122,7 +125,9 @@ public synchronized void registerColorStateList(int id) {
 			Log.d("Had registered id:{}, ignore", id);
 			return;
 		}
-
+		if(skinManager == null){
+			skinManager = SkinManager.getInstance();
+		}
 		Resources defaultResources = skinManager.getDefaultResources();
 		Log.v("register ColorStateList {} 0x{}", defaultResources.getResourceName(id), Integer.toHexString(id));
 
@@ -147,7 +152,9 @@ private synchronized void handleMenuInflate(int id) {
 		if ((SkinProxyResources.APP_ID_MASK & id) != SkinProxyResources.APP_ID_MASK) {
 			return;
 		}
-
+		if(skinManager == null){
+			skinManager = SkinManager.getInstance();
+		}
 		ArrayList<Activity> activitys = skinManager.getActivitys();
 		int size = activitys.size();
 		if (size == 0) {
@@ -214,7 +221,9 @@ public synchronized void registerLayout(int id) {
 		if (handledDrawableId.contains(id)) {
 			return;
 		}
-
+		if(skinManager == null){
+			skinManager = SkinManager.getInstance();
+		}
 		Resources defaultResources = skinManager.getDefaultResources();
 		Log.v("register layout {} 0x{}", defaultResources.getResourceName(id), Integer.toHexString(id));
 		handledDrawableId.put(id);
diff --git a/src/com/cantalou/skin/SkinManager.java b/src/com/cantalou/skin/SkinManager.java
@@ -123,7 +123,7 @@ public class SkinManager {
 	/**
 	 * 资源缓存key和资源id管理对象
 	 */
-	private CacheKeyAndIdManager cacheKeyAndIdManager = CacheKeyAndIdManager.getInstance();
+	private CacheKeyAndIdManager cacheKeyAndIdManager;
 
 	ArrayDeque<Runnable> serialTasks = new ArrayDeque<Runnable>() {
 		Runnable mActive;
@@ -160,6 +160,7 @@ private static class InstanceHolder {
 	}
 
 	private SkinManager() {
+		cacheKeyAndIdManager = CacheKeyAndIdManager.getInstance();
 	}
 
 	public static com.cantalou.skin.SkinManager getInstance() {
@@ -461,7 +462,7 @@ private void onResourcesChange(View v) {
 			((AbstractHolder) tag).reloadAttr(v, v.getContext().getResources());
 		} else {
 			AbstractHolder ah = ViewFactory.getHolder(v.getClass().getName());
-			if(ah != null){
+			if (ah != null) {
 				ah.reloadAttr(v, v.getContext().getResources());
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public class SkinManager {`
`123`	`123`	`/**`
`124`	`124`	`* 资源缓存key和资源id管理对象`
`125`	`125`	`*/`
`126`		`- private CacheKeyAndIdManager cacheKeyAndIdManager = CacheKeyAndIdManager.getInstance();`
	`126`	`+ private CacheKeyAndIdManager cacheKeyAndIdManager;`
`127`	`127`
`128`	`128`	`ArrayDeque<Runnable> serialTasks = new ArrayDeque<Runnable>() {`
`129`	`129`	`Runnable mActive;`
`@@ -160,6 +160,7 @@ private static class InstanceHolder {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`private SkinManager() {`
	`163`	`+ cacheKeyAndIdManager = CacheKeyAndIdManager.getInstance();`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`public static com.cantalou.skin.SkinManager getInstance() {`
`@@ -461,7 +462,7 @@ private void onResourcesChange(View v) {`
`461`	`462`	`((AbstractHolder) tag).reloadAttr(v, v.getContext().getResources());`
`462`	`463`	`} else {`
`463`	`464`	`AbstractHolder ah = ViewFactory.getHolder(v.getClass().getName());`
`464`		`- if(ah != null){`
	`465`	`+ if (ah != null) {`
`465`	`466`	`ah.reloadAttr(v, v.getContext().getResources());`
`466`	`467`	`}`
`467`	`468`	`}`