修复5.x、64位系统so安装失败的问题

limpoxe · limpoxe · commit e51bfcbe5eae · 2015-11-11T10:46:48.000+08:00
diff --git a/PluginCore/src/com/plugin/core/PluginLoader.java b/PluginCore/src/com/plugin/core/PluginLoader.java
@@ -191,7 +191,7 @@ public static synchronized int installPlugin(String srcPluginFile) {
 		// 第3步，检查插件是否已经存在,若存在删除旧的
 		PluginDescriptor oldPluginDescriptor = getPluginDescriptorByPluginId(pluginDescriptor.getPackageName());
 		if (oldPluginDescriptor != null) {
-			LogUtil.e("已安装过，先删除旧版本", srcPluginFile);
+			LogUtil.e("已安装过，先删除旧版本", pluginDescriptor.getInstalledPath());
 			remove(pluginDescriptor.getPackageName());
 		}
 
@@ -220,13 +220,14 @@ public static synchronized int installPlugin(String srcPluginFile) {
 			pluginDescriptor.setInstalledPath(destPluginFile);
 			boolean isInstallSuccess = pluginManager.addOrReplace(pluginDescriptor);
 
+			new File(srcPluginFile).delete();
+
 			if (!isInstallSuccess) {
-				new File(srcPluginFile).delete();
 				LogUtil.d("安装插件失败", srcPluginFile);
 				return INSTALL_FAIL;
 			} else {
 				changeListener.onPluginInstalled(pluginDescriptor.getPackageName(), pluginDescriptor.getVersion());
-				LogUtil.d("安装插件成功", srcPluginFile);
+				LogUtil.d("安装插件成功", destPluginFile);
 				return SUCCESS;
 			}
 		}
diff --git a/PluginCore/src/com/plugin/util/FileUtil.java b/PluginCore/src/com/plugin/util/FileUtil.java
@@ -79,33 +79,43 @@ public static boolean copySo(File sourceDir, String so, String dest) {
 
 		try {
 
-			String name = "lib" + File.separator + Build.CPU_ABI + File.separator + so;
-			File sourceFile = new File(sourceDir, name);
+			boolean isSuccess = false;
+
+			if (Build.VERSION.SDK_INT >= 21) {
+				String[] abis = Build.SUPPORTED_ABIS;
+				if (abis != null) {
+					for (String abi: abis) {
+						LogUtil.d(abi);
+						String name = "lib" + File.separator + abi + File.separator + so;
+						File sourceFile = new File(sourceDir, name);
+						if (sourceFile.exists()) {
+							isSuccess = copyFile(sourceFile.getAbsolutePath(), dest + File.separator + so);
+							break;
+						}
+					}
+				}
+			} else {
+				LogUtil.d(Build.CPU_ABI, Build.CPU_ABI2);
 
-			if (!sourceFile.exists() && Build.CPU_ABI2 != null) {
-				name = "lib" + File.separator + Build.CPU_ABI2 + File.separator + so;
-				sourceFile = new File(sourceDir, name);
+				String name = "lib" + File.separator + Build.CPU_ABI + File.separator + so;
+				File sourceFile = new File(sourceDir, name);
 
-				if (!sourceFile.exists()) {
-					name = "lib" + File.separator + "armeabi" + File.separator + so;
+				if (!sourceFile.exists() && Build.CPU_ABI2 != null) {
+					name = "lib" + File.separator + Build.CPU_ABI2 + File.separator + so;
 					sourceFile = new File(sourceDir, name);
-				}
-			}
 
-			if (sourceFile.exists()) {
-				copyFile(sourceFile.getAbsolutePath(), dest + File.separator + so);
-			} else {
-				LogUtil.d(Build.CPU_ABI, Build.CPU_ABI2);
-				if (Build.VERSION.SDK_INT >= 21) {
-					String[] abis = Build.SUPPORTED_ABIS;
-					if (abis != null) {
-						for (String abi:
-								abis) {
-							LogUtil.d(abi);
-						}
+					if (!sourceFile.exists()) {
+						name = "lib" + File.separator + "armeabi" + File.separator + so;
+						sourceFile = new File(sourceDir, name);
 					}
 				}
-				Toast.makeText(PluginLoader.getApplicatoin(), "安装" + so + "失败:NO_MATCHING_ABIS", Toast.LENGTH_LONG).show();
+				if (sourceFile.exists()) {
+					isSuccess = copyFile(sourceFile.getAbsolutePath(), dest + File.separator + so);
+				}
+			}
+
+			if (!isSuccess) {
+				Toast.makeText(PluginLoader.getApplicatoin(), "安装" + so + "失败: NO_MATCHING_ABIS", Toast.LENGTH_LONG).show();
 			}
 		} catch(Exception e) {
 			e.printStackTrace();
diff --git a/PluginMain/assets/PluginTest-debug.apk b/PluginMain/assets/PluginTest-debug.apk
diff --git a/build.gradle b/build.gradle
@@ -5,6 +5,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.0'
+        //编译时注解
+        //classpath 'com.neenbedankt.gradle.plugins:android-apt:1.2',  http://blog.csdn.net/zjbpku/article/details/22976291
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`	`7`	`classpath 'com.android.tools.build:gradle:1.3.0'`
	`8`	`+ //编译时注解`
	`9`	`+ //classpath 'com.neenbedankt.gradle.plugins:android-apt:1.2', http://blog.csdn.net/zjbpku/article/details/22976291`
`8`	`10`	`}`
`9`	`11`	`}`
`10`	`12`