Skip to content

重定向修改jar #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

重定向修改jar #301

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cce6904
libs的jar重定向修改
Aug 15, 2017
58e5a0d
改为json保存修改信息
Aug 15, 2017
82142dd
不需要保存jar路径
Aug 15, 2017
e27e49d
分buildType
Aug 21, 2017
c03c6aa
Activities变化，也需要更新jar
Aug 21, 2017
a4c067f
aar的jar都一样处理
Aug 24, 2017
d4853cb
不需要反射重定向
Aug 24, 2017
c2ca290
代码调整
247321453 Aug 27, 2017
0ca937c
fix:repackage
247321453 Sep 2, 2017
a49598f
code:reJarPath
247321453 Sep 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 31 additions & 36 deletions replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/Util.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,47 +110,14 @@ public class Util {
def jarPath = jar.absolutePath
if (jarPath.contains(File.separator + FD_INTERMEDIATES + File.separator + "replugin-jar")) {
//
}else if (!jarPath.contains(projectDir)) {
String jarZipDir = project.getBuildDir().path +
File.separator + FD_INTERMEDIATES + File.separator + "exploded-aar" +
File.separator + Hashing.sha1().hashString(jarPath, Charsets.UTF_16LE).toString() + File.separator + "class";
if (unzip(jarPath, jarZipDir)) {
def jarZip = jarZipDir + ".jar"
includeJars << jarPath
classPath << jarZipDir
visitor.setBaseDir(jarZipDir)
Files.walkFileTree(Paths.get(jarZipDir), visitor)
map.put(jarPath, jarZip)
}
} else {
}else{
Copy link
Contributor

@wangfuda wangfuda Aug 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里无需if...else逻辑，jarPath不会有build临时目录

//重定向jar
Copy link
Contributor

@wangfuda wangfuda Aug 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里严格说，不是重定向文件，只是将文件解压到临时目录。请移除该注释。

String md5 = md5File(jar);
File reJar = new File(injectDir + File.separator + md5 + ".jar");
jarPath = reJar.getAbsolutePath()
Copy link
Contributor

@wangfuda wangfuda Aug 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里不要复用之前的jarPath 变量，重新定义个reJarPath


boolean needInject = false
if (reJar.exists()) {
//检查修改插件版本
JarPatchInfo info = infoMap.get(jar.getAbsolutePath());
if (info != null) {
if(!activityMd5.equals(info.manifestActivitiesMd5)){
needInject = true
}else if (!AppConstant.VER.equals(info.pluginVersion)) {
//版本变化了
needInject = true
} else {
if (!md5.equals(info.jarMd5)) {
//原始jar内容变化
needInject = true
}
}
} else {
//无记录
needInject = true
}
} else {
needInject = true;
}
boolean needInject = checkNeedInjector(infoMap, jar, reJar, activityMd5, md5);

//设置重定向jar
setJarInput(jarInput, reJar)
if (needInject) {
Expand Down Expand Up @@ -194,6 +161,34 @@ public class Util {
return md5
}


def static checkNeedInjector( Map<String, JarPatchInfo> infoMap, File jar,File reJar,String activityMd5,String md5){
boolean needInject = false
if (reJar.exists()) {
//检查修改插件版本
JarPatchInfo info = infoMap.get(jar.getAbsolutePath());
if (info != null) {
if(!activityMd5.equals(info.manifestActivitiesMd5)){
needInject = true
}else if (!AppConstant.VER.equals(info.pluginVersion)) {
//版本变化了
needInject = true
} else {
if (!md5.equals(info.jarMd5)) {
//原始jar内容变化
needInject = true
}
}
} else {
//无记录
needInject = true
}
} else {
needInject = true;
}
return needInject;
}

Copy link
Contributor

@wangfuda wangfuda Aug 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

代码逻辑可以精简为：

def static checkNeedInjector(Map<String, JarPatchInfo> infoMap, File jar, File reJar, String activityMd5, String md5) {

        boolean needInject = true

        if (reJar.exists()) {
            JarPatchInfo info = infoMap.get(jar.getAbsolutePath());
            if (info != null) {
                if (activityMd5.equals(info.manifestActivitiesMd5)
                        && AppConstant.VER.equals(info.pluginVersion)
                        && md5.equals(info.jarMd5)) {
                    needInject = false
                }
            }
        }

        return needInject;
    }

/**
* 读取修改jar的记录
*/
Expand Down