FixBug

limpoxe · limpoxe · commit afeba53aa4c4 · 2015-12-13T23:15:31.000+08:00
diff --git a/PluginCore/src/com/plugin/core/PluginIntentResolver.java b/PluginCore/src/com/plugin/core/PluginIntentResolver.java
@@ -87,10 +87,12 @@ public class PluginIntentResolver {
 		//通过映射查找
 		String targetClassName = PluginStubBinding.getBindedPluginServiceName(info.name);
 
-		LogUtil.d("hackServiceName", info.name,info.packageName, info.processName, "targetClassName", targetClassName);
+		LogUtil.d("hackServiceName", info.name, info.packageName, info.processName, "targetClassName", targetClassName);
 
 		if (targetClassName != null) {
 			info.name =  prefix + targetClassName;
+		} else {
+			LogUtil.d("hackServiceName 没有找到映射关系, 说明是宿主service（也可能是映射表出了异常）", info.name);
 		}
 		return targetClassName;
 	}
diff --git a/PluginCore/src/com/plugin/core/PluginStubBinding.java b/PluginCore/src/com/plugin/core/PluginStubBinding.java
@@ -157,8 +157,8 @@ private static void loadStubService() {
 			HashMap<String, String> mapping = restore();
 			if (mapping != null) {
 				serviceMapping.putAll(mapping);
-				save(serviceMapping);
 			}
+			save(serviceMapping);
 		}
 	}
 
@@ -223,7 +223,7 @@ public static String bindStubService(String pluginServiceClassName) {
 			if (entry.getValue() == null) {
 				if (idleStubServiceName == null) {
 					idleStubServiceName = entry.getKey();
-					//这里找到空闲的idleStubServiceName以后，还需继续遍历，用来检查是否pluginActivityClassName已经绑定过了
+					//这里找到空闲的idleStubServiceName以后，还需继续遍历，用来检查是否pluginServiceClassName已经绑定过了
 				}
 			} else if (pluginServiceClassName.equals(entry.getValue())) {
 				//已经绑定过，直接返回
@@ -254,7 +254,7 @@ public static void unBindStubService(String pluginServiceName) {
 				LogUtil.d("回收绑定", entry.getKey(), entry.getValue());
 				serviceMapping.put(entry.getKey(), null);
 				save(serviceMapping);
-				entry.getKey();
+				break;
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,12 @@ public class PluginIntentResolver {`
`87`	`87`	`//通过映射查找`
`88`	`88`	`String targetClassName = PluginStubBinding.getBindedPluginServiceName(info.name);`
`89`	`89`
`90`		`- LogUtil.d("hackServiceName", info.name,info.packageName, info.processName, "targetClassName", targetClassName);`
	`90`	`+ LogUtil.d("hackServiceName", info.name, info.packageName, info.processName, "targetClassName", targetClassName);`
`91`	`91`
`92`	`92`	`if (targetClassName != null) {`
`93`	`93`	`info.name = prefix + targetClassName;`
	`94`	`+ } else {`
	`95`	`+ LogUtil.d("hackServiceName 没有找到映射关系, 说明是宿主service（也可能是映射表出了异常）", info.name);`
`94`	`96`	`}`
`95`	`97`	`return targetClassName;`
`96`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,8 @@ private static void loadStubService() {`
`157`	`157`	`HashMap<String, String> mapping = restore();`
`158`	`158`	`if (mapping != null) {`
`159`	`159`	`serviceMapping.putAll(mapping);`
`160`		`- save(serviceMapping);`
`161`	`160`	`}`
	`161`	`+ save(serviceMapping);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`@@ -223,7 +223,7 @@ public static String bindStubService(String pluginServiceClassName) {`
`223`	`223`	`if (entry.getValue() == null) {`
`224`	`224`	`if (idleStubServiceName == null) {`
`225`	`225`	`idleStubServiceName = entry.getKey();`
`226`		`- //这里找到空闲的idleStubServiceName以后，还需继续遍历，用来检查是否pluginActivityClassName已经绑定过了`
	`226`	`+ //这里找到空闲的idleStubServiceName以后，还需继续遍历，用来检查是否pluginServiceClassName已经绑定过了`
`227`	`227`	`}`
`228`	`228`	`} else if (pluginServiceClassName.equals(entry.getValue())) {`
`229`	`229`	`//已经绑定过，直接返回`
`@@ -254,7 +254,7 @@ public static void unBindStubService(String pluginServiceName) {`
`254`	`254`	`LogUtil.d("回收绑定", entry.getKey(), entry.getValue());`
`255`	`255`	`serviceMapping.put(entry.getKey(), null);`
`256`	`256`	`save(serviceMapping);`
`257`		`- entry.getKey();`
	`257`	`+ break;`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`	`}`