Merge pull request #482 from jasonz1987/develop

fix cordova-android 7.0 install bug

Author: jasonz1987

scripts/android-install.js

@@ -4,6 +4,7 @@ module.exports = function (context) {
     var path        = context.requireCordovaModule('path'),
         fs          = context.requireCordovaModule('fs'),
         shell       = context.requireCordovaModule('shelljs'),
+        semver      = context.requireCordovaModule('semver'),
         projectRoot = context.opts.projectRoot,
         plugins     = context.opts.plugins || [];
 
@@ -40,7 +41,20 @@ module.exports = function (context) {
     }
 
     var targetDir  = path.join(projectRoot, "platforms", "android", "src", packageName.replace(/\./g, path.sep), "wxapi");
-        targetFiles = ["EntryActivity.java", "WXEntryActivity.java", "WXPayEntryActivity.java"];
+    
+    var engines =  config.getEngines();
+    engines.forEach(function(item,index) {
+        if(item.name == 'android') {
+            var sepc = item.spec.replace('~','').replace('^','');
+            console.log(sepc);
+            if (semver.gt(sepc,'7.0.0')) {
+                console.info("Android platform Version above 7.0.0");
+                targetDir  = path.join(projectRoot, "platforms", "android", "app", "src", "main", "java", packageName.replace(/\./g, path.sep), "wxapi");
+            }
+        }
+    }); 
+
+    var targetFiles = ["EntryActivity.java", "WXEntryActivity.java", "WXPayEntryActivity.java"];
 
     if (['after_plugin_add', 'after_plugin_install'].indexOf(context.hook) === -1) {
         // remove it?